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

fix(SCRM-4018): [DE][C端]临时停车，用户在开票提交以后，点左上角返回，会回到填写开票信息的页面，用户可以再次点击开票…

src/api/mockData/checkout.hj.response.json

@@ -0,0 +1,56 @@
+{
+	"parkingRecord": {
+		"vehicleNo": "浙A00000",
+		"enterTime": "2022-08-02 10:35:47",
+		"serviceMin": 444931,
+		"totalFee": 22000,
+		"actualPayFee": 140.0,
+		"thirdPartyId": "_5_bc198505_1686103628696",
+		"thirdParkOrderNo": "bc198505ee2341c798c70a69a367782b",
+		"createdByQrCode": false,
+		"totalFeeInYuan": 220.00
+	},
+	"discountInfo": {
+		"usingTotalDiscount": 80,
+		"memberLevelDiscount": true,
+		"memberGrade": [{
+			"defaultSelected": true,
+			"memberGrade": "02",
+			"memberGradeText": "银卡PLUS",
+			"discountTime": 2,
+			"discountFee": 20
+		}],
+		"consume": [{
+			"defaultSelected": true,
+			"maxDiscountTime": 6,
+			"defaultDiscountTime": 6,
+			"discountFee": 60,
+			"redeemSalesAmount": 798
+		}],
+		"paperCoupons": [{
+			"description": "纸质优惠劵测试"
+		}]
+	},
+	"parkingRule": {
+		"enableNewMemberPoints": false,
+		"enablePoints": false,
+		"unLimitWeekendPoints": false,
+		"enableCoupon": false,
+		"maxOneDayCoupons": 0,
+		"remainCoupons": 0,
+		"enablePaperCoupons": true,
+		"enableConsume": true,
+		"enableConsumeSplit": false,
+		"maxConsumeTime": 6,
+		"remainConsumeTime": 6,
+		"hourPrice": 10,
+		"oneTimeLimitation": false,
+		"oneDayLimitation": false
+	},
+	"parkInfo": {
+		"parkName": "合集一期停车场\t",
+		"description": "1，基础计费规则：10元/小时\n2，会员权益减免：金卡免费4小时，臻选银卡免费2小时，银卡免费1小时 ，每日限享优惠权益1次，不可拆分使用，可与消费抵免叠加使用\n3，会员消费减免（满100元 1小时，满200元 2小时，消费满400元减免4小时，消费800元及以上可减免6小时，当日有效，单次获得的减免不可拆分使用，当日最多可享受消费减免6小时）",
+		"parkMallCode": 7,
+		"buildingId": "KEC3-KEC3-P1"
+	}
+}

src/pages/parkingFee/mixins/parkingFeeDiscounts.js

@@ -2,7 +2,7 @@ import { Toast } from "vant";
 import { mapState } from 'vuex';
 import uniNumberBox from '@/components/uni-number-box/uni-number-box.vue';
 import { cloneDeep } from 'lodash'
-import uni from '@/utils/uniHooks';
+// import uni from '@/utils/uniHooks';
 // const app = getApp()
 export default {
   components: { uniNumberBox },
@@ -48,6 +48,12 @@ export default {
       paperDiscountTime: (state) => state.order.paperDiscountTime,
       paperDiscountFee: (state) => state.order.paperDiscountTime,
     }),
+    isShowVanStepper() {
+      if(this.parkMallCode === 7) {
+        return false
+      }
+      return true      
+    }
     // maxReduceDiscount() {
     //   const {maxOneDayCoupons,maxConsumeTime,maxonedaydiscountFee,maxOneTimeDiscountTime,remainConsumeTime,hourPrice,availableDiscountFee,oneTimeLimitation,oneDayLimitation,maxOneDayDiscountFee} = this.orderDetail.parkingRule;
     //   let newMaxConsumeTime = maxConsumeTime

src/pages/parkingFee/mixins/parkingReceipt/parkingApplication.js

@@ -238,9 +238,11 @@ export default {
             Toast({
               message: '开票成功',
             });
+            // vue.router router.replace点两次返回问题及解决方案: https://blog.csdn.net/william_jzy/article/details/85760660
             this.$router.replace({
               path: 'parkingReceipt',
             });
+            this.$router.go(-1)
           }
         } catch (err) {
           console.log(111, err);

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 || true" :min="0" name="reduces" :disabled="isReduces || !maxReduceDiscount" :max="maxReduceDiscount" :value="reduceHours" @plus="onReduceHoursChange('plus')" @minus="onReduceHoursChange('minus')" async-change />
+            <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 />
             <!--            reduceHours: {{ reduceHours }}; maxReduceDiscount:{{ maxReduceDiscount }}-->
             <!--            <uni-number-box
                           v-if="enableConsumeSplit || true"