From c865a00f85df43e337af7c230670e9ee495623bc Mon Sep 17 00:00:00 2001
From: liuqimichale <123456lq>
Date: Mon, 25 Jan 2021 15:54:12 +0800
Subject: [PATCH] 赤峰支付宝支付

---
 src/components/navigation.vue  | 53 ++++++++++++++++++++++++++++++++++++++---------------
 src/components/orderPay.vue    | 26 ++++++++++++++++----------
 src/components/parkRecord.vue  |  2 +-
 src/components/plateNumber.vue |  3 ++-
 src/utils/request.js           |  6 +++++-
 src/utils/utils.js             | 10 +++++-----
 6 files changed, 67 insertions(+), 33 deletions(-)

diff --git a/src/components/navigation.vue b/src/components/navigation.vue
index 89aa038..62b9b3a 100644
--- a/src/components/navigation.vue
+++ b/src/components/navigation.vue
@@ -3,8 +3,9 @@
     <div style="height: 206px;">
       <div class="swiper-container">
         <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 class="swiper-slide" v-for="item in swiperData" :key="item.id"
+               :style="{backgroundImage:'url(' + item.url + ')'}"
+               @click="openImgUrl(item)"
           ></div>
         </div>
         <!-- 如果需要分页器 -->
@@ -23,11 +24,11 @@
         <p class="carNumber">{{carNumber}}</p>
       </div>
 
-      <p class="toParkRecord">
+      <p class="toParkRecord" @click="toParkRecord">
         是我的车，去支付
       </p>
 
-      <p class="toPlateNumber">
+      <p class="toPlateNumber" @click="toPlateNumber">
         不是我的车，手动输入
       </p>
 
@@ -39,7 +40,8 @@
 
 <script>
 import Swiper from 'swiper' //  应入swiper
