Merge branch 'release-3.2.0' into John/release-3.2.0/KIP-13631

src/api/parking/index.js

@@ -172,7 +172,7 @@ export function qrCodes(codeId) {
 }
 
 
-// 1.3 纸质优惠劵金额接口
+// 1.3 纸质优惠券金额接口
 export function paperCoupon(couponCode, vehicleNo) {
   return window.requestms.get(`parking-lots/paper-coupon?couponCode=${couponCode}&vehicleNo=${vehicleNo}`, { loading: true });
 }

src/crmPages/parkingFee.vue

@@ -63,7 +63,7 @@
               <image
                 :src="`./static/images/icon3${colorAry[custTypeId]}.png`"
               />
-              <text>停车劵兑换</text>
+              <text>停车券兑换</text>
             </view>
             <view class="menu_item" @click="doRouter1">
               <image

src/crmPages/parkingFeeCoupon.vue

@@ -21,7 +21,7 @@
                   >{{ item.value }}</text
                 >
               </view>
-              <text style="color: #989898; font-size: 30rpx">停车劵</text>
+              <text style="color: #989898; font-size: 30rpx">停车券</text>
             </view>
           </view>
           <view class="item-content cro_">

src/crmPages/parkingFeeDetail.vue

@@ -93,7 +93,7 @@
         class="warp_index warp_index_da"
         v-if="parkFee.parkInfoEntity.isuseticket === 1"
       >
-        <view>优惠劵</view>
+        <view>优惠券</view>
         <view class="warp_index_color" @click="coupon">
           <view
             style="margin-right: 10rpx"
@@ -111,10 +111,10 @@
         class="warp_index warp_index_da"
         v-if="parkFee.parkInfoEntity.papercoupons === 1 || isShowPapercoupons"
       >
-        <view>纸质优惠劵</view>
+        <view>纸质优惠券</view>
         <view class="warp_index_color" @click="paperCoupon">
           <view style="margin-right: 10rpx" class="text-red"
-            >扫描纸质优惠劵二维码</view
+            >扫描纸质优惠券二维码</view
           >
           <image
             style="width: 26rpx; height: 26rpx"
@@ -446,10 +446,10 @@ export default {
     // 电子券
     couponDesc() {
       if (this.checkedCouponCount > 0) {
-        return `已选择${this.checkedCouponCount}张优惠劵`;
+        return `已选择${this.checkedCouponCount}张优惠券`;
       } else {
         if (this.couponCount > 0) {
-          return `您有${this.couponCount}张可用优惠劵`;
+          return `您有${this.couponCount}张可用优惠券`;
         }
         return `暂无可用优惠券`;
       }
@@ -1052,7 +1052,7 @@ export default {
       });
     },
 
