From 25203cbb34ce222f76742e27f3c288f9468ae7e4 Mon Sep 17 00:00:00 2001
From: liuqimichale <123456lq>
Date: Thu, 11 Mar 2021 16:06:57 +0800
Subject: [PATCH] 15分钟免费时长

---
 src/api/parkRecord/parkRecord.js |  13 +++++++++++++
 src/components/parkRecord.vue    | 191 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------------------
 2 files changed, 127 insertions(+), 77 deletions(-)

diff --git a/src/api/parkRecord/parkRecord.js b/src/api/parkRecord/parkRecord.js
index c3baac8..d785cb6 100644
--- a/src/api/parkRecord/parkRecord.js
+++ b/src/api/parkRecord/parkRecord.js
@@ -25,3 +25,16 @@ export function parkingQuery(params) {
 }
 
 
+export function appApplyParkOut(params) {  // 0元出场
+  return request({
+    url: 'appAccountPay/appApplyParkOut',
+    method: 'post',
+    data: params
+  })
+}
+
+
+
+
+
+
diff --git a/src/components/parkRecord.vue b/src/components/parkRecord.vue
index c434ec4..302a657 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">停车30分钟内无需缴费，请直接离场。</p>
+          <p class="free-tip" v-if="parkingData[0].parkDuration<=900">停车15分钟内无需缴费，请直接离场。</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" @click="toPayCurrent(i)" v-if="parkingData[0].parkDuration>900">出场缴费</p>
+                <p class="out-btn" @click="toPayCurrent(i,parkingData[0].parkDuration)">出场缴费</p>
               </div>
             </div>
           </div>
@@ -47,9 +47,9 @@
 
 
       <!--历史缴费-->
-      <div v-show="currentTabActive==1" class="history-con" >
+      <div v-show="currentTabActive==1" class="history-con">
         <div v-if="historyList.length>0" style="height: 100%;">
-          <div class="history-body" >
+          <div class="history-body">
             <p class="money-all">总欠费金额：
               <span>¥{{(allMoney/100).toFixed(2)}}</span>
             </p>
@@ -120,11 +120,23 @@
       </div>
       <span slot="button">知道了</span>
     </modal-alert>
+
+
+    <modal-alert ref="zeroAlert">
+      <div class="trave-tip-content txt-l" slot="content">
+        <div class="confirm-text">
+          <p>停车15分钟内无需缴费，请申请离场。</p>
+        </div>
+      </div>
+      <span slot="button">知道了</span>
+    </modal-alert>
+
+
   </div>
 </template>
 
 <script>
-import { parkRecordList, historyQuery, parkingQuery } from '@/api/parkRecord/parkRecord.js'
+import {parkRecordList, historyQuery, parkingQuery, appApplyParkOut} from '@/api/parkRecord/parkRecord.js'
 import axios from 'axios'
 
 export default {
@@ -138,19 +150,19 @@ export default {
       carColor: 1,// 车牌颜色
       currentTabActive: 1, // 显示当前哪个
       carNumber: '', //  车牌号码
-      parkingData:[], //  在停数据
+      parkingData: [], //  在停数据
       parkList: [], // 停车记录数据
-      historyList:[  // 历史欠费数据
-        {money:100,checked:false, id: 1},
-      ] ,
-      allChecked:false, // 全部选择事件
-      allMoney:0, // 欠费所有的费用
-      historyCheckedLen:0, //选中了几笔交易
+      historyList: [  // 历史欠费数据
+        { money: 100, checked: false, id: 1 },
+      ],
+      allChecked: false, // 全部选择事件
+      allMoney: 0, // 欠费所有的费用
+      historyCheckedLen: 0, //选中了几笔交易
       historyCheckedMon: 0, //选中了待缴纳的金额
       orderIds: [] // 选中数据的订单 数组
     }
   },
