From 4087b794084f707aa3d163f5758de0501f243897 Mon Sep 17 00:00:00 2001
From: liuqimichale <123456lq>
Date: Thu, 22 Apr 2021 15:16:03 +0800
Subject: [PATCH] 黄石微信公众号   -- 临停支付

---
 src/utils/request.js              |  2 +-
 src/utils/utils.js                | 10 +++++-----
 src/views/parkPay/orderPay.vue    | 63 ++++++++++++++++++++++++++++-----------------------------------
 src/views/parkPay/plateNumber.vue | 57 +++++++++++----------------------------------------------
 4 files changed, 45 insertions(+), 87 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index 59aa91b..d40bb2e 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -7,7 +7,7 @@ const service = axios.create({
   // http://pay.service.renniting.cn/  赤峰
   // http://pay.service.huangshiparking.com/  黄石正式环境
   //  http://39.98.54.240:8090/   黄石测试环境
-  baseURL: 'http://pay.service.renniting.cn/v1', // url = base url + request url
+  baseURL: 'http://pay.service.huangshiparking.com/', // url = base url + request url
   // withCredentials: true, // send cookies when cross-domain requests
   timeout: 6000 // request timeout
 })
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 78918f6..8ca08b7 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -145,16 +145,16 @@ export default {
   // ud8yq5tv0inxupc05xfeau39jywlqoj2  新的id
   // ny1u72b6k374sg379z0kqjgfxe2ycnpw 新的签名
 
-  myVarAppid:'ud8yq5tv0inxupc05xfeau39jywlqoj2',// 公共请求Appid
+  myVarAppid:'0eca8f5373ca4866aec2f8e9d9367104',// 公共请求Appid
 
   myDeviceInfo: 'BC0703A4-AFB0-4B51-9089-9B7487C0CC6E', // 公共请求设备信息
 
-  myVxAppId: 'wx2af2bab90d433c86',
+  myVxAppId: 'wxa1a66cc7d263afe6',
   // 测试环境 微信赤峰 appid   wxff4cebaedbf4f886
   // 微信赤峰 appid   wx2af2bab90d433c86
   // 黄石 appid    wxa1a66cc7d263afe6
 
-  myOrgId: '10003', // 归属地 赤峰id  10003    黄石 10079
+  myOrgId: '10079', // 归属地 赤峰id  10003    黄石 10079
 
   myGetSign: function (objb) { // 获取签名
     var compare = function (obj1, obj2) {
@@ -169,13 +169,13 @@ export default {
       }
     }
     objb.sort(compare);
-    var strmd5 = 'ny1u72b6k374sg379z0kqjgfxe2ycnpw';
+    var strmd5 = '14318527b13840c2a4af63fef52c2d6e';
     for(var i=0;i<objb.length;i++){
       if(objb[i].value != null&&objb[i].value != ''){
         strmd5 += objb[i].keyname+objb[i].value;
       }
     }
-    strmd5 += 'ny1u72b6k374sg379z0kqjgfxe2ycnpw';
+    strmd5 += '14318527b13840c2a4af63fef52c2d6e';
     // console.log('strmd5-------->'+strmd5);
     strmd5 = md5(strmd5);
     strmd5=strmd5.toUpperCase();
diff --git a/src/views/parkPay/orderPay.vue b/src/views/parkPay/orderPay.vue
index d113889..0d85238 100644
--- a/src/views/parkPay/orderPay.vue
+++ b/src/views/parkPay/orderPay.vue
@@ -42,8 +42,8 @@
 <script>
 // import CryptoJS from '../utils/AES.js'
 // let Base64 = require('js-base64').Base64
-import {  MessageBox } from 'mint-ui';
-import { aliPay, getOpenId, vxPayQuery, bankH5Pay, queryParkingRecordPageByCarNumbers } from '@/api/orderPay/orderPay'
+
+import {aliPay, getOpenId, vxPayQuery, bankH5Pay, queryParkingRecordPageByCarNumbers} from '@/api/orderPay/orderPay'
 
 export default {
   name: 'orderPay',
@@ -64,6 +64,7 @@ export default {
     }
   },
   created() {
+
     this.carWrapBG = this.$route.query.carColor //车牌颜色
     this.carNumber = this.$route.query.carNumber
     this.arrearageTotalFee = this.$route.query.arrearageTotalFee // 应收
@@ -78,10 +79,8 @@ export default {
       this.webAppCode = this.getCode();
     }
 
-
-
   },
-  mounted(){
+  mounted() {
 
   },
   methods: {
@@ -117,12 +116,11 @@ export default {
         this.orderId = _order
       }
 
-
       if (this.clientBrowser == '微信') { // 微信支付
         let _openId = sessionStorage.getItem('openIdData')
-        if(_openId){
+        if (_openId) {
           me.vxPay(_openId, this.orderId)
-        }else{
+        } else {
           //第一步获取openid
           var codeParams = {
             code: this.webAppCode,
@@ -131,12 +129,12 @@ export default {
           getOpenId(codeParams).then(res => {
             if (res.code == 0) {
               me.vxPay(res.data, this.orderId)
-              sessionStorage.setItem('openIdData',res.data)
+              sessionStorage.setItem('openIdData', res.data)
             } else if (res.code == 40163) { //code been used, hints[重复code问题]
-              alert('请重新扫码重复code问题')
+              this.$msgbox('提示', '请重新扫码重复code问题')
               console.log(res.message);
             } else {
-              alert('请重新扫码')
+              this.$msgbox('提示', '请重新扫码')
             }
           })
         }
@@ -172,11 +170,11 @@ export default {
               vm.onBridgeReady(data)
             }
           } else {
-            alert("没有找到返回值");
+            this.$msgbox('提示', '没有找到返回值')
           }
         } else {
           console.log(res.message);
-          alert(res.message);
+          this.$msgbox('提示', res.message)
         }
       })
     },
@@ -209,7 +207,7 @@ export default {
               deviceInfo: me.$utils.myDeviceInfo,
               salt: salt,
               sign_type: "md5",
-              token:'',
+              token: '',
             }
             wxparams.sign = me.$utils.signObject(wxparams)
             queryParkingRecordPageByCarNumbers(wxparams).then(response => {
@@ -218,17 +216,17 @@ export default {
 
               // alert(JSON.stringify(me.parkList))
               // alert(me.parkList.length)
-              if(me.parkList.length == 0){
+              if (me.parkList.length == 0) {
                 me.$router.push({
-                  path:'parkRecord',
-                  query:{
+                  path: 'parkRecord',
+                  query: {
                     carNumber: me.carNumber,
                     carNumberColor: me.carWrapBG,
                     parkFlag: 0 //  0表示在停    1表示历史
                   }
                 })
 
-              }else{
+              } else {
                 me.parkingData = me.parkList.filter(item => {
                   return item.parkState == '10'
                 })
@@ -238,7 +236,7 @@ export default {
                 })
                 console.log(me.historyList)
 
-                if(me.historyList.length>0){
+                if (me.historyList.length > 0) {
                   MessageBox.confirm('', {
                     message: '您当前有历史欠费 是否立即补缴?',
                     title: '温馨提示',
@@ -248,8 +246,8 @@ export default {
                     if (action == 'confirm') {     //确认的回调
                       console.log('确定');
                       me.$router.push({
-                        path:'parkRecord',
-                        query:{
+                        path: 'parkRecord',
+                        query: {
                           carNumber: me.carNumber,
                           carNumberColor: me.carWrapBG,
                           parkFlag: 1 //  0表示在停    1表示历史
@@ -261,18 +259,18 @@ export default {
                       console.log('取消');
                     }
                   });
-                }else{
+                } else {
 
-                  if(me.paySrcType==101){  //缴费了本次
+                  if (me.paySrcType == 101) {  //缴费了本次
                     me.$router.push({
-                      path:'parkRecord',
-                      query:{
+                      path: 'parkRecord',
+                      query: {
                         carNumber: me.carNumber,
                         carNumberColor: me.carWrapBG,
                         parkFlag: 0 //  0表示在停    1表示历史
                       }
                     })
-                  }else{
+                  } else {
                     MessageBox.confirm('', {
                       message: '您当前有在停订单 是否立即支付?',
                       title: '温馨提示',
@@ -282,8 +280,8 @@ export default {
                       if (action == 'confirm') {     //确认的回调
                         console.log('确定');
                         me.$router.push({
-                          path:'parkRecord',
-                          query:{
+                          path: 'parkRecord',
+                          query: {
                             carNumber: me.carNumber,
                             carNumberColor: me.carWrapBG,
                             parkFlag: 0 //  0表示在停    1表示历史
@@ -300,23 +298,18 @@ export default {
                 }
               }
 
-
-
             })
 
-
-
           } else {
             console.log('失败')
-            alert('支付失败')
+            this.$msgbox('提示', '支付失败')
             me.$router.go(-2);
           }
         }
       )
     },
   },
-  filters: {
-  }
+  filters: {}
 }
 </script>
 
diff --git a/src/views/parkPay/plateNumber.vue b/src/views/parkPay/plateNumber.vue
index 40461c9..2b20c2b 100644
--- a/src/views/parkPay/plateNumber.vue
+++ b/src/views/parkPay/plateNumber.vue
@@ -1,34 +1,17 @@
 <template>
   <div id="page">
 
-    <div class="swiper-container" style="height: 260px">
-      <div class="swiper-wrapper">
-        <div class="swiper-slide" v-for="item in swiperData" :key="item.id"
-             :style="{backgroundImage:'url(' + item.url + ')'}"
-             @click="openImgUrl(item)"
-        ></div>
-      </div>
-      <!-- 如果需要分页器 -->
-      <div class="swiper-pagination"></div>
-
-      <!-- 如果需要滚动条 -->
-      <!--    <div class="swiper-scrollbar"></div>-->
-    </div>
-
     <div class="wrap">
-      <!--<p style="margin-bottom: 18px;margin-top: 18px;">请选择车牌颜色</p>-->
-
-      <!--<ul class="color-choose">-->
-        <!--<li v-for="(i,index) in colorList" :key="i.name" @click="chooseColor(index)"-->
-        <!--:style="{color:currentColor==index?'#FFF':'',background:  currentColor==index?activeBG:'' }"-->
-        <!--&gt;-->
-          <!--{{i.name}}-->
-        <!--</li>-->
-
-      <!--</ul>-->
-
+      <p style="margin-bottom: 18px;margin-top: 18px;">请选择车牌颜色</p>
 
+      <ul class="color-choose">
+        <li v-for="(i,index) in colorList" :key="i.name" @click="chooseColor(index)"
+        :style="{color:currentColor==index?'#FFF':'',background:  currentColor==index?activeBG:'' }"
+        >
+          {{i.name}}
+        </li>
 
+      </ul>
 
 
       <p style="margin-bottom: 18px;margin-top: 18px;">请输入车牌号码</p>
@@ -97,7 +80,7 @@
       <div class="first-word"
            @click="selectFirstWord($event)">
         <div class="word">
-          <span>蒙</span>
+          <span>鄂</span>
         </div>
         <div class="word">
           <span>湘</span>
@@ -106,7 +89,7 @@
           <span>津</span>
         </div>
         <div class="word">
-          <span>鄂</span>
+          <span>蒙</span>
         </div>
         <div class="word">
           <span>沪</span>
@@ -290,14 +273,7 @@
     </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>
+
   </div>
 </template>
 <script>
@@ -618,17 +594,6 @@ export default {
 </script>
 <style lang="scss" scoped>
 
-  .swiper-container {
-    height: 206px;
-  }
-
-  .swiper-slide {
-    /*width: 100%;*/
-    height: 206px;
-    background-repeat: no-repeat;
-    background-size: 100% 100%;
-  }
-
   .flex-items-center {
     display: flex;
     align-items: center;
--
libgit2 0.21.4