From 7ddbff4d6ee25b04be574cc073f9192c50f80f3f Mon Sep 17 00:00:00 2001
From: liuqimichale <123456lq>
Date: Tue, 19 Jan 2021 17:30:08 +0800
Subject: [PATCH] 本次停车费用 出场

---
 src/api/parkRecord/parkRecord.js | 10 ++++++++++
 src/components/orderPay.vue      | 19 +++++++++++--------
 src/components/parkRecord.vue    | 63 ++++++++++++++++++++++++++++++++++++++++++++-------------------
 3 files changed, 65 insertions(+), 27 deletions(-)

diff --git a/src/api/parkRecord/parkRecord.js b/src/api/parkRecord/parkRecord.js
index 680030c..1516d8e 100644
--- a/src/api/parkRecord/parkRecord.js
+++ b/src/api/parkRecord/parkRecord.js
@@ -15,3 +15,13 @@ export function historyQuery(params) {
     data: params
   })
 }
+
+export function parkingQuery(params) {
+  return request({
+    url: '/api/queryParkOrder/billQuery',
+    method: 'post',
+    data: params
+  })
+}
+
+
diff --git a/src/components/orderPay.vue b/src/components/orderPay.vue
index df2543f..7e03bbf 100644
--- a/src/components/orderPay.vue
+++ b/src/components/orderPay.vue
@@ -25,13 +25,15 @@
       <div class="toPay" @click="toPay">{{clientBrowser}}支付</div>
     </div>
 
-    <p class="tip">
-      温馨提示：
-    </p>
-    <p style="color: #666;padding: 0 18px;">
-      请在支付完成后15分钟内出场，如超出15分钟，会
-      产生相应费用。
-    </p>
+    <div v-if="appOrderTimeout.length>0">
+      <p class="tip">
+        温馨提示：
+      </p>
+      <p style="color: #666;padding: 0 18px;">
+        {{appOrderTimeout}}
+      </p>
+    </div>
+
 
 
   </div>
