John-Hong 2 lat temu
rodzic
commit
501f4708ea
3 zmienionych plików z 15 dodań i 11 usunięć
  1. 7 7
      src/App.vue
  2. 7 3
      src/pages/parkingFee/parkingFeeDetail.vue
  3. 1 1
      src/store/index.js

+ 7 - 7
src/App.vue

@@ -271,14 +271,14 @@ export default {
           // callback: this.wss,
           callback: () => {
             // console.log(838383, this.isInit);
+            if (!openid) {
+              this.$router.replace({
+                path: '/openWx',
+                query: query,
+              });
+              return
+            }
             this.isInit = true;
-            // if (!openid) {
-            //   this.$router.replace({
-            //     path: '/openWx',
-            //     query: query,
-            //   });
-            //   return
-            // }
             // 当所有的数据都初始化之后再次执行
             this.getTicket();
           },

+ 7 - 3
src/pages/parkingFee/parkingFeeDetail.vue

@@ -1633,7 +1633,7 @@ export default {
         openId: openId,
         vipcode: this.member?.vipcode || uni.getStorageSync('member')?.vipcode,
         createuser: 'sys_miniprogram',
-        orderno: this.parkInfo.orderno || '7719219221312412c21v3218u',
+        orderno: this.parkInfo.orderno,
         bonusfee: this.bonusfee * 100,
         bonus: bonus,
         couponfee: this.couponInfo.couponfee * 100 || 0,
@@ -1824,12 +1824,16 @@ export default {
       // });
       // return
       console.log(1782, 1782, 1782, session, payParams);
+      let appId = 'wx907c27f16841a919'
       // const openId = MemberCacheTool.getOpenId(app);
       // const appId = uni.getAccountInfoSync().miniProgram.appId;
       // const appId = 'wx192b7d2e8dcbefd0';
-      const appId = 'wx92c3e55fbef6b2af';
+      // const appId = 'wx907c27f16841a919';
       // const appId = 'wxd830fe4d1e04988e';
       // const appId = 'wx92c3e55fbef6b2af';
+      if ( platform === 'miniprogram' ) {
+        appId = 'wx92c3e55fbef6b2af'
+      }
       const params = {
         region: 'cn',
         payChannel: 'MINI_PROGRAM',
@@ -1843,7 +1847,7 @@ export default {
       //   this.$kipPaymentUrl + 'services/session/' + session + '/transactions';
       // https://qa-payment.kerryplus.com/services/session/7c6a199a-fbcb-48b0-a9c1-b325c2c9bf88/transactions
       // let path = 'kipPaymentUrl/services/session/' + session + '/transactions';
-      let path = `${window.injectConfig.qaPayment}/c/api/payment/v1/services/session/${session}/transactions`;
+      let path = `${window.injectConfig.profileApi}/payment/v1/services/session/${session}/transactions`;
       this.$request({
         // url: 'https://qa-payment.kerryplus.com/' + `services/session/${session}/transactions`,
         url: path,

+ 1 - 1
src/store/index.js

@@ -120,7 +120,7 @@ const store = new Vuex.Store({
         commit('SET_GROUP_ID', groupId);
         commit('SET_KIP_USER_ID', kipUserId);
         commit('SET_MALL_ID', mallId);
-        // commit('SET_OPENID', openid);
+        commit('SET_OPENID', openid);
         commit('SET_MOBILE', mobile);
         const memberRes = await crmQueryMemberInfo({
           groupId,