From 4f62b909eb7da0833f59dea9be171471f378d33b Mon Sep 17 00:00:00 2001
From: liugongyu <290219706@qq.com>
Date: Fri, 19 Nov 2021 16:26:25 +0800
Subject: [PATCH] 阳明街道

---
 package-lock.json              |  2 +-
 src/components/parkRecord.vue  |  4 ++--
 src/components/plateNumber.vue | 31 +++++++++++++++++++++----------
 src/utils/utils.js             |  4 ++--
 4 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9483e8f..f6dd0d7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8001,7 +8001,7 @@
       "dependencies": {
         "js-base64": {
           "version": "2.6.4",
-          "resolved": "https://registry.npmmirror.com/js-base64/download/js-base64-2.6.4.tgz?cache=0&sync_timestamp=1632308301843&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fjs-base64%2Fdownload%2Fjs-base64-2.6.4.tgz",
+          "resolved": "https://registry.nlark.com/js-base64/download/js-base64-2.6.4.tgz?cache=0&sync_timestamp=1631612507096&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fjs-base64%2Fdownload%2Fjs-base64-2.6.4.tgz",
           "integrity": "sha1-9OaGxd4eofhn28rT1G2WlCjfmMQ="
         },
         "source-map": {
diff --git a/src/components/parkRecord.vue b/src/components/parkRecord.vue
index 0c9f106..1d06476 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<=60">停车1分钟内无需缴费，请申请离场。</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,parkingData[0].parkDuration)" v-if="parkingData[0].parkDuration<=900">申请离场</p>
+                <p class="out-btn" @click="toPayCurrent(i,parkingData[0].parkDuration)" v-if="parkingData[0].parkDuration<=60">申请离场</p>
                 <p class="out-btn" @click="toPayCurrent(i,parkingData[0].parkDuration)" v-else>出场缴费</p>
               </div>
             </div>
diff --git a/src/components/plateNumber.vue b/src/components/plateNumber.vue
index 7e7da4a..10101e3 100644
--- a/src/components/plateNumber.vue
+++ b/src/components/plateNumber.vue
@@ -259,18 +259,22 @@
     </div>
 
 
-    <modal-alert ref="alert">
-      <div class="trave-tip-content txt-l" slot="content">
-        <div class="confirm-text">
-          <p>请输入正确的车牌号</p>
-        </div>
-      </div>
-      <span slot="button">知道了</span>
-    </modal-alert>
+    <!--<modal-alert ref="alert">-->
+      <!--<div class="trave-tip-content txt-l" slot="content">-->
+        <!--<div class="confirm-text">-->
+          <!--<p>请输入正确的车牌号</p>-->
+        <!--</div>-->
+      <!--</div>-->
+      <!--<span slot="button">知道了</span>-->
+    <!--</modal-alert>-->
   </div>
 </template>
 <script>
 export default {
+  components:{
+    // modalAlert
+
+  },
   data () {
     return {
       colorList:[
@@ -423,7 +427,11 @@ export default {
         plateLicense = this.plate_license_1
         plateLicense = this.palindrome(plateLicense)
         if (plateLicense.length < 7) {
-          this.$refs.alert.open()
+          // this.$refs.alert.open()
+          this.$msgbox({
+            title: '提示',
+            message: '请输入正确的车牌号',
+          })
           return
         }
       }
@@ -431,7 +439,10 @@ export default {
         plateLicense = this.plate_license_2
         plateLicense = this.palindrome(plateLicense)
         if (plateLicense.length < 8) {
-          this.$refs.alert.open()
+          this.$msgbox({
+            title: '提示',
+            message: '请输入正确的车牌号',
+          })
           return
         }
       }
diff --git a/src/utils/utils.js b/src/utils/utils.js
index e4917dd..68feb6a 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -122,12 +122,12 @@ export default {
 
   myDeviceInfo: 'BC0703A4-AFB0-4B51-9089-9B7487C0CC6E', // 公共请求设备信息
 
-  myVxAppId: 'wx2af2bab90d433c86',
+  myVxAppId: 'wxdfb0276f85514ea3',
   // 测试环境 微信赤峰 appid   wxff4cebaedbf4f886
   // 微信赤峰 appid   wx2af2bab90d433c86
   // 黄石 appid    wxa1a66cc7d263afe6
 
-  myOrgId: '10003', // 归属地 赤峰id  10003    黄石 10079
+  myOrgId: '10193', //
 
   myGetSign: function (objb) { // 获取签名
     var compare = function (obj1, obj2) {
--
libgit2 0.21.4