浏览代码

UI revamp|支付页面|首页|车牌修改页面|所有页面标题

john 2 年之前
父节点
当前提交
aaed9cf66d
共有 28 个文件被更改,包括 285 次插入49 次删除
  1. 10 0
      src/pages/parkingFee/mixins/parkingFee.js
  2. 10 0
      src/pages/parkingFee/mixins/parkingFeeCoupon.js
  3. 11 0
      src/pages/parkingFee/mixins/parkingFeeDetail.js
  4. 10 0
      src/pages/parkingFee/mixins/parkingFeeDetailSuccess.js
  5. 1 4
      src/pages/parkingFee/mixins/parkingFeeDiscounts.js
  6. 10 0
      src/pages/parkingFee/mixins/parkingFeeHint/parkingFeeHint.js
  7. 10 0
      src/pages/parkingFee/mixins/parkingFeeList.js
  8. 10 0
      src/pages/parkingFee/mixins/parkingFeePaperCoupon.js
  9. 10 0
      src/pages/parkingFee/mixins/parkingFeePayment.js
  10. 10 0
      src/pages/parkingFee/mixins/parkingFeeSuccess.js
  11. 10 0
      src/pages/parkingFee/mixins/parkingReceipt/parkingApplication.js
  12. 10 1
      src/pages/parkingFee/mixins/parkingReceipt/parkingChangeHeader.js
  13. 10 0
      src/pages/parkingFee/mixins/parkingReceipt/parkingChooseHeader.js
  14. 10 0
      src/pages/parkingFee/mixins/parkingReceipt/parkingHeaderDetail.js
  15. 10 0
      src/pages/parkingFee/mixins/parkingReceipt/parkingInvoice.js
  16. 10 0
      src/pages/parkingFee/mixins/parkingReceipt/parkingInvoiceImage.js
  17. 10 0
      src/pages/parkingFee/mixins/parkingReceipt/parkingOrderDetail.js
  18. 10 0
      src/pages/parkingFee/mixins/parkingReceipt/parkingReceipt.js
  19. 10 0
      src/pages/parkingFee/mixins/vehicleAddOrEdit.js
  20. 10 0
      src/pages/parkingFee/mixins/vehicleManagement.js
  21. 41 13
      src/pages/parkingFee/parkingFee.vue
  22. 17 2
      src/pages/parkingFee/parkingFeeDetail.vue
  23. 1 1
      src/pages/parkingFee/parkingFeeList.vue
  24. 15 9
      src/pages/parkingFee/vehicleAddOrEdit.vue
  25. 9 2
      src/store/order/points.js
  26. 1 1
      src/store/order/utils.js
  27. 7 7
      src/utils/index.js
  28. 2 9
      vue.config.js

+ 10 - 0
src/pages/parkingFee/mixins/parkingFee.js

@@ -112,6 +112,16 @@ export default {
         title: '停车缴费',
       });
     }, 300);
+    setTimeout(() => {
+      window?.toWXSendMsg({
+        type: 'uni_func',
+        funcName: 'setNavigationBarColor',
+        options: {
+          frontColor: '#000000',
+          backgroundColor: '#FBFCFF',
+        },
+      });
+    }, 500)
     const platform = getPlatform();
     if (platform === 'micromessenger') {
       await initWxJsSdkConfig(['checkJsApi', 'scanQRCode']);

+ 10 - 0
src/pages/parkingFee/mixins/parkingFeeCoupon.js

@@ -47,6 +47,16 @@ export default {
         this.launchPathInit();
       }
     }, 300);
+    setTimeout(() => {
+      window?.toWXSendMsg({
+        type: 'uni_func',
+        funcName: 'setNavigationBarColor',
+        options: {
+          frontColor: '#000000',
+          backgroundColor: '#FBFCFF',
+        },
+      });
+    }, 500)
     this.pageInit();
   },
   methods: {

+ 11 - 0
src/pages/parkingFee/mixins/parkingFeeDetail.js

@@ -37,8 +37,19 @@ export default {
         title: '停车支付',
       });
     }, 300);