-  mounted(){
+  mounted() {
   },
   created() {
     this.carNumber = this.$route.query.carNumber  // 获取车牌号
@@ -159,7 +171,7 @@ export default {
     this.parkRecordList(this.carNumber)
   },
   methods: {
-    parkRecordList(){  // 获取停车记录数据
+    parkRecordList() {  // 获取停车记录数据
       var salt = this.$utils.myCommonSalt(32);
       var jsondata = {
         app_id: this.$utils.myVarAppid,
@@ -185,14 +197,14 @@ export default {
         this.parkingData = this.parkList.filter(item => {
           return item.parkState == '10'
         })
-        if(this.parkingData.length>0){
+        if (this.parkingData.length > 0) {
           this.currentTabActive = 0
         }
         console.log(this.parkingData)
         this.historyList = this.parkList.filter(item => {
           return item.parkState == '20'
         })
-        this.historyList.forEach( i => {
+        this.historyList.forEach(i => {
           this.allMoney += Number(i.unPayFee)
         })
 
@@ -206,37 +218,36 @@ export default {
     chooseHandle(i, index) { // 历史欠费单个选择事件
       i.checked = !i.checked
       let me = this
-      if(i.checked ){ //单个选中
-        me.historyCheckedLen ++
-        if(me.historyCheckedLen == this.historyList.length){
+      if (i.checked) { //单个选中
+        me.historyCheckedLen++
+        if (me.historyCheckedLen == this.historyList.length) {
           this.allChecked = true
 
         }
         me.orderIds.push(i.orderId)
         me.historyCheckedMon += Number(i.unPayFee)
-      }else{ //单个不选中
+      } else { //单个不选中
         let _i = me.orderIds.indexOf(i.orderId)
-        me.orderIds.splice(_i,1)
+        me.orderIds.splice(_i, 1)
         this.allChecked = false
-        me.historyCheckedLen --
+        me.historyCheckedLen--
         me.historyCheckedMon -= Number(i.unPayFee)
       }
 
-
     },
     checkedAll() { // 全选选择事件
       this.allChecked = !this.allChecked
-      if(this.allChecked){  //全选
-        let me  = this
-        this.historyList.forEach(function(item){
+      if (this.allChecked) {  //全选
+        let me = this
+        this.historyList.forEach(function (item) {
           item.checked = true;
           me.orderIds.push(item.orderId)
         });
         this.historyCheckedMon = this.allMoney
         this.historyCheckedLen = this.historyList.length
 
-      }else{ //反选
-        this.historyList.forEach(function(item){
+      } else { //反选
+        this.historyList.forEach(function (item) {
           item.checked = false;
 
         });
@@ -245,46 +256,72 @@ export default {
         this.orderIds = []
       }
     },
-    toPayCurrent(i){ // 缴纳本次在停费用
+    toPayCurrent(i, num) { // 缴纳本次在停费用
+
       var salt = this.$utils.myCommonSalt(32);
-      var jsondata = {
+
+      var params = {
         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,
+        payOrderType: '101',
+        terminalSource: '3',
+
       }
-      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)
+      params.sign = this.$utils.signObject(params)
+      appApplyParkOut(params).then(response => {
+        console.log(response)
 
-        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, // 超时描述
-            }
+        if (response.code == '5005') {
+          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, // 超时描述
+                }
+              }
+            )
+          })
+
+        } else {
+          //$('.dialog-out').show()
+          this.$refs.zeroAlert.open()
+        }
+
       })
+
     },
     toPayHisroryPage() { // 缴纳历史费用
-      if(this.historyCheckedLen==0){
+      if (this.historyCheckedLen == 0) {
         this.$refs.alert.open()
         return
       }
@@ -315,8 +352,8 @@ export default {
         console.log(this.orderIds)
         this.$router.push(
           {
-            path:'orderPay',
-            query:{
+            path: 'orderPay',
+            query: {
               carColor: this.carColor,// 车牌颜色
               arrearageTotalFee: res.arrearageTotalFee,// 应收
               arrearageDiscFee: res.arrearageDiscFee,// 优惠
@@ -331,9 +368,7 @@ export default {
       })
     }
   },
-  filters: {
-
-  }
+  filters: {}
 }
 </script>
 
@@ -435,70 +470,72 @@ export default {
     }
   }
 
-  .history-con{
+  .history-con {
     height: calc(100% - 38px);
     overflow: hidden;
   }
-  .history-body{
+
+  .history-body {
     height: calc(100% - 81px);
     overflow-y: scroll;
   }
-  .history-footer{
+
+  .history-footer {
     height: 81px;
     background: #F8F8F8;
   }
 
-  .cost-main-history{
+  .cost-main-history {
     margin-bottom: 10px;
-    background:#fff url("../assets/images/choose.png") no-repeat 10px center;
+    background: #fff url("../assets/images/choose.png") no-repeat 10px center;
     background-size: 20px 20px;
     cursor: pointer;
   }
 
-
-  .isChecked{
-    background:#fff url("../assets/images/choosed.png") no-repeat 10px center;
+  .isChecked {
+    background: #fff url("../assets/images/choosed.png") no-repeat 10px center;
     background-size: 20px 20px;
   }
 
-  .money-all{
+  .money-all {
     padding-left: 18px;
     height: 25px;
     line-height: 25px;
     font-weight: 500;
     background: #FEF8DB;
-    span{
+    span {
       color: #BC0202;
     }
   }
 
-  .statistical-data{
+  .statistical-data {
     padding-left: 18px;
     height: 32px;
     line-height: 32px;
     background: #E6FAFA;
-    span{
+    span {
       color: #D20000;
     }
   }
-  .opration-wrap{
+
+  .opration-wrap {
     padding-left: 18px;
     height: 49px;
     line-height: 49px;
     background: #f8f8f8;
     display: flex;
     justify-content: space-between;
-    .check-btn{
+    .check-btn {
       padding-left: 30px;
       background: url("../assets/images/choose.png") no-repeat 0 center;
       background-size: 20px 20px;
       cursor: pointer;
     }
-    .isAllChecked{
+    .isAllChecked {
       background: url("../assets/images/choosed.png") no-repeat 0 center;
       background-size: 20px 20px;
     }
-    .settle-btn{
+    .settle-btn {
       width: 106px;
       height: 49px;
       background: linear-gradient(145deg, #2783E9 0%, #227ADC 100%);
--
libgit2 0.21.4