Merge pull request #139 from John-Hong/John/release-2.10.0/KIP-10139

feat(KIP-10139): KIP | Temporary Parking H5 ｜静安嘉里有牌车临停功能联调

src/api/request.js

@@ -8,10 +8,10 @@ import {md} from '@/utils/common'
 // import { ElLoadingComponent } from 'element-ui/types/loading';
 // import vm from "@/main";
 import { Toast } from 'vant';
-import vue from 'vue';
+// import vue from 'vue';
 import store from '@/store';
-import { v4 as uuidv4 } from 'uuid';
-import { wxToLoginCallback } from '@/utils/index.js'
+// import { v4 as uuidv4 } from 'uuid';
+// import { wxToLoginCallback } from '@/utils/index.js'
 let loadingInstance = null;
 let requestNum = 0;
 
@@ -144,7 +144,7 @@ export const createAxiosByinterceptors = (config) => {
         ...config.headers,
         ...handleConfig().header,
         // ...getSign(config),
-        'x-conversation-id': uuidv4(),
+        // 'x-conversation-id': uuidv4(),
         'X-User': XUser(config),
         'withCredentials': 'false'
       };

src/pages/parkingFee/mixins/parkingFeeDetail.js

@@ -452,9 +452,11 @@ export default {
           message: '暂无可用优惠',
         });
       }
-      this.$router.push({
-        path: 'parkingFeeDiscounts',
-      });
+      if( this.discountDesc !== '暂无可用优惠') {
+        this.$router.push({
+          path: 'parkingFeeDiscounts',
+        });
+      }
     },
     setColor() {
       window?.toWXSendMsg({

src/store/order/memberLevel.js

@@ -5,7 +5,11 @@ export default {
   // 停车优惠(首停、会员减免、消费减免)
   getCheckedTotal( {commit,dispatch},orderDetail ) {
     let checkedTotal = 0;
-    console.log(254,orderDetail);
+    if(orderDetail?.parkingRule) {
+      commit('setMemberLevelDiscount',orderDetail.discountInfo.memberLevelDiscount);
+      commit('setEnableConsume',orderDetail.parkingRule.enableConsume);
+    }
+    
     if ( orderDetail?.discountInfo?.memberLevelDiscount && orderDetail?.discountInfo?.memberGrade.length ) {
 
       orderDetail.discountInfo.memberGrade.forEach(( elm ) => {
@@ -21,8 +25,6 @@ export default {
         }
       });
     }
-    console.log(22,checkedTotal)
-    commit('setMemberLevelDiscount',orderDetail.discountInfo.memberLevelDiscount);
     commit('setCheckedTotal',checkedTotal);
     dispatch('getDiscountDesc',{
       orderDetail,
@@ -30,10 +32,7 @@ export default {
     });
   },
   getDiscountDesc( {commit,dispatch},{orderDetail,checkedTotal} ) {
-    console.log(278,orderDetail.parkingRule.enableConsume)
-    console.log(278,orderDetail.parkingRule.enableConsume)
-    if ( orderDetail.parkingRule.enableConsume || orderDetail.discountInfo.memberLevelDiscount ) {
-      commit('setEnableConsume',orderDetail.parkingRule.enableConsume);
+    if ( (orderDetail.parkingRule.enableConsume && orderDetail?.discountInfo?.consume?.length) || orderDetail.discountInfo.memberLevelDiscount ) {
       if ( checkedTotal > 0 ) {
         return commit('setDiscountDesc',`已选择${ checkedTotal }项优惠`);
       }