+    setTimeout(() => {
+      window?.toWXSendMsg({
+        type: 'uni_func',
+        funcName: 'setNavigationBarColor',
+        options: {
+          frontColor: '#000000',
+          backgroundColor: '#FBFCFF',
+        },
+      });
+    }, 500)
     this.pageInit();
   },
+  
   computed: {
     ...mapState({
       orderDetail: (state) => state.order.orderDetail,

+ 10 - 0
src/pages/parkingFee/mixins/parkingFeeDetailSuccess.js

@@ -19,6 +19,16 @@ export default {
         title: '缴费详情',
       });
     }, 300);
+    setTimeout(() => {
+      window?.toWXSendMsg({
+        type: 'uni_func',
+        funcName: 'setNavigationBarColor',
+        options: {
+          frontColor: '#000000',
+          backgroundColor: '#FBFCFF',
+        },
+      });
+    }, 500)
     this.orderNo = this.$route.query.orderNo;
     this.getData();
   },

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

@@ -104,15 +104,12 @@ export default {
             this.consume = {
               ...this.consume,
               discountTime: this.reduceHours,
+              discountFee: this.reduceHours * this.orderDetail.parkingRule.hourPrice,
               selected: this.checkedList.indexOf(key) > -1
             }
-            if ( this.consume.selected ) {
-              this.consume.discountFee = this.reduceHours * this.orderDetail.parkingRule.hourPrice
-            }
             orderDetail.discountInfo.consume = [this.consume]
           }
         })
-        console.log(orderDetail.discountInfo.consume);
         await this.$store.dispatch('order/saveDiscounts',{orderDetail,callback: () => this.$router.back()})
       } else {
         this.$router.back();

+ 10 - 0
src/pages/parkingFee/mixins/parkingFeeHint/parkingFeeHint.js

@@ -24,6 +24,16 @@ export default {
         title: '提示',
       });
     }, 300);
+    setTimeout(() => {
+      window?.toWXSendMsg({
+        type: 'uni_func',
+        funcName: 'setNavigationBarColor',
+        options: {
+          frontColor: '#000000',
+          backgroundColor: '#FBFCFF',
+        },
+      });
+    }, 500)
   },
   methods: {
     search() {

+ 10 - 0
src/pages/parkingFee/mixins/parkingFeeList.js

@@ -38,6 +38,16 @@ export default {
         title: '缴费记录',
       });
     },301);
+    setTimeout(() => {
+      window?.toWXSendMsg({
+        type: 'uni_func',
+        funcName: 'setNavigationBarColor',
+        options: {
+          frontColor: '#000000',
+          backgroundColor: '#FBFCFF',
+        },
+      });
+    }, 500)
     this.$store.dispatch('clearUnlicensed');
     this.list = [];
     this.numberOfElements = 0;

+ 10 - 0
src/pages/parkingFee/mixins/parkingFeePaperCoupon.js

@@ -52,6 +52,16 @@ export default {
         title: '优惠券',
       });
     },300);