-    // 电子优惠劵
+    // 电子优惠券
     coupon() {
       if (!this.couponCount) {
         return uni.showToast({

src/crmPages/parkingFeePaperCoupon.vue

@@ -3,7 +3,7 @@
     <wx-points-commit ref="wxPointsCommit"></wx-points-commit>
 
     <view class="worp">
-      <view style="font-size: 32rpx">纸质优惠劵减免说明</view>
+      <view style="font-size: 32rpx">纸质优惠券减免说明</view>
       <view style="font-size: 28rpx; color: #808080; padding-top: 12rpx">{{
         parkPaperCouponRemark
       }}</view>
@@ -15,7 +15,7 @@
         :key="item.discountCode"
       >
         <view class="worp_index1_index">
-          <view class="content">劵码 {{ item.discountCode }}</view>
+          <view class="content">券码 {{ item.discountCode }}</view>
           <view @click="deleteCoupon(index)"
             ><image
               src="static/images/delete.png"
@@ -29,7 +29,7 @@
             margin-top: 20rpx;
             font-size: 28rpx;
           "
-          >优惠劵金额 :<text style="color: #ed1c24">{{
+          >优惠券金额 :<text style="color: #ed1c24">{{
             item.discountValueMoney | currency
           }}</text></view
         >
@@ -48,7 +48,7 @@
         src="static/images/sweep.png"
         style="width: 35rpx; height: 35rpx; margin-right: 20rpx"
       />
-      <view>扫码用劵</view>
+      <view>扫码用券</view>
     </view>
     <view class="flewx">
       <view class="flewx-content"

src/pages/parkingFee/components/base/parkingFee.vue

@@ -62,7 +62,7 @@
             </div>
             <div class="menu_item" @click="doRouter3">
               <img :src="`${require(`../../static/images/icon3${colorAry[custTypeId]}.png`)}`" />
-              <span>停车劵兑换</span>
+              <span>停车券兑换</span>
             </div>
             <div class="menu_item" @click="doRouter1">
               <img :src="`${require(`../../static/images/icon4${colorAry[custTypeId]}.png`)}`" />

src/pages/parkingFee/components/base/parkingFeeCoupon.vue

@@ -13,7 +13,7 @@
                 <span style="font-weight: bold; color: #ed1c24">￥</span>
                 <span style="font-weight: bold; color: #ed1c24; font-size: 50px">{{ item.discountFee }}</span>
               </div>
-              <span style="color: #989898; font-size: 30px">停车劵</span>
+              <span style="color: #989898; font-size: 30px">停车券</span>
             </div>
           </div>
           <div class="item-content cro_">

src/pages/parkingFee/components/base/parkingFeeDetail.vue

@@ -65,7 +65,7 @@
         <!-- v-if="enableCoupon" -->
         <!-- 用户登录时展示 -->
         <div class="warp_index warp_index_da" v-if="orderDetail && orderDetail.discountInfo">
-          <div>优惠劵</div>
+          <div>优惠券</div>
           <div class="warp_index_color" @click="coupon">
             <!-- maxOneDayCoupons > 0 && -->
             <div style="margin-right: 10px" :class="coupons.length > 0 ? 'text-red' : 'text-disable'">
@@ -76,9 +76,9 @@
         </div>
         <!-- 纸质券 -->
         <div class="warp_index warp_index_da" v-if="enablePaperCoupons">
-          <div>纸质优惠劵</div>
+          <div>纸质优惠券</div>
           <div class="warp_index_color" @click="paperCoupon">
-            <div style="margin-right: 10px" class="text-red">扫描纸质优惠劵二维码</div>
+            <div style="margin-right: 10px" class="text-red">扫描纸质优惠券二维码</div>
             <img style="width: 26px; height: 26px" :src="`${require('../../static/images/arrows.png')}`" />
           </div>
         </div>

src/pages/parkingFee/components/base/parkingFeePaperCoupon.vue

@@ -4,7 +4,7 @@
       <wx-points-commit ref="wxPointsCommit"></wx-points-commit>
 
       <div class="worp">
-        <div style="font-size: 32px">纸质优惠劵减免说明</div>
+        <div style="font-size: 32px">纸质优惠券减免说明</div>
         <div style="font-size: 28px; color: #808080; padding-top: 12px">{{
             parkPaperCouponRemark
           }}</div>
@@ -16,7 +16,7 @@
           :key="item.discountCode"
         >
           <div class="worp_index1_index">
-            <div class="content">劵码 {{ item.discountCode }}</div>
+            <div class="content">券码 {{ item.discountCode }}</div>
             <div @click="deleteCoupon(index)"
             ><img
               :src="require('../../static/images/delete.png')"
@@ -30,7 +30,7 @@
                 margin-top: 20px;
                 font-size: 28px;
               "
-          >优惠劵金额 :<span style="color: #ed1c24">{{
+          >优惠券金额 :<span style="color: #ed1c24">{{
               item.discountValueMoney | currency
             }}</span></div
           >
@@ -49,7 +49,7 @@
           :src="require('../../static/images/sweep.png')"
           style="width: 35px; height: 35px; margin-right: 20px"
         />
-        <div>扫码用劵</div>
+        <div>扫码用券</div>
       </div>
       <div class="flewx">
         <div class="flewx-content"

src/pages/parkingFee/components/officeBlue/parkingFeeCoupon.vue

@@ -13,7 +13,7 @@
                     <span style="font-weight: bold; color: var(--k-color-primary)">￥</span>
                     <span class="itemValue">{{ item.discountFee }}</span>
                   </div>
-                  <span style="color: var(--k-color-primary); font-size: 30px">停车劵</span>
+                  <span style="color: var(--k-color-primary); font-size: 30px">停车券</span>
                 </div>
               </div>
               <div class="item-content cro_">

src/pages/parkingFee/components/officeBlue/parkingFeeDetail.vue

@@ -71,7 +71,7 @@
             class="warp_index warp_index_da"
             v-if="orderDetail && orderDetail.discountInfo"
           >
-            <div>优惠劵</div>
+            <div>优惠券</div>
             <div class="warp_index_color" @click="coupon">
               <div
                 style="margin-right: 10px"
@@ -88,10 +88,10 @@
             class="warp_index warp_index_da"
             v-if="enablePaperCoupons"
           >
-            <div>纸质优惠劵</div>
+            <div>纸质优惠券</div>
             <div class="warp_index_color" @click="paperCoupon">
               <div style="margin-right: 10px" class="text-red">
-                扫描纸质优惠劵二维码
+                扫描纸质优惠券二维码
               </div>
               <!-- <img style="width: 26px; height: 26px" src="static/images/arrows.png" /> -->
             </div>

src/pages/parkingFee/components/officeBlue/parkingFeePaperCoupon.vue

@@ -1,7 +1,7 @@
 <template>
   <scroll-view scroll-y="true" class="scroll-Y">
     <div class="worp">
-      <div class="title">纸质优惠劵减免说明</div>
+      <div class="title">纸质优惠券减免说明</div>
       <div style="font-size: 28px; color: #808080; padding-top: 12px">
         {{ parkPaperCouponRemark }}
       </div>
@@ -13,7 +13,7 @@
         :key="item.discountCode"
       >
         <div class="worp_index1_index">
-          <div class="content">劵码 {{ item.discountCode }}</div>
+          <div class="content">券码 {{ item.discountCode }}</div>
           <div @click="deleteCoupon(index)"><van-icon name="delete-o" /></div>
         </div>
         <div
@@ -24,7 +24,7 @@
             font-size: 28px;
           "
         >
-          优惠劵金额 :<span style="color: #064c8a">{{
+          优惠券金额 :<span style="color: #064c8a">{{
             item.discountValueMoney | currency
           }}</span>
         </div>
@@ -42,7 +42,7 @@
         :src="require('../../static/images/sweep.png')"
         style="width: 35px; height: 35px; margin-right: 20px"
       />
-      <div>扫码用劵</div>
+      <div>扫码用券</div>
     </div>
     <div class="flewx">
       <!-- <div class="flewx-content">应付<span style="color: red;font-size: 32px;padding-left: 20px;">{{actualFee |

src/pages/parkingFee/components/purple/parkingFee.vue

@@ -17,7 +17,7 @@
           </div>
           <div class="menu_item" @click="doRouter3" v-if="source === 'CRM'">
             <img :src="`${require(`../../static/images/icon-coupon.png`)}`" />
-            <span>停车劵兑换</span>
+            <span>停车券兑换</span>
           </div>
           <div class="menu_item" @click="doRouter1">
             <img :src="`${require(`../../static/images/icon-ticket.png`)}`" />

src/pages/parkingFee/components/purple/parkingFeeDetail.vue

@@ -42,14 +42,14 @@
           </div>
         </div>
         <div class="info-item-box" v-if="orderDetail && orderDetail.discountInfo">
-          <div class="label">优惠劵</div>
+          <div class="label">优惠券</div>
           <div :class="['value', coupons.length > 0 ? 'text-red' : 'text-disable']" @click="coupon">{{ couponDesc }}
             <van-icon name="arrow"/>
           </div>
         </div>
         <div class="info-item-box" v-if="enablePaperCoupons">
-          <div class="label">纸质优惠劵</div>
-          <div :class="['value', 'text-red']">扫描纸质优惠劵二维码
+          <div class="label">纸质优惠券</div>
+          <div :class="['value', 'text-red']">扫描纸质优惠券二维码
             <van-icon name="arrow"/>
           </div>
         </div>

src/pages/parkingFee/mixins/parkingFeeCoupon.js

@@ -41,6 +41,9 @@ export default {
       maxOneDayCoupons: ( state ) => state.order.maxOneDayCoupons,// 仅限杭州当日电子券可选上限
       paperDiscountFee: ( state ) => state.order.paperDiscountFee,// 纸质券的优惠金额
     }),
+    totalFeeInYuan() {
+      return this?.orderDetail?.parkingRecord?.totalFee / 100
+    }
   },
 
   mounted() {
@@ -82,7 +85,7 @@ export default {
         this.remainPrice = this.remainPrice - this.orderDetail.discountInfo.points[0].discountFee
       }   
       // 如果前海开启无积分上限的话，则
-      if ( [5, 10].indexOf(parkMallCode) > -1 && this.unLimitWeekendPoints && this.orderDetail.discountInfo?.points?.[0]?.discountFee) {
+      if ( [5, 10].indexOf(parkMallCode) > -1 && this.orderDetail.discountInfo?.points?.[0]?.discountFee) {
         this.remainPrice = this.remainPrice - this.orderDetail?.discountInfo?.points[0]?.discountFee
       }
       this.newAvailableDiscountFee = this.availableDiscountFee
@@ -122,7 +125,7 @@ export default {
     checkboxItemChange(name, index) {
       const coupon  = this.couponList[index];
       if ( coupon.disabled ) {
-        if(!this.actualPayFee) {
+        if (this.getAmountToBePaid() <= 0) {
           Toast('当前无需追加优惠')
           return;
         }
@@ -144,7 +147,8 @@ export default {
         return;
       }
       // 如果有选中项
-      if(!this.actualPayFee) {
+      // 还需支付金额 = 总金额 - 优惠金额
+      if (this.getAmountToBePaid() <= 0) {
         Toast('当前无需追加优惠')
         return;
       }
@@ -334,7 +338,7 @@ export default {
         }
       }
       // 深圳超限处理
-      if ([5, 10].indexOf(parkMallCode) > -1 && this.remainPrice  >= this.newAvailableDiscountFee) {
+      if ([5, 10].indexOf(parkMallCode) > -1 && this.remainPrice  >= this.availableDiscountFee) {
         if ( showMsg ) return true
         return Toast({
           message: `优惠券已达当日使用上限，不可再用`,
@@ -344,7 +348,7 @@ export default {
       }
 
       // 单日上限
-      if (oneDayLimitation && this.remainPrice >= this.newAvailableDiscountFee) {
+      if (oneDayLimitation && this.remainPrice >= this.availableDiscountFee) {
         if ( showMsg ) return true
         return Toast({
           message: [5, 10].indexOf(parkMallCode) > -1 ? '当日优惠已达上限，不可再用' : `每日最高可抵扣${maxOneDayDiscountFee}元`,
@@ -412,6 +416,17 @@ export default {
         navigate_time:new Date().getTime()
       }
     },
+    // 获取还需支付金额
+    getAmountToBePaid() {
+      let amountToBePaid = this.totalFeeInYuan - this.paperDiscountFee - this.remainPrice;
+      if([ 5, 10 ].indexOf(this.parkMallCode) > -1 && this.orderDetail.discountInfo?.points?.[0]?.discountFee) {
+        amountToBePaid = amountToBePaid - this.orderDetail.discountInfo?.points?.[0]?.discountFee
+      }
+      if([ 4, 6 ].indexOf(this.parkMallCode) > -1 && this.orderDetail.discountInfo?.points?.[0]?.discountFee) {
+        amountToBePaid = amountToBePaid - this.orderDetail.discountInfo?.points?.[0]?.discountFee
+      }
+      return amountToBePaid
+    },
     // 跳转小程序
     navigateToMiniProgram() {
       if (this.platform === 'miniprogram') {

src/pages/parkingFee/mixins/parkingFeePaperCoupon.js

@@ -209,7 +209,7 @@ export default {
         // this.$store.commit('order/setPaperDiscountTime',this.paperDiscountTime + discountTime)
       } else {
         return Toast({
-          message: '优惠劵已添加，请勿重复扫码',
+          message: '优惠券已添加，请勿重复扫码',
         });
       }
     },

src/pages/parkingFee/parkingFeeCoupon.vue

@@ -27,7 +27,7 @@
                   <span>￥</span>
                   <span class="itemValue">{{ item.discountFee }}</span>
                 </div>
-                <span style=" font-size: 30px">停车劵</span>
+                <span style=" font-size: 30px">停车券</span>
               </div>
               <div class="item-content">
                 <div class="content">

src/pages/parkingFee/parkingFeeDetail.vue

@@ -45,15 +45,15 @@
           </div>
         </div>
         <div class="info-item-box" v-if="enableCoupon">
-          <div class="label">优惠劵</div>
+          <div class="label">优惠券</div>
           <div :class="['value',]" @click="coupon">
             <span :class="[ coupons.length > 0 ? 'text-red':  'text-disable']">{{ couponDesc }}</span>
             <van-icon name="arrow"/>
           </div>
         </div>
         <div class="info-item-box" v-if="enablePaperCoupons">
-          <div class="label">纸质优惠劵</div>
-          <div :class="['value', 'text-red']" @click="paperCoupon">扫描纸质优惠劵二维码
+          <div class="label">纸质优惠券</div>
+          <div :class="['value', 'text-red']" @click="paperCoupon">扫描纸质优惠券二维码
             <van-icon name="arrow"/>
           </div>
         </div>

src/pages/parkingFee/parkingFeePaperCoupon.vue

@@ -2,7 +2,7 @@
   <div :class="['scroll-Y', theme]">
     <div>
       <div class="worp">
-        <div class="title">纸质优惠劵减免说明</div>
+        <div class="title">纸质优惠券减免说明</div>
         <div style="font-size: 28px; color: #808080; padding-top: 12px">
           <!-- {{ (orderDetail && orderDetail.parkingRule && orderDetail.discountInfo.paperCoupons[0].description) || '' }} -->
           {{ paperCouponsDesc }}
@@ -11,11 +11,11 @@
       <div v-if="paperCouponList.length">
         <div class="worp_index1" v-for="(item, index) in paperCouponList" :key="item.code">
           <div class="worp_index1_index">
-            <div class="content">劵码 {{ item.discountCode }}</div>
+            <div class="content">券码 {{ item.discountCode }}</div>
             <div @click="deleteCoupon(item)"><van-icon name="delete-o" /></div>
           </div>
           <div style="padding-bottom: 25px; margin-left: 20px; margin-top: 20px; font-size: 28px">
-            优惠劵金额 :<span style="color: #064c8a">{{ item.discountFee | currency }}</span>
+            优惠券金额 :<span style="color: #064c8a">{{ item.discountFee | currency }}</span>
           </div>
         </div>
       </div>
@@ -26,7 +26,7 @@
         @click="scanCode"
       >
         <img :src="require('./static/images/sweep.png')" style="width: 35px; height: 35px; margin-right: 20px" />
-        <div>扫码用劵</div>
+        <div>扫码用券</div>
       </div>
       <div style="height: 220px;"></div>
     </div>

src/pages/parkingFeeV2/mixins/parkingFee.js

@@ -827,7 +827,7 @@ export default {
           this.$wx.scanQRCode({
             onlyFromCamera: false,
             // desc: 'scanQRCode desc',
-            needResult: 1, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果，
+            needResult: 0, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果，
             // scanType: ['qrCode', 'barCode'], // 可以指定扫二维码还是一维码，默认二者都有
             success: (res) => {
               console.log('H5页面扫码获取到的参数——成功1', res);

src/pages/parkingFeeV2/mixins/parkingFeeCoupon.js

@@ -41,6 +41,9 @@ export default {
       maxOneDayCoupons: ( state ) => state.order.maxOneDayCoupons,// 仅限杭州当日电子券可选上限
       paperDiscountFee: ( state ) => state.order.paperDiscountFee,// 纸质券的优惠金额
     }),
+    totalFeeInYuan() {
+      return this?.orderDetail?.parkingRecord?.totalFee / 100
+    }
   },
 
   mounted() {
@@ -122,7 +125,7 @@ export default {
     checkboxItemChange(name, index) {
       const coupon  = this.couponList[index];
       if ( coupon.disabled ) {
-        if(!this.actualPayFee) {
+        if (this.getAmountToBePaid() <= 0) {
           Toast('当前无需追加优惠')
           return;
         }
@@ -145,7 +148,8 @@ export default {
         return;
       }
       // 如果有选中项
-      if(!this.actualPayFee) {
+      // 还需支付金额 = 总金额 - 优惠金额
+      if (this.getAmountToBePaid() <= 0) {
         Toast('当前无需追加优惠')
         return;
       }
@@ -162,6 +166,17 @@ export default {
       })
 
     },
+    // 获取还需支付金额
+    getAmountToBePaid() {
+      let amountToBePaid = this.totalFeeInYuan - this.paperDiscountFee - this.remainPrice;
+      if([ 5, 10 ].indexOf(this.parkMallCode) > -1 && this.orderDetail.discountInfo?.points?.[0]?.discountFee) {
+        amountToBePaid = amountToBePaid - this.orderDetail.discountInfo?.points?.[0]?.discountFee
+      }
+      if([ 4, 6 ].indexOf(this.parkMallCode) > -1 && this.orderDetail.discountInfo?.points?.[0]?.discountFee) {
+        amountToBePaid = amountToBePaid - this.orderDetail.discountInfo?.points?.[0]?.discountFee
+      }
+      return amountToBePaid
+    },
     // 针对达到优惠的上限制
     setAllDisabled() {
       const {parkInfo,parkingRule} = this.orderDetail
@@ -335,7 +350,7 @@ export default {
         }
       }
       // 深圳超限处理
-      if ([5, 10].indexOf(parkMallCode) > -1 && this.remainPrice  >= this.newAvailableDiscountFee) {
+      if ([5, 10].indexOf(parkMallCode) > -1 && this.remainPrice  >= this.availableDiscountFee) {
         if ( showMsg ) return true
         return Toast({
           message: `优惠券已达当日使用上限，不可再用`,
@@ -345,7 +360,7 @@ export default {
       }
 
       // 单日上限
-      if (oneDayLimitation && this.remainPrice >= this.newAvailableDiscountFee) {
+      if (oneDayLimitation && this.remainPrice >= this.availableDiscountFee) {
         if ( showMsg ) return true
         return Toast({
           message: [5, 10].indexOf(parkMallCode) > -1 ? '当日优惠已达上限，不可再用' : `每日最高可抵扣${maxOneDayDiscountFee}元`,

src/pages/parkingFeeV2/mixins/parkingFeePaperCoupon.js

@@ -230,7 +230,7 @@ export default {
         // this.$store.commit('order/setPaperDiscountTime',this.paperDiscountTime + discountTime)
       } else {
         return Toast({
-          message: '优惠劵已添加，请勿重复扫码',
+          message: '优惠券已添加，请勿重复扫码',
         });
       }
     },

src/pages/parkingFeeV2/parkingFeeCoupon.vue

@@ -27,7 +27,7 @@
                   <span>￥</span>
                   <span class="itemValue">{{ item.discountFee }}</span>
                 </div>
-                <span style=" font-size: 30px">停车劵</span>
+                <span style=" font-size: 30px">停车券</span>
               </div>
               <div class="item-content">
                 <div class="content">

src/pages/parkingFeeV2/parkingFeeDetail.vue

@@ -45,15 +45,15 @@
           </div>
         </div>
         <div class="info-item-box" v-if="enableCoupon">
-          <div class="label">优惠劵</div>
+          <div class="label">优惠券</div>
           <div :class="['value',]" @click="coupon">
             <span :class="[ coupons.length > 0 ? 'text-red':  'text-disable']">{{ couponDesc }}</span>
             <van-icon name="arrow"/>
           </div>
         </div>
         <div class="info-item-box" v-if="enablePaperCoupons">
-          <div class="label">纸质优惠劵</div>
-          <div :class="['value', 'text-red']" @click="paperCoupon">扫描纸质优惠劵二维码
+          <div class="label">纸质优惠券</div>
+          <div :class="['value', 'text-red']" @click="paperCoupon">扫描纸质优惠券二维码
             <van-icon name="arrow"/>
           </div>
         </div>

src/pages/parkingFeeV2/parkingFeePaperCoupon.vue

@@ -2,7 +2,7 @@
   <div :class="['scroll-Y', theme]">
     <div>
       <div class="worp">
-        <div class="title">纸质优惠劵减免说明</div>
+        <div class="title">纸质优惠券减免说明</div>
         <div style="font-size: 28px; color: #808080; padding-top: 12px">
           <!-- {{ (orderDetail && orderDetail.parkingRule && orderDetail.discountInfo.paperCoupons[0].description) || '' }} -->
           {{ paperCouponsDesc }}
@@ -11,11 +11,11 @@
       <div v-if="paperCouponList.length">
         <div class="worp_index1" v-for="(item, index) in paperCouponList" :key="item.code">
           <div class="worp_index1_index">
-            <div class="content">劵码 {{ item.discountCode }}</div>
+            <div class="content">券码 {{ item.discountCode }}</div>
             <div @click="deleteCoupon(item)"><van-icon name="delete-o" /></div>
           </div>
           <div style="padding-bottom: 25px; margin-left: 20px; margin-top: 20px; font-size: 28px">
-            优惠劵金额 :<span style="color: #064c8a">{{ item.discountFee | currency }}</span>
+            优惠券金额 :<span style="color: #064c8a">{{ item.discountFee | currency }}</span>
           </div>
         </div>
       </div>
@@ -26,7 +26,7 @@
         @click="scanCode"
       >
         <img :src="require('@/pages/parkingFee/static/images/sweep.png')" style="width: 35px; height: 35px; margin-right: 20px" />
-        <div>扫码用劵</div>
+        <div>扫码用券</div>
       </div>
       <div style="height: 220px;"></div>
     </div>

src/store/order/coupon.js

@@ -38,10 +38,10 @@ export default {
         commit('setCouponCount',couponCount);
 
         if ( couponCount > 0 ) {
-          return commit('setCouponDesc',`已选择${ couponCount }张优惠劵`);
+          return commit('setCouponDesc',`已选择${ couponCount }张优惠券`);
         }
         if ( checkOutResponse.discountInfo.coupons.length ) {
-          return commit('setCouponDesc',`您有${ checkOutResponse.discountInfo.coupons.length }张可用优惠劵`);
+          return commit('setCouponDesc',`您有${ checkOutResponse.discountInfo.coupons.length }张可用优惠券`);
         }
       }
       commit('setCouponDesc',`暂无可用优惠券`);

src/store/order/points.js

@@ -24,6 +24,7 @@ export default {
       remainConsumeTime, // 当前订单剩余可使用的优惠
     } = parkingRule;
     commit('setEnablePoints',enablePoints);
+    commit('setAvailableDiscountFee',availableDiscountFee);
     if ( !points ) return commit('setIntegralDesc','暂无可用积分'); // 积分优惠处的描述
     const [
       {
@@ -38,7 +39,7 @@ export default {
         label,
       },
     ] = points;
-    commit('setAvailableDiscountFee',availableDiscountFee);
+    
     dispatch('maxPointsTimeMath',checkOutResponse) // 剩余积分可兑换上限
     
     commit('setAvailable',available);