xiongzhu 2 лет назад
Родитель
Сommit
622cc34720
2 измененных файлов с 8 добавлено и 8 удалено
  1. 7 6
      src/membership/membership.controller.ts
  2. 1 2
      views/h5pay.hbs

+ 7 - 6
src/membership/membership.controller.ts

@@ -47,12 +47,13 @@ export class MembershipController {
     @Get('/h5pay')
     @Render('h5pay')
     async h5pay(@Query() { code, userId, planId }) {
+        // return { success: true, openid: '123', errorCode: 0, message: '', jsapiData: JSON.stringify({aaa:111,bbb:{ccc:"kdjlfksjdfkls"}}), price: `123` }
         if (!code) {
             return {
                 success: false,
                 message: '缺少code',
                 errorCode: 1,
-                data: '{}'
+                jsapiData: '{}'
             }
         }
         if (!userId) {
@@ -60,7 +61,7 @@ export class MembershipController {
                 success: false,
                 message: '缺少userId',
                 errorCode: 2,
-                data: '{}'
+                jsapiData: '{}'
             }
         }
         if (!planId) {
@@ -68,7 +69,7 @@ export class MembershipController {
                 success: false,
                 message: '缺少planId',
                 errorCode: 3,
-                data: '{}'
+                jsapiData: '{}'
             }
         }
         const plans = await this.membershipService.getPlans()
@@ -78,11 +79,11 @@ export class MembershipController {
                 success: false,
                 message: 'planId无效',
                 errorCode: 4,
-                data: '{}'
+                jsapiData: '{}'
             }
         }
         const openid = await this.weixinService.code2oenId(code)
-        const data = await this.membershipService.combinedJsapi(userId, planId, openid)
-        return { success: true, openid, errorCode: 0, message: '', data: JSON.stringify(data), price: `${plan.price}` }
+        const jsapiData = await this.membershipService.combinedJsapi(userId, planId, openid)
+        return { success: true, openid, errorCode: 0, message: '', jsapiData, price: `${plan.price}` }
     }
 }

+ 1 - 2
views/h5pay.hbs

@@ -77,7 +77,7 @@
                 success: {{ success }},
                 message: '{{ message }}',
                 errorCode: {{ errorCode }},
-                data: '{{ data }}',
+                data: {{{ jsapiData}}},
             };
 
             $.get('/api/weixin/jsapiSign', { url: encodeURI(window.location.href.split('#')[0]), }, function (res) {
@@ -99,7 +99,6 @@
                 $('#errmsg').html(viewData.message);
                 $('#error').show();
             } else {
-                viewData.data = JSON.parse(viewData.data);
                 $('#pay').show();
                 wx.ready(function (res) {
                     console.log('jssdk ready', res);