+    setTimeout(() => {
+      window?.toWXSendMsg({
+        type: 'uni_func',
+        funcName: 'setNavigationBarColor',
+        options: {
+          frontColor: '#000000',
+          backgroundColor: '#FBFCFF',
+        },
+      });
+    }, 500)
   },
   computed: {
     ...mapState({

+ 10 - 0
src/pages/parkingFee/mixins/parkingFeePayment.js

@@ -5,6 +5,16 @@ export default {
     const params = this.$route.query;
     this.msg = params.msg;
     this.carno = params.carno;
+    setTimeout(() => {
+      window?.toWXSendMsg({
+        type: 'uni_func',
+        funcName: 'setNavigationBarColor',
+        options: {
+          frontColor: '#000000',
+          backgroundColor: '#FBFCFF',
+        },
+      });
+    }, 500)
   },
   data() {
     return {

+ 10 - 0
src/pages/parkingFee/mixins/parkingFeeSuccess.js

@@ -38,6 +38,16 @@ export default {
         title: '提示',
       });
     }, 300);
+    setTimeout(() => {
+      window?.toWXSendMsg({
+        type: 'uni_func',
+        funcName: 'setNavigationBarColor',
+        options: {
+          frontColor: '#000000',
+          backgroundColor: '#FBFCFF',
+        },
+      });
+    }, 500)
     if ( this.$router.query?.vehicleNo ) {
       this.vehicleNo = this.$route.query.vehicleNo  
     }

+ 10 - 0
src/pages/parkingFee/mixins/parkingReceipt/parkingApplication.js

@@ -50,6 +50,16 @@ export default {
         title: '发票申请',
       });
     }, 300);
+    setTimeout(() => {
+      window?.toWXSendMsg({
+        type: 'uni_func',
+        funcName: 'setNavigationBarColor',
+        options: {
+          frontColor: '#000000',
+          backgroundColor: '#FBFCFF',
+        },
+      });
+    }, 500)
     this.getEmail();
     const query = getUrlParams();
     this.pageOptions = query;

+ 10 - 1
src/pages/parkingFee/mixins/parkingReceipt/parkingChangeHeader.js

@@ -78,7 +78,16 @@ export default {
         title: '发票抬头',
       });
     }, 300);
-    
+    setTimeout(() => {
+      window?.toWXSendMsg({
+        type: 'uni_func',
+        funcName: 'setNavigationBarColor',
+        options: {
+          frontColor: '#000000',
+          backgroundColor: '#FBFCFF',
+        },
+      });
+    }, 500)
   },
   methods: {
     radioChange: function (value) {

+ 10 - 0
src/pages/parkingFee/mixins/parkingReceipt/parkingChooseHeader.js

@@ -39,6 +39,16 @@ export default {
         title: '选择抬头',
       });
     }, 300);
+    setTimeout(() => {
+      window?.toWXSendMsg({
+        type: 'uni_func',
+        funcName: 'setNavigationBarColor',
+        options: {
+          frontColor: '#000000',
+          backgroundColor: '#FBFCFF',
+        },
+      });
+    }, 500)
     // console.log('全剧信息', this.globalData);
     this.getInvoiceTitle();
   },

+ 10 - 0
src/pages/parkingFee/mixins/parkingReceipt/parkingHeaderDetail.js

@@ -19,5 +19,15 @@ export default {
         title: '抬头详情',
       });
     }, 300);
+    setTimeout(() => {
+      window?.toWXSendMsg({
+        type: 'uni_func',
+        funcName: 'setNavigationBarColor',
+        options: {
+          frontColor: '#000000',
+          backgroundColor: '#FBFCFF',
+        },
+      });
+    }, 500)
   },
 };

+ 10 - 0
src/pages/parkingFee/mixins/parkingReceipt/parkingInvoice.js

@@ -50,6 +50,16 @@ export default {
         title: '发票详情',
       });
     }, 300);
+    setTimeout(() => {
+      window?.toWXSendMsg({
+        type: 'uni_func',
+        funcName: 'setNavigationBarColor',
+        options: {
+          frontColor: '#000000',
+          backgroundColor: '#FBFCFF',
+        },
+      });
+    }, 500)
       // const res = await invoicesDeatil(id)
     this.getInvoicedDetail(this.id);
   },

+ 10 - 0
src/pages/parkingFee/mixins/parkingReceipt/parkingInvoiceImage.js

@@ -28,6 +28,16 @@ export default {
         title: '停车发票',
       });
     }, 300);
