Merge pull request #517 from John-Hong/release-3.6.0

fix(KIP-15699): 兼容性改造补充version和appVersion

src/pages/parkingFeeV2/mixins/parkingFeeDetail.js

@@ -158,6 +158,8 @@ export default {
       parkMallCode: (state) => state.order.parkMallCode,
       isLogin: (state) => state.isLogin,
       mallId: (state) => state.mallId,
+      version: (state) => state.version,
+      appVersion: (state) => state.appVersion,
     }),
     isNoLogin() {
       return JSON.stringify(this.member) === '{}' || !this.member
@@ -611,11 +613,21 @@ export default {
               const vehicleNo = this.orderDetail.parkingRecord.vehicleNo + '$';
               const unlicensed = this.orderDetail.unlicensed ? 'unlicensedVehicle' + '$': 'licensedVehicle'  + '$';
               if (isAlipay()) {
-                my.navigateTo({
-                  url: `/pages/package-parkingFee/payment?orderInfo=${
+                let alipayUrl = `/pages/package-parkingFee/payment?orderInfo=${encodeURIComponent(
+                  data.orderInfo
+                )}&unlicensed=${
+                  data.unlicensed
+                }&vehicleNo=${
+                  data.vehicleNo
+                }`
+                if(this.appVersion >= this.version) {
+                  alipayUrl = `/pages/package-parkingFee/payment?orderInfo=${
                     encodeURIComponent(data.orderInfo + '$')
                   }&unlicensed=${encodeURIComponent(unlicensed)
-                  }&vehicleNo=${encodeURIComponent(vehicleNo)}`,
+                  }&vehicleNo=${encodeURIComponent(vehicleNo)}`
+                }
+                my.navigateTo({
+                  url: alipayUrl,
                   complete: function (res) {
                     console.log('回调::', res)
                   },

src/store/index.js

@@ -60,7 +60,9 @@ const store = new Vuex.Store({
     endlessLoop: '',
     sourceId: '', // 微信：unionId; 支付宝：userId
     pageHistory: {},// 记录未登录页面已经跳转过
-    refreshPageKey: 1
+    refreshPageKey: 1,
+    version: 360, // h5版本
+    appVersion: 100, // 小程序版本
   },
   mutations: {
     SET_GROUP_ID(state, payload) {
@@ -184,6 +186,9 @@ const store = new Vuex.Store({
     },
     SET_REGRESH_PAGE_KEY(state) {
       state.refreshPageKey = state.refreshPageKey + 1;
+    },
+    set_APP_VERSION(state, payload) {
+      state.appVersion = payload;
     }
   },
   actions: {
@@ -328,11 +333,13 @@ const store = new Vuex.Store({
           // CRM
           // brandInfo = {},
           // curMarket = {}
-          unionId = ''
+          unionId = '',
+          appVersion = 100
         } = options;
         // console.log({ lbsId });
         // console.log('128128128128', options);
         commit('SET_SOURCE', source);
+        commit('set_APP_VERSION', appVersion);
         commit('SET_APPID', appId);
         if (!/CRM|PUDONG|JINGAN|ALIPAY/.test(source)) {
           const groupIdAndMallId = getGroupIdAndMallIdByLsbId(lbsId);