Commit 4f62b909eb7da0833f59dea9be171471f378d33b

Authored by 刘淇
1 parent 11048911

阳明街道

package-lock.json
... ... @@ -8001,7 +8001,7 @@
8001 8001 "dependencies": {
8002 8002 "js-base64": {
8003 8003 "version": "2.6.4",
8004   - "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",
  8004 + "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",
8005 8005 "integrity": "sha1-9OaGxd4eofhn28rT1G2WlCjfmMQ="
8006 8006 },
8007 8007 "source-map": {
... ...
src/components/parkRecord.vue
... ... @@ -15,7 +15,7 @@
15 15 <div v-show="currentTabActive==0">
16 16  
17 17 <div v-if="parkingData.length>0">
18   - <p class="free-tip" v-if="parkingData[0].parkDuration<=900">停车15分钟内无需缴费,请申请离场。</p>
  18 + <p class="free-tip" v-if="parkingData[0].parkDuration<=60">停车1分钟内无需缴费,请申请离场。</p>
19 19  
20 20 <div class="cost-main" v-for="i in parkingData">
21 21 <ul class="cost-header">
... ... @@ -34,7 +34,7 @@
34 34 <p>停车时长:{{ $utils.dateFormat(i.parkDuration)}}</p>
35 35 <div class="out-wrap">
36 36 <p class="mon-wrap">¥{{(i.unPayFee/100).toFixed(2)}}</p>
37   - <p class="out-btn" @click="toPayCurrent(i,parkingData[0].parkDuration)" v-if="parkingData[0].parkDuration<=900">申请离场</p>
  37 + <p class="out-btn" @click="toPayCurrent(i,parkingData[0].parkDuration)" v-if="parkingData[0].parkDuration<=60">申请离场</p>
38 38 <p class="out-btn" @click="toPayCurrent(i,parkingData[0].parkDuration)" v-else>出场缴费</p>
39 39 </div>
40 40 </div>
... ...
src/components/plateNumber.vue
... ... @@ -259,18 +259,22 @@
259 259 </div>
260 260  
261 261  
262   - <modal-alert ref="alert">
263   - <div class="trave-tip-content txt-l" slot="content">
264   - <div class="confirm-text">
265   - <p>请输入正确的车牌号</p>
266   - </div>
267   - </div>
268   - <span slot="button">知道了</span>
269   - </modal-alert>
  262 + <!--<modal-alert ref="alert">-->
  263 + <!--<div class="trave-tip-content txt-l" slot="content">-->
  264 + <!--<div class="confirm-text">-->
  265 + <!--<p>请输入正确的车牌号</p>-->
  266 + <!--</div>-->
  267 + <!--</div>-->
  268 + <!--<span slot="button">知道了</span>-->
  269 + <!--</modal-alert>-->
270 270 </div>
271 271 </template>
272 272 <script>
273 273 export default {
  274 + components:{
  275 + // modalAlert
  276 +
  277 + },
274 278 data () {
275 279 return {
276 280 colorList:[
... ... @@ -423,7 +427,11 @@ export default {
423 427 plateLicense = this.plate_license_1
424 428 plateLicense = this.palindrome(plateLicense)
425 429 if (plateLicense.length < 7) {
426   - this.$refs.alert.open()
  430 + // this.$refs.alert.open()
  431 + this.$msgbox({
  432 + title: '提示',
  433 + message: '请输入正确的车牌号',
  434 + })
427 435 return
428 436 }
429 437 }
... ... @@ -431,7 +439,10 @@ export default {
431 439 plateLicense = this.plate_license_2
432 440 plateLicense = this.palindrome(plateLicense)
433 441 if (plateLicense.length < 8) {
434   - this.$refs.alert.open()
  442 + this.$msgbox({
  443 + title: '提示',
  444 + message: '请输入正确的车牌号',
  445 + })
435 446 return
436 447 }
437 448 }
... ...
src/utils/utils.js
... ... @@ -122,12 +122,12 @@ export default {
122 122  
123 123 myDeviceInfo: 'BC0703A4-AFB0-4B51-9089-9B7487C0CC6E', // 公共请求设备信息
124 124  
125   - myVxAppId: 'wx2af2bab90d433c86',
  125 + myVxAppId: 'wxdfb0276f85514ea3',
126 126 // 测试环境 微信赤峰 appid wxff4cebaedbf4f886
127 127 // 微信赤峰 appid wx2af2bab90d433c86
128 128 // 黄石 appid wxa1a66cc7d263afe6
129 129  
130   - myOrgId: '10003', // 归属地 赤峰id 10003 黄石 10079
  130 + myOrgId: '10193', //
131 131  
132 132 myGetSign: function (objb) { // 获取签名
133 133 var compare = function (obj1, obj2) {
... ...