+    setTimeout(() => {
+      window?.toWXSendMsg({
+        type: 'uni_func',
+        funcName: 'setNavigationBarColor',
+        options: {
+          frontColor: '#000000',
+          backgroundColor: '#FBFCFF',
+        },
+      });
+    }, 500)
   },
   onUnload() {
     if (this.timer) {

+ 10 - 0
src/pages/parkingFee/mixins/parkingReceipt/parkingOrderDetail.js

@@ -43,6 +43,16 @@ export default {
         title: '支付订单详情',
       });
     }, 300);
+    setTimeout(() => {
+      window?.toWXSendMsg({
+        type: 'uni_func',
+        funcName: 'setNavigationBarColor',
+        options: {
+          frontColor: '#000000',
+          backgroundColor: '#FBFCFF',
+        },
+      });
+    }, 500)
   },
   filters: {
     parkingTime(val) {

+ 10 - 0
src/pages/parkingFee/mixins/parkingReceipt/parkingReceipt.js

@@ -101,6 +101,16 @@ export default {
         title: '停车发票',
       });
     }, 300);
+    setTimeout(() => {
+      window?.toWXSendMsg({
+        type: 'uni_func',
+        funcName: 'setNavigationBarColor',
+        options: {
+          frontColor: '#000000',
+          backgroundColor: '#FBFCFF',
+        },
+      });
+    }, 500)
     const invoiceindex = Number.parseInt(uni.getStorageSync('invoiceindex') || 1)
     this.$store.dispatch('clearUnlicensed');
     if (JSON.stringify(this.member) !== '{}') {

+ 10 - 0
src/pages/parkingFee/mixins/vehicleAddOrEdit.js

@@ -40,6 +40,16 @@ export default {
         title: '绑定车牌号',
       });
     }, 300);
+    setTimeout(() => {
+      window?.toWXSendMsg({
+        type: 'uni_func',
+        funcName: 'setNavigationBarColor',
+        options: {
+          frontColor: '#000000',
+          backgroundColor: '#FBFCFF',
+        },
+      });
+    }, 500)
     const params = this.$route.query;
     // console.log(252, params);
     if (params.carType) {

+ 10 - 0
src/pages/parkingFee/mixins/vehicleManagement.js

@@ -58,6 +58,16 @@ export default {
         title: '车辆管理',
       });
     }, 300);
