From 854b848573c36a91f234a73d6f6f48c8217060e6 Mon Sep 17 00:00:00 2001
From: liugongyu <290219706@qq.com>
Date: Wed, 22 Feb 2023 09:18:58 +0800
Subject: [PATCH] 免费停车

---
 dist.zip                      | Bin 301903 -> 0 bytes
 src/components/parkRecord.vue | 20 ++++++++++++--------
 src/utils/utils.js            |  1 +
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/dist.zip b/dist.zip
index da86d63..cb4cb98 100644
Binary files a/dist.zip and b/dist.zip differ
diff --git a/src/components/parkRecord.vue b/src/components/parkRecord.vue
index 669a6d5..4f1c7da 100644
--- a/src/components/parkRecord.vue
+++ b/src/components/parkRecord.vue
@@ -34,10 +34,12 @@
               <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,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>
+                <!--<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>-->
+
+                <p class="out-btn" @click="toPayCurrent(i,parkingData[0].parkDuration)">{{i.parkDuration>i.orderFreeDuration?"结束停车":"申请离场"}}</p>
               </div>
             </div>
           </div>
@@ -279,6 +281,7 @@ export default {
       }
     },
     toPayCurrent(i, num) { // 缴纳本次在停费用
+      console.log(i)
       var salt = this.$utils.myCommonSalt(32);
       var params = {
         app_id: this.$utils.myVarAppid,
@@ -292,8 +295,9 @@ export default {
       params.sign = this.$utils.signObject(params)
       appApplyParkOut(params).then(response => {
         console.log(response)
-
-        if (response.code == '5005') {
+        if(response.code == '5000'){
+          this.$msgbox('提示', '您已成功申请离场！')
+        }else if (response.code == '5005') {
           var salt = this.$utils.myCommonSalt(32);
           var jsondata = {
             app_id: this.$utils.myVarAppid,
@@ -332,8 +336,8 @@ export default {
           })
 
         } else {
-          //$('.dialog-out').show()
-          this.$msgbox('提示', '您已成功申请离场！')
+          this.$router.go(0);
+          this.$msgbox('提示', '您申请离场失败！')
         }
 
       })
diff --git a/src/utils/utils.js b/src/utils/utils.js
index e4917dd..ac2dbd7 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -15,6 +15,7 @@ export default {
 
 
   dateFormat: function (msd) {  // 时间转换
+    console.log(msd)
     var time = msd
 
     if (null != time && "" != time) {
--
libgit2 0.21.4