-import { swiperQuery } from '../api/navigation/navigation'
+import {swiperQuery} from '../api/navigation/navigation'
+
 export default {
   name: 'navigation',
   data() {
@@ -59,7 +61,7 @@ export default {
     this.initSWiper()
   },
   methods: {
-    initSWiper(){
+    initSWiper() {
       var salt = this.$utils.myCommonSalt(32)
       var jsondata = {
         app_id: this.$utils.myVarAppid,
@@ -67,14 +69,14 @@ export default {
         salt: salt,
         sign_type: 'md5',
         sign: '1',
-        orgId:this.$utils.myOrgId,
+        orgId: this.$utils.myOrgId,
         jumpType: '8'
       };
       // jsondata = JSON.stringify(jsondata);
-      swiperQuery(jsondata).then( res => {
+      swiperQuery(jsondata).then(res => {
         this.swiperData = res.data
         console.log(this.swiperData)
-        new Swiper ('.swiper-container', {
+        new Swiper('.swiper-container', {
           pagination: '.swiper-pagination',
           paginationClickable: true,
           centeredSlides: true,
@@ -90,23 +92,41 @@ export default {
         })
       })
     },
-    openImgUrl(i){ // 点击图片跳转
+    openImgUrl(i) { // 点击图片跳转
       window.open(i.jumpUrl)
-    }
+    },
+    toPlateNumber() { //  前往输入车牌页面
+      this.$router.push({
+          path: 'plateNumber',
+
+        }
+      )
+    },
+    toParkRecord() { //  前往停车记录页面
+      this.$router.push({
+        path: 'parkRecord',
+        query: {
+          carNumber: this.carNumber,
+          carNumberColor: this.carWrapBG
+        }
+      })
+    },
   }
 }
 </script>
 
 <style scoped lang="scss">
-  .swiper-container{
+  .swiper-container {
     height: 206px;
   }
-  .swiper-slide{
+
+  .swiper-slide {
     /*width: 100%;*/
     height: 206px;
     background-repeat: no-repeat;
     background-size: 100% 100%;
   }
+
   .carNumberTip {
     width: 200px;
     margin: 20px auto 10px;
@@ -129,6 +149,7 @@ export default {
     font-size: 24px;
     color: #fff;
   }
+
   .carBlue {
     background: url("../assets/images/blueBG.png") no-repeat;
     background-size: 100% 100%;
@@ -153,7 +174,8 @@ export default {
     background: url("../assets/images/blackBG.png") no-repeat;
     background-size: 100% 100%;
   }
-  .toParkRecord{
+
+  .toParkRecord {
     margin-top: 40px;
     margin-bottom: 20px;
     height: 50px;
@@ -164,7 +186,8 @@ export default {
     background-size: 100% 50px;
     cursor: pointer;
   }
-  .toPlateNumber{
+
+  .toPlateNumber {
     text-align: right;
     cursor: pointer;
   }
diff --git a/src/components/orderPay.vue b/src/components/orderPay.vue
index 8ba6a80..25193cc 100644
--- a/src/components/orderPay.vue
+++ b/src/components/orderPay.vue
@@ -67,6 +67,7 @@ export default {
     this.clientBrowser = this.$utils.clientBrowser() //支付方式
     this.paySrcType = this.$route.query.paySrcType // 实收
     this.orderId = this.$route.query.ordeID
+    console.log(this.orderId)
     this.appOrderTimeout = this.$route.query.appOrderTimeout
     if (this.clientBrowser == "微信") {
       this.webAppCode = this.getCode();
@@ -75,7 +76,7 @@ export default {
   methods: {
     getCode() {
       var appID = this.$utils.myVxAppId;
-      var code = this.$route.query.code
+      var code = this.getUrlParamfunction(code)
       var local = window.location.href;
       if (code == null || code === '') {
         window.location.href = 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=' + appID + '&redirect_uri=' + encodeURIComponent(local) + '&response_type=code&scope=snsapi_userinfo&state=1#wechat_redirect'
@@ -83,12 +84,19 @@ export default {
         return code;
       }
     },
+    getUrlParamfunction(name) {
+      var reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)');
+      var r = window.location.search.substr(1).match(reg)
+      if (r != null) return unescape(r[2])
+      return null
+    },
     toPay() {
       let me = this
       let _order = []
-      this.orderId = JSON.parse(this.orderId)
+
       console.log(this.orderId)
       if (this.paySrcType == 103) {
+        this.orderId = JSON.parse(this.orderId)
         this.orderId.forEach(item => {
           _order.push({
             orderId: item
@@ -100,8 +108,6 @@ export default {
 
       if (this.clientBrowser == '支付宝') { // 支付宝支付
         var aliParams = {};
-        console.log(this.orderId)
-        console.log(typeof this.orderId)
         aliParams.orderId = this.orderId;
         aliParams.carNumber = this.carNumber;
         aliParams.payType = 1;// 1:支付宝 2：微信 3：银联 10:H5   4微信公众号
@@ -110,7 +116,7 @@ export default {
         aliParams.orgId = this.$utils.myOrgId,
         aliParams.backType = 2,
         aliParams.recordArreaInfos = JSON.stringify(this.orderId);
-
+        console.log(aliParams)
         aliPay(aliParams).then(response => {
           console.log(response)
           if (response.code == 0) {//进场
@@ -146,15 +152,15 @@ export default {
       var wxParams = {};
       wxParams.orderId = orderIdData;
       wxParams.backType = 2,
-      wxParams.orgId = this.$utils.myOrgId,
-      wxParams.payType = 4;// 1:支付宝 2：微信 3：银联 10:H5   4微信公众号
+        wxParams.orgId = this.$utils.myOrgId,
+        wxParams.payType = 4;// 1:支付宝 2：微信 3：银联 10:H5   4微信公众号
       wxParams.terminalSource = 7;//请求端来源 1： 任你停 2：pda 3：微信公共号 7:H5扫码 10页面支付
       wxParams.carNumber = this.carNumber;
       wxParams.paySrcType = this.paySrcType;//101停车支付
       wxParams.recordArreaInfos = JSON.stringify(orderIdData);
       wxParams.openId = openIdData;
       wxParams.appId = this.$utils.myVxAppId;
-      vxPayQuery(wxParams).then( res => {
+      vxPayQuery(wxParams).then(res => {
         if (res.code == 0) { //
           //alertMsg("出场成功");
           if (res.data) {
@@ -180,7 +186,7 @@ export default {
         }
       })
     },
-    onBridgeReady (data) {
+    onBridgeReady(data) {
       console.log('调用微信支付WeixinJSBridge')
       var vm = this
       WeixinJSBridge.invoke(
@@ -197,7 +203,7 @@ export default {
         function (res) {
           // 使用以上方式判断前端返回,微信团队郑重提示：res.err_msg将在用户支付成功后返回ok，但并不保证它绝对可靠。
           if (res.err_msg === 'get_brand_wcpay_request:ok') {
-           console.log('成功')
+            console.log('成功')
           } else {
             console.log('失败')
             alert('支付失败')
diff --git a/src/components/parkRecord.vue b/src/components/parkRecord.vue
index fcbf122..1e4e653 100644
--- a/src/components/parkRecord.vue
+++ b/src/components/parkRecord.vue
@@ -171,7 +171,7 @@ export default {
         parkState: 10,
         terminalSource: 7,
         carNumber: this.carNumber,
-        // sign: md5sign,
+        carNumberColor: this.carColor,
         orgId: this.$utils.myOrgId
       }
       jsondata.sign = this.$utils.signObject(jsondata)
diff --git a/src/components/plateNumber.vue b/src/components/plateNumber.vue
index e5dca39..78508ad 100644
--- a/src/components/plateNumber.vue
+++ b/src/components/plateNumber.vue
@@ -389,7 +389,8 @@ export default {
       this.$router.push({
         path:'parkRecord',
         query:{
-          carNumber:plateLicense
+          carNumber:plateLicense,
+          carNumberColor: this.currentColor
         }
       })
     },
diff --git a/src/utils/request.js b/src/utils/request.js
index ec511a0..caec504 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -7,7 +7,11 @@ const service = axios.create({
 
   // http://pay.service.renniting.cn/  赤峰
   // http://pay.service.huangshiparking.com/  黄石
-  baseURL: 'http://pay.service.renniting.cn/', // url = base url + request url
+
+  // 'http://39.98.58.92:8090';   赤峰测试环境
+
+
+  baseURL: 'http://39.98.58.92:8090/', // 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 08abba3..a9151b8 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -91,16 +91,16 @@ export default {
   // ud8yq5tv0inxupc05xfeau39jywlqoj2  新的id
   // ny1u72b6k374sg379z0kqjgfxe2ycnpw 新的签名
 
-  myVarAppid:'0eca8f5373ca4866aec2f8e9d9367104',// 公共请求Appid
+  myVarAppid:'ud8yq5tv0inxupc05xfeau39jywlqoj2',// 公共请求Appid
 
   myDeviceInfo: 'BC0703A4-AFB0-4B51-9089-9B7487C0CC6E', // 公共请求设备信息
 
-  myVxAppId: 'wxa1a66cc7d263afe6',
+  myVxAppId: 'wx2af2bab90d433c86',
   // 测试环境 微信赤峰 appid   wxff4cebaedbf4f886
   // 微信赤峰 appid   wx2af2bab90d433c86
   // 黄石 appid    wxa1a66cc7d263afe6
 
-  myOrgId: '10079', // 归属地 赤峰id  10003    黄石 10079
+  myOrgId: '10003', // 归属地 赤峰id  10003    黄石 10079
 
   myGetSign: function (objb) { // 获取签名
     var compare = function (obj1, obj2) {
@@ -115,13 +115,13 @@ export default {
       }
     }
     objb.sort(compare);
-    var strmd5 = '14318527b13840c2a4af63fef52c2d6e';
+    var strmd5 = 'ny1u72b6k374sg379z0kqjgfxe2ycnpw';
     for(var i=0;i<objb.length;i++){
       if(objb[i].value != null&&objb[i].value != ''){
         strmd5 += objb[i].keyname+objb[i].value;
       }
     }
-    strmd5 += '14318527b13840c2a4af63fef52c2d6e';
+    strmd5 += 'ny1u72b6k374sg379z0kqjgfxe2ycnpw';
     // console.log('strmd5-------->'+strmd5);
     strmd5 = md5(strmd5);
     strmd5=strmd5.toUpperCase();
--
libgit2 0.21.4