Merge pull request #332 from John-Hong/John/release-2.20.0/SCRM-5068-2

fix(SCRM-5004): 根据后端返回的label判断展示内容

src/pages/parkingFee/mixins/parkingFeeDetail.js

@@ -698,6 +698,9 @@ export default {
       if(this.integralDesc === '暂无可用积分'){
         return
       }
+      if(this.integralDesc === '今日积分已达上限'){
+        return
+      }
       this.popup = true;
     },
     cancelPointsMathPopup() {

src/pages/parkingFee/parkingFeeDetail.vue

@@ -40,7 +40,7 @@
         <div class="info-item-box" v-if="enablePoints">
           <div class="label">积分减免</div>
           <div :class="['value']" @click="showPointsMathPopup('bottom')">
-            <span :class="[integralDesc === '今日已达上限' ? 'text-disable' : 'text-red']">{{ integralDesc }}</span>
+            <span :class="[integralDesc === '今日积分已达上限' ? 'text-disable' : 'text-red']">{{ integralDesc }}</span>
             <van-icon name="arrow"/>
           </div>
         </div>

src/pages/parkingFeeV2/mixins/parkingFee.js

@@ -91,14 +91,12 @@ export default {
         [this.$route.query.fromPage]: 1
       })
       localStorage.setItem(`${this.$route.query.fromPage}`, this.$route.query.fromPage)
-      setTimeout(() => {
-        this.$router.push({
-          path: this.$route.query.fromPage, query: {
-            ...this.$route.query,
-            loginCount: 1
-          }
-        });
-      }, 300)
+      this.$router.push({
+        path: this.$route.query.fromPage, query: {
+          ...this.$route.query,
+          loginCount: 1
+        }
+      });
     }
     const {type = '', code = ''} = this.$route.query
     // 无牌车流程

src/pages/parkingFeeV2/mixins/parkingFeeDetail.js

@@ -841,6 +841,9 @@ export default {
       if(this.integralDesc === '暂无可用积分'){
         return
       }
+      if(this.integralDesc === '今日积分已达上限'){
+        return
+      }
       this.popup = true;
     },
     cancelPointsMathPopup() {

src/pages/parkingFeeV2/parkingFeeDetail.vue

@@ -40,7 +40,7 @@
         <div class="info-item-box" v-if="enablePoints">
           <div class="label">积分减免</div>
           <div :class="['value']" @click="showPointsMathPopup('bottom')">
-            <span :class="[integralDesc === '今日已达上限' ? 'text-disable' : 'text-red']">{{ integralDesc }}</span>
+            <span :class="[integralDesc === '今日积分已达上限' ? 'text-disable' : 'text-red']">{{ integralDesc }}</span>
             <van-icon name="arrow"/>
           </div>
         </div>

src/store/order/points.js

@@ -59,6 +59,11 @@ export default {
     commit('setUnlimitUsePoints', unlimitUsePoints);
     commit('setUnLimitWeekendPoints', unLimitWeekendPoints);
     commit('setUnitHour', unitHour);
+    // parkMallCode = 3，表示北京
+    if(label === '今日积分已达上线') {
+      commit('setIntegralDesc', '今日积分已达上限');
+      return
+    }
     commit('setIntegralDesc',pointsTime ? `已选择兑换${ pointsTime }${parkMallCode === 5 ? '元' : '小时'}` : available > pointsPerUnit ? `${ available }积分可减免` : `${ pointsPerUnit }积分可停车1小时`); // 积分优惠处的描述
   },
   // 当前最大可选优惠时间