瀏覽代碼

Merge pull request #154 from John-Hong/John/release-2011.0/SCRM-4018

fix(SCRM-4015): [DE][C端]临时停车,合集商场的消费减免,应该是不可拆分使用的
Tron 2 年之前
父節點
當前提交
eb5b5f225b
共有 2 個文件被更改,包括 6 次插入5 次删除
  1. 5 4
      src/pages/parkingFee/mixins/parkingFeeDiscounts.js
  2. 1 1
      src/pages/parkingFee/parkingFeeDiscounts.vue

+ 5 - 4
src/pages/parkingFee/mixins/parkingFeeDiscounts.js

@@ -48,12 +48,13 @@ export default {
       paperDiscountTime: (state) => state.order.paperDiscountTime,
       paperDiscountFee: (state) => state.order.paperDiscountTime,
     }),
-    isShowVanStepper() {
+    stepperDisabled() {
+      // site优先级最高
       if(this.parkMallCode === 7) {
-        return false
+        return true
       }
-      return true      
-    }
+      return this.isReduces || !this.maxReduceDiscount
+    },
     // maxReduceDiscount() {
     //   const {maxOneDayCoupons,maxConsumeTime,maxonedaydiscountFee,maxOneTimeDiscountTime,remainConsumeTime,hourPrice,availableDiscountFee,oneTimeLimitation,oneDayLimitation,maxOneDayDiscountFee} = this.orderDetail.parkingRule;
     //   let newMaxConsumeTime = maxConsumeTime

+ 1 - 1
src/pages/parkingFee/parkingFeeDiscounts.vue

@@ -18,7 +18,7 @@
             <div class="content" v-if="orderDetail.parkInfo.parkMallCode !== 1">
               {{ todayReduceDiscountMessage }}
             </div>
-            <van-stepper v-if="enableConsumeSplit || isShowVanStepper" :min="0" name="reduces" :disabled="isReduces || !maxReduceDiscount" :max="maxReduceDiscount" :value="reduceHours" @plus="onReduceHoursChange('plus')" @minus="onReduceHoursChange('minus')" async-change />
+            <van-stepper v-if="enableConsumeSplit || true" :min="0" name="reduces" :disabled="stepperDisabled" :max="maxReduceDiscount" :value="reduceHours" @plus="onReduceHoursChange('plus')" @minus="onReduceHoursChange('minus')" async-change />
             <!--            reduceHours: {{ reduceHours }}; maxReduceDiscount:{{ maxReduceDiscount }}-->
             <!--            <uni-number-box
                           v-if="enableConsumeSplit || true"