From 57753dccf49e5690ebcd3e55ee423a631f140a2a Mon Sep 17 00:00:00 2001
From: liugongyu <290219706@qq.com>
Date: Thu, 17 Mar 2022 11:51:47 +0800
Subject: [PATCH] 货车30分钟内免费

---
 src/components/orderPay.vue   | 6 +++---
 src/components/parkRecord.vue | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/components/orderPay.vue b/src/components/orderPay.vue
index 8f0756a..3077ed7 100644
--- a/src/components/orderPay.vue
+++ b/src/components/orderPay.vue
@@ -23,7 +23,7 @@
     </ul>
 
     <p style="margin-top: 20px;padding-left: 15px;">停车引导员工号（非必填）</p>
-    <mt-field style="font-size: 14px;color: #333;" label="" placeholder="请输入员工号" type="number" v-model="tollNxumber" :attr="{ oninput: 'if(value.length>7)value=value.slice(0,7)' }" ></mt-field>
+    <mt-field style="font-size: 14px;color: #333;" label="" placeholder="请输入员工号" type="number" v-model="tollNumber" :attr="{ oninput: 'if(value.length>7)value=value.slice(0,7)' }" ></mt-field>
 
     <div style="padding: 20px 18px">
       <div class="toPay" @click="toPay">{{clientBrowser}}支付</div>
@@ -130,7 +130,7 @@ export default {
 
       // tollNumber
       // this.backDeveloperCode = this.tollNumber  //  输入字段
-      let ticketChargeCode =  this.$route.query.ticketChargeCode  // 二维码里面的收费员编号
+      let ticketChargeCode =  this.$route.query.backDeveloperCode  // 二维码里面的收费员编号
       if (this.clientBrowser == '支付宝') { // 支付宝支付
         let me = this
         var aliParams = {};
@@ -298,7 +298,7 @@ export default {
       wxParams.recordArreaInfos = JSON.stringify(orderIdData);
       wxParams.openId = openIdData;
       wxParams.backDeveloperCode = this.tollNumber
-      wxParams.ticketChargeCode = ticketChargeCode
+      wxParams.ticketChargeCode =  this.$route.query.backDeveloperCode
       wxParams.appId = this.$utils.myVxAppId;
       vxPayQuery(wxParams).then(res => {
         if (res.code == 0) { //
diff --git a/src/components/parkRecord.vue b/src/components/parkRecord.vue
index 0c9f106..669a6d5 100644
--- a/src/components/parkRecord.vue
+++ b/src/components/parkRecord.vue
@@ -15,7 +15,7 @@
       <div v-show="currentTabActive==0">
 
         <div v-if="parkingData.length>0">
-          <p class="free-tip" v-if="parkingData[0].parkDuration<=900">停车15分钟内无需缴费，请申请离场。</p>
+          <p class="free-tip" v-if="parkingData[0].parkDuration<=900">停车15分钟内(货车30分钟内)无需缴费！</p>
 
           <div class="cost-main" v-for="i in parkingData">
             <ul class="cost-header">
@@ -35,6 +35,8 @@
               <div class="out-wrap">
                 <p class="mon-wrap">￥{{(i.unPayFee/100).toFixed(2)}}</p>
                 <p class="out-btn" @click="toPayCurrent(i,parkingData[0].parkDuration)" v-if="parkingData[0].parkDuration<=900">申请离场</p>
+                <p class="out-btn" @click="toPayCurrent(i,parkingData[0].parkDuration)" v-else-if="parkingData[0].parkDuration<=1800&parkingData[0].carType==7">申请离场</p>
+                <p class="out-btn" @click="toPayCurrent(i,parkingData[0].parkDuration)" v-else-if="parkingData[0].parkDuration<=1800&parkingData[0].carType==8">申请离场</p>
                 <p class="out-btn" @click="toPayCurrent(i,parkingData[0].parkDuration)" v-else>出场缴费</p>
               </div>
             </div>
@@ -331,7 +333,7 @@ export default {
 
         } else {
           //$('.dialog-out').show()
-          this.$msgbox('提示', '停车15分钟内无需缴费，申请成功。')
+          this.$msgbox('提示', '您已成功申请离场！')
         }
 
       })
--
libgit2 0.21.4