+    setTimeout(() => {
+      window?.toWXSendMsg({
+        type: 'uni_func',
+        funcName: 'setNavigationBarColor',
+        options: {
+          frontColor: '#000000',
+          backgroundColor: '#FBFCFF',
+        },
+      });
+    }, 500)
     this.$store.dispatch('clearUnlicensed');
     const member = uni.getStorageSync('member');
     if (member && JSON.stringify(this.member) !== '{}') {

+ 41 - 13
src/pages/parkingFee/parkingFee.vue

@@ -31,7 +31,7 @@
         <!-- 中控 -->
         <div class="parkingFee-bottom">
           <div style="height: 40px; background-color: #FBFCFF;" v-if="source !== 'CRM'"></div>
-          <div class="parkingFee-tab" v-if="supportUnlicensed && source === 'CRM'">
+          <div :class="['parkingFee-tab', tabbarActive === '无牌缴费' && 'unlicensed-box-bottom']" v-if="supportUnlicensed && source === 'CRM'">
             <div :class="['bar', tabbarActive === '手动缴费' && 'active']" @click="tabbarActiveEvent('手动缴费')">手动缴费</div>
             <div :class="['bar', tabbarActive === '无牌缴费' && 'active']" @click="tabbarActiveEvent('无牌缴费')">无牌缴费</div>
           </div>
@@ -55,26 +55,26 @@
                 <!-- <div v-for="i in carType === 1 ? 8 : 7" class="li" :key="`numArr${i}`" @click="clickShowKeyboard(i)" :class="[active === i ? 'active' : '']">
                   {{ numArr[i] }}
                 </div> -->
-                <div class="li" @click="clickShowKeyboard(0)" :class="[active === 0 ? 'active' : '']">
+                <div class="van-hairline--surround li" @click="clickShowKeyboard(0)" :class="[active === 0 ? 'active' : '']">
                   {{ numArr[0] }}
                 </div>
-                <div class="li" @click="clickShowKeyboard(1)" :class="[active === 1 ? 'active' : '']">
+                <div class="van-hairline--surround li" @click="clickShowKeyboard(1)" :class="[active === 1 ? 'active' : '']">
                   {{ numArr[1] }}
                 </div>
                 <div class="input_box_dian">·</div>
-                <div class="li" @click="clickShowKeyboard(2)" :class="[active === 2 ? 'active' : '']">
+                <div class="van-hairline--surround li" @click="clickShowKeyboard(2)" :class="[active === 2 ? 'active' : '']">
                   {{ numArr[2] }}
                 </div>
-                <div class="li" @click="clickShowKeyboard(3)" :class="[active === 3 ? 'active' : '']">
+                <div class="van-hairline--surround li" @click="clickShowKeyboard(3)" :class="[active === 3 ? 'active' : '']">
                   {{ numArr[3] }}
                 </div>
-                <div class="li" @click="clickShowKeyboard(4)" :class="[active === 4 ? 'active' : '']">
+                <div class="van-hairline--surround li" @click="clickShowKeyboard(4)" :class="[active === 4 ? 'active' : '']">
                   {{ numArr[4] }}
                 </div>
-                <div class="li" @click="clickShowKeyboard(5)" :class="[active === 5 ? 'active' : '']">
+                <div class="van-hairline--surround li" @click="clickShowKeyboard(5)" :class="[active === 5 ? 'active' : '']">
                   {{ numArr[5] }}
                 </div>
-                <div :class="['li', active === 6 ? 'active' : '']" @click="clickShowKeyboard(6)">
+                <div :class="['van-hairline--surround li', active === 6 ? 'active' : '']" @click="clickShowKeyboard(6)">
                   {{ numArr[6] }}
                 </div>
                 <div class="li dashed green-active" @click="clickShowKeyboard(7)" :class="[active === 7 ? 'active' : '']" >
@@ -128,6 +128,10 @@
             <div class="title_box">
               <span class="btn">缴费说明</span>
             </div>
+            <div class="sub_title_box">
+              <span class="btn">基础计费规则:</span>
+            </div>
+            
             <div class="info" :class="!init_ch ? 'info_show' : ''">
               <!-- <p></p> -->
               <!-- <p>{{ description }}</p> -->
@@ -223,6 +227,9 @@ export default {
         background-color: #FBFCFF;
         display: flex;
         align-items: flex-end;
+        &.unlicensed-box-bottom {
+          padding-bottom: 107px;
+        }
 
         .bar {
           color: #666666;
@@ -341,7 +348,7 @@ export default {
 
           .li {
             width: 100%;
-            border: 1px solid #d9dbe0;
+            //border: 1px solid #d9dbe0;
             box-sizing: border-box;
             height: 90px;
             display: flex;
@@ -356,6 +363,12 @@ export default {
               background-color: #fafbff;
               border-style: dashed;
             }
+            &.van-hairline--surround {
+              &::after{
+                border-radius: 7px;
+                border-color: #D9DBE0;
+              }
+            }
             &.active {
               border-color: var(--k-color-primary-01, #064c8a);
             }
@@ -458,7 +471,7 @@ export default {
             border: 1px solid #d9dbe0;
             background-color: #f4f7ff;
             line-height: 60px;
-            font-size: 26px;
+            font-size: 28px;
             border-radius: 30px;
             color: #666666;
           }
@@ -487,9 +500,12 @@ export default {
           line-height: 36px;
           text-align: center;
           margin-bottom: 60px;
+          font-family: 'PingFang SC';
+          font-style: normal;
+          font-weight: 400;
         }
         .search-btn {
-          font-size: 34px;
+          font-size: 32px;
           height: 90px;
           color: #ffffff;
           line-height: 90px;
@@ -588,6 +604,18 @@ export default {
             text-align: left;
           }
         }
+        .sub_title_box {
+          margin-bottom: 5px;
+          .btn{
+            font-family: 'PingFang SC';
+            font-style: normal;
+            font-weight: 400;
+            font-size: 26px;
+            line-height: 40px;
+            
+            color: #333333;  
+          }
+        }
 
         .info {
           padding-left: 2px;
@@ -614,8 +642,8 @@ export default {
         width: 100%;
         text-align: center;
         color: #999999;
-        margin-top: 30px;
-        margin-bottom: 32px;
+        margin-top: 25px;
+        margin-bottom: 20px;
       }
     }
   }

+ 17 - 2
src/pages/parkingFee/parkingFeeDetail.vue

@@ -21,7 +21,7 @@
           <div class="value">{{ orderDetail.parkingRecord.serviceMin | parkingTime }}</div>
         </div>
         <div class="van-hairline--bottom hr"></div>
-        <div class="info-item-box">
+        <div class="info-item-box npb">
           <div class="label pb--27">应缴</div>
           <div class="value bold-fz">
             {{ ( orderDetail.parkingRecord.totalFeeInYuan ) | currency }}
@@ -38,7 +38,7 @@
         <div class="info-item-box" v-if="orderDetail && orderDetail.discountInfo">
           <div class="label">积分减免</div>
           <div :class="['value']" @click="showPointsMathPopup('bottom')">
-            <sapn :class="[integralDesc === '今日已达上限' ? 'text-disable' : 'text-red']">{{ integralDesc }}</sapn>
+            <span :class="[integralDesc === '今日已达上限' ? 'text-disable' : 'text-red']">{{ integralDesc }}</span>
             <van-icon name="arrow"/>
           </div>
         </div>
@@ -72,6 +72,9 @@
         <div class="title_box">
           <span class="title">缴费说明</span>
         </div>
+        <div class="sub_title_box">
+          <span class="title">计费基础规则:</span>
+        </div>
         <div class="info" v-html="setDescription()"></div>
       </div>
 <!--      <div style="height: 50px;"></div>-->
@@ -283,6 +286,7 @@ export default {
   padding-left: 30px;
 
   .title_box {
+    padding-bottom: 10px;
     .title {
       font-family: 'PingFang SC';
       font-style: normal;
@@ -292,6 +296,17 @@ export default {
     }
   }
 
+  .sub_title_box {
+    padding-bottom: 5px;
+    .title {
+      font-family: 'PingFang SC';
+      font-style: normal;
+      font-weight: 400;
+      font-size: 26px;
+      color: #333333;   
+    }
+  }
+
   .info {
     font-family: 'PingFang SC';
     font-style: normal;

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

@@ -72,7 +72,7 @@
         </div>
         <div class="van-hairline--bottom"></div>
         <div class="choice_card_index orderno-box2">
-          <div class="orderFee">¥{{ item.actualPayFee }}</div>
+          <div class="orderFee">{{ item.actualPayFee | currency }}</div>
           <div class="orderDetail">查看详情</div>
           <!-- <van-icon name="arrow" /> -->
         </div>

+ 15 - 9
src/pages/parkingFee/vehicleAddOrEdit.vue

@@ -10,29 +10,29 @@
         <!-- <div v-for="i in carType === 1 ? 8 : 7" class="li" :key="`numArr${i}`" @click="clickShowKeyboard(i)" :class="[active === i ? 'active' : '']">
                   {{ numArr[i] }}
                 </div> -->
-        <div class="li" @click="clickShowKeyboard(0)" :class="[active === 0 ? 'active' : '']">
+        <div class="van-hairline--surround li" @click="clickShowKeyboard(0)" :class="[active === 0 ? 'active' : '']">
           {{ numArr[0] }}
         </div>
-        <div class="li" @click="clickShowKeyboard(1)" :class="[active === 1 ? 'active' : '']">
+        <div class="van-hairline--surround li" @click="clickShowKeyboard(1)" :class="[active === 1 ? 'active' : '']">
           {{ numArr[1] }}
         </div>
         <div class="input_box_dian">·</div>
-        <div class="li" @click="clickShowKeyboard(2)" :class="[active === 2 ? 'active' : '']">
+        <div class="van-hairline--surround li" @click="clickShowKeyboard(2)" :class="[active === 2 ? 'active' : '']">
           {{ numArr[2] }}
         </div>
-        <div class="li" @click="clickShowKeyboard(3)" :class="[active === 3 ? 'active' : '']">
+        <div class="van-hairline--surround li" @click="clickShowKeyboard(3)" :class="[active === 3 ? 'active' : '']">
           {{ numArr[3] }}
         </div>
-        <div class="li" @click="clickShowKeyboard(4)" :class="[active === 4 ? 'active' : '']">
+        <div class="van-hairline--surround li" @click="clickShowKeyboard(4)" :class="[active === 4 ? 'active' : '']">
           {{ numArr[4] }}
         </div>
-        <div class="li" @click="clickShowKeyboard(5)" :class="[active === 5 ? 'active' : '']">
+        <div class="van-hairline--surround li" @click="clickShowKeyboard(5)" :class="[active === 5 ? 'active' : '']">
           {{ numArr[5] }}
         </div>
-        <div :class="['li', carType !== 1 && 'dashed', active === 6 ? 'active' : '']" @click="clickShowKeyboard(6)">
+        <div :class="[' van-hairline--surround li', active === 6 ? 'active' : '']" @click="clickShowKeyboard(6)">
           {{ numArr[6] }}
         </div>
-        <div class="li dashed green-active" @click="clickShowKeyboard(7)" :class="[active === 7 ? 'active' : '']" >
+        <div class="van-hairline--surround li dashed green-active" @click="clickShowKeyboard(7)" :class="[active === 7 ? 'active' : '']" >
           <span v-if="numArr[7] && carType === 1">{{ numArr[7] }}</span>
           <img v-else :src="require('./static/images/unlicensed/leaf.svg')">
         </div>
@@ -125,7 +125,7 @@ export default {
 
     .li {
       width: 100%;
-      border: 1px solid #d9dbe0;
+      //border: 1px solid #d9dbe0;
       box-sizing: border-box;
       height: 90px;
       display: flex;
@@ -143,6 +143,12 @@ export default {
       &.active {
         border-color: var(--k-color-primary);
       }
+      &.van-hairline--surround {
+        &::after{
+          border-radius: 7px;
+          border-color: #D9DBE0;
+        }
+      }
       &.green-active {
         background: #F8FFED;
         border-color: #7DB124;

+ 9 - 2
src/store/order/points.js

@@ -40,14 +40,21 @@ export default {
     commit('setAvailable',available);
     commit('setMaxPointsTime',maxPointsTime);
     commit('setMaxDiscountFee',maxDiscountFee);
-    commit('setPointsTime',discountFee || 0);
+    let pointsTime = 0
+    // 深圳
+    if ( parkMallCode === 5 ) {
+      pointsTime = discountFee || 0
+    } else  {
+      pointsTime = discountFee ?  discountFee/ unitAmount: 0
+    }
+    commit('setPointsTime',pointsTime);
     commit('setPointsPerUnit',pointsPerUnit);
     commit('setMaxOneDayDiscountFee',maxOneDayDiscountFee);
     commit('setPointsPerHour',pointsPerUnit);
     commit('setUnitAmount',unitAmount);
     commit('setUnlimitUsePoints', unlimitUsePoints);
     commit('setUnitHour', unitHour);
-    commit('setIntegralDesc',discountFee ? `已选择兑换${ discountFee }元` : available > pointsPerUnit ? `${ available }积分可减免` : `${ pointsPerUnit }积分可停车1小时`); // 积分优惠处的描述
+    commit('setIntegralDesc',pointsTime ? `已选择兑换${ pointsTime }${parkMallCode === 5 ? '元' : '小时'}` : available > pointsPerUnit ? `${ available }积分可减免` : `${ pointsPerUnit }积分可停车1小时`); // 积分优惠处的描述
   },
   // 当前最大可选优惠时间
   /*

+ 1 - 1
src/store/order/utils.js

@@ -38,7 +38,7 @@ export function setSelected( types,orderDetail ) {
           }
           orderDetail.discountInfo.points = [{
             ...points,
-            selected: points.hasOwnProperty('selected') ? points.selected : points?.defaultSelected || false
+            selected: points.hasOwnProperty('discountFee')
           }]
         }
         break

+ 7 - 7
src/utils/index.js

@@ -173,12 +173,12 @@ export function initEnv() {
   const href = window.location.href;
   console.log('当前页面的url地址  ',href);
   if ( /dev-|8080/.test(href) ) {
-    window.env = 'qa';
-    window.profileApi = 'https://qa-apim.kerryplus.com/c/api';
-    window.api = 'qaApi';
-    // window.env = 'dev';
-    // window.profileApi = 'https://dev-gateway-kip.kerryonvip.com/api';
-    // window.api = 'devApi';
+    // window.env = 'qa';
+    // window.profileApi = 'https://qa-apim.kerryplus.com/c/api';
+    // window.api = 'qaApi';
+    window.env = 'dev';
+    window.profileApi = 'https://dev-gateway-kip.kerryonvip.com/api';
+    window.api = 'devApi';
     // window.env = 'prod';
     // window.profileApi = 'https://sl-apim.kerryplus.com/c/api';
     // window.api = 'api';
@@ -204,7 +204,7 @@ export function initEnv() {
 export function requestInit() {
   let baseURL = window.profileApi + '/temporary-parking/v1';
   if (window.location.href.indexOf('parking.') < 0) {
-    // baseURL = '/msApi';
+    baseURL = '/msApi';
   }
   window.requestms = createAxiosByinterceptors({
     // baseURL: `https://dev-kip-service-internal.kerryonvip.com/`,

+ 2 - 9
vue.config.js

@@ -122,15 +122,8 @@ module.exports = {
         },
       },
       '/msApi': {
-        // target: 'http://172.21.201.251:8080',
-        // target: 'http://172.21.203.156:8080',
-        target: 'http://172.21.202.63:8080',
-        // target: 'http://172.21.202.133:8080',
-        // target: 'https://dev-kip-service-internal.kerryonvip.com/temporary-parking-service', //代理地址,这里设置的地址会代替axios中设置的baseURL
-        // target: 'http://172.21.203.140:8080', //代理地址,这里设置的地址会代替axios中设置的baseURL   2023-2-9
-        // target: 'http://172.21.203.20:8080', //代理地址,这里设置的地址会代替axios中设置的baseURL
-        // target: 'http://172.21.200.89:8080', //代理地址,这里设置的地址会代替axios中设置的baseURL
-        // target: 'http://172.21.201.227:8080', // 代理地址,这里设置的地址会代替axios中设置的baseURL
+        target: 'https://dev-kip-service-internal.kerryonvip.com/temporary-parking-service', //代理地址,这里设置的地址会代替axios中设置的baseURL
+        // target: 'http://172.20.51.70:8080', // 代理地址,这里设置的地址会代替axios中设置的baseURL
         changeOrigin: true, // 如果接口跨域,需要进行这个参数配置
         //ws: true, // proxy websockets
         //pathRewrite方法重写url