@@ -53,6 +55,7 @@ export default {
       paySrcType: '', //支付的类型   101 是本次   103是历史欠费
       orderId: '',  //支付的订单
       webAppCode: '', // 微信code
+      appOrderTimeout: '', // 超时描述
     }
   },
   created() {
@@ -64,7 +67,7 @@ export default {
     this.clientBrowser = this.$utils.clientBrowser() //支付方式
     this.paySrcType = this.$route.query.paySrcType // 实收
     this.orderId = this.$route.query.ordeID
-
+    this.appOrderTimeout = this.$route.query.appOrderTimeout
     if (this.clientBrowser == "微信") {
       this.webAppCode = this.getCode();
     }
diff --git a/src/components/parkRecord.vue b/src/components/parkRecord.vue
index 66be8ad..a6849a7 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">您为会员卡车辆无需缴费，请直接离场。</p>
+          <p class="free-tip" v-if="parkingData[0].parkDuration<=1800">停车30分钟内无需缴费，请直接离场。</p>
 
           <div class="cost-main" v-for="i in parkingData">
             <ul class="cost-header">
@@ -34,7 +34,7 @@
               <p>停车时长：{{ $utils.dateFormat(i.parkDuration)}}</p>
               <div class="out-wrap">
                 <p class="mon-wrap">￥{{(i.unPayFee/100).toFixed(2)}}</p>
-                <p class="out-btn">出场缴费</p>
+                <p class="out-btn" @click="toPayCurrent(i)">出场缴费</p>
               </div>
             </div>
           </div>
@@ -94,7 +94,7 @@
               <p class="check-btn" :class="{isAllChecked:allChecked}"
                  @click="checkedAll"
               >全选</p>
-              <p class="settle-btn" @click="toPayPage">清缴欠费</p>
+              <p class="settle-btn" @click="toPayHisroryPage">清缴欠费</p>
             </div>
           </div>
         </div>
@@ -124,7 +124,7 @@
 </template>
 
 <script>
-import { parkRecordList, historyQuery } from '@/api/parkRecord/parkRecord.js'
+import { parkRecordList, historyQuery, parkingQuery } from '@/api/parkRecord/parkRecord.js'
 import axios from 'axios'
 
 export default {
@@ -142,7 +142,6 @@ export default {
       parkList: [], // 停车记录数据
       historyList:[  // 历史欠费数据
         {money:100,checked:false, id: 1},
-
       ] ,
       allChecked:false, // 全部选择事件
       allMoney:0, // 欠费所有的费用
@@ -156,14 +155,12 @@ export default {
   created() {
     this.carNumber = this.$route.query.carNumber  // 获取车牌号
     this.carColor = this.$route.query.carNumberColor  // 获取颜色   0:蓝牌;1:黄牌;2:白牌;3:黑牌;4:绿色
-
     console.log(this.carNumber)
     this.parkRecordList(this.carNumber)
   },
   methods: {
-    parkRecordList(){
+    parkRecordList(){  // 获取停车记录数据
       var salt = this.$utils.myCommonSalt(32);
-
       var jsondata = {
         app_id: this.$utils.myVarAppid,
         deviceInfo: this.$utils.myDeviceInfo,
@@ -179,8 +176,6 @@ export default {
       }
       jsondata.sign = this.$utils.signObject(jsondata)
 
-
-
       // jsondata.sign = md5sign
       console.log('停车记录传参  ' + JSON.stringify(jsondata));
       parkRecordList(jsondata).then(response => {
@@ -205,15 +200,12 @@ export default {
       })
     },
 
-
-
     tabHandle(index) { // tab 切换
       this.currentTabActive = index
     },
     chooseHandle(i, index) { // 历史欠费单个选择事件
       i.checked = !i.checked
       let me = this
-
       if(i.checked ){ //单个选中
         me.historyCheckedLen ++
         if(me.historyCheckedLen == this.historyList.length){
@@ -253,7 +245,45 @@ export default {
         this.orderIds = []
       }
     },
-    toPayPage() { //缴纳费用
+    toPayCurrent(i){ // 缴纳本次在停费用
+      var salt = this.$utils.myCommonSalt(32);
+      var jsondata = {
+        app_id: this.$utils.myVarAppid,
+        deviceInfo: this.$utils.myDeviceInfo,
+        salt: salt,
+        sign_type: "md5",
+        payType: 4,
+        appId: this.$utils.myVxAppId,
+        orderId: i.orderId,
+        terminalSource: '7',
+        parkCode: i.parkCode,
+        carNumber: this.carNumber,
+      }
+      jsondata.sign = this.$utils.signObject(jsondata)
+      parkingQuery(jsondata).then(result => {
+        console.log(result)
+        let res = result.data
+        let _dis = res.discountFee
+        let discountFee = _dis.slice(1,_dis.length-1)
+
+        this.$router.push(
+          {
+            path:'orderPay',
+            query:{
+              carColor: this.carColor,// 车牌颜色
+              arrearageTotalFee: res.orderTotalFee,// 应收
+              arrearageDiscFee: discountFee*100,// 优惠
+              arrearageActFee: res.orderFee,// 实收
+              carNumber: this.carNumber, // 车牌
+              paySrcType: 101, //支付的类型   101 是本次   103是历史欠费
+              ordeID: i.orderId, //支付的订单号
+              appOrderTimeout: res.appOrderTimeout, // 超时描述
+            }
+          }
+        )
+      })
+    },
+    toPayHisroryPage() { // 缴纳历史费用
       if(this.historyCheckedLen==0){
         this.$refs.alert.open()
         return
@@ -262,7 +292,6 @@ export default {
 
       var list = "[" + this.orderIds + "]"
 
-
       var jsondata = {
         app_id: this.$utils.myVarAppid,
         deviceInfo: this.$utils.myDeviceInfo,
@@ -297,10 +326,6 @@ export default {
           }
         )
       })
-
-
-
-
     }
   },
   filters: {
--
libgit2 0.21.4