From 49f85de6e92de9f94796f0fda899368974f68f8e Mon Sep 17 00:00:00 2001
From: liuqimichale <123456lq>
Date: Wed, 28 Apr 2021 10:05:11 +0800
Subject: [PATCH] 黄石微信公众号   -- 临停支付

---
 dist.zip                       | Bin 1020988 -> 0 bytes
 src/api/binDing/binDing.js     |  37 +++++++++++++++++++++++++++++++++++++
 src/api/orderPay/orderPay.js   |  18 +++++++++---------
 src/api/selfNav/selfNav.js     |  41 +++++++++++++++++++++++++++++++++++++++++
 src/main.js                    |  22 +++++++++++-----------
 src/router/index.js            |  24 ++++++++++++------------
 src/utils/utils.js             |  92 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------
 src/views/binding/binDing.vue  | 128 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------
 src/views/mySelf/selfNav.vue   | 137 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------
 src/views/parkPay/orderPay.vue | 311 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 10 files changed, 527 insertions(+), 283 deletions(-)
 create mode 100644 src/api/binDing/binDing.js
 create mode 100644 src/api/selfNav/selfNav.js

diff --git a/dist.zip b/dist.zip
index 15f9333..9dd5652 100644
Binary files a/dist.zip and b/dist.zip differ
diff --git a/src/api/binDing/binDing.js b/src/api/binDing/binDing.js
new file mode 100644
index 0000000..144d576
--- /dev/null
+++ b/src/api/binDing/binDing.js
@@ -0,0 +1,37 @@
+import request from '@/utils/request'
+
+export function sendverificode(params) {  // 获取验证码
+  return request({
+    url: 'user/sendverificode',
+    method: 'post',
+    data: params
+  })
+}
+
+
+export function bindCustByOpenId(params) {  // 绑定用户
+  return request({
+    url: 'wxPublicUser/bindCustByOpenId',
+    method: 'post',
+    data: params
+  })
+}
+
+
+export function queryUserInfo(params) {  // 获取用户信息
+  return request({
+    url: 'user/queryUserInfo',
+    method: 'post',
+    data: params
+  })
+}
+
+
+
+
+
+
+
+
+
+
diff --git a/src/api/orderPay/orderPay.js b/src/api/orderPay/orderPay.js
index 0a9d574..dc2a28e 100644
--- a/src/api/orderPay/orderPay.js
+++ b/src/api/orderPay/orderPay.js
@@ -17,6 +17,7 @@ export function getOpenId(params) {  // 获取OpenId
   })
 }
 
+
 export function vxPayQuery(params) {  // 微信
   return request({
     url: 'weixinpay/publicUnifiedOrder',
@@ -25,18 +26,22 @@ export function vxPayQuery(params) {  // 微信
   })
 }
 
+// 新接口银联
 
-export function bankH5Pay(params) {  // 农行
+export function doPay(params) {  // 微信
   return request({
-    url: 'abcBankPay/bankPayForH5',
+    url: 'unionpay/doPay',
     method: 'post',
     data: params
   })
 }
 
-export function queryParkingRecordPageByCarNumbers(params) {  // 支付完成后查询记录
+
+// 创建订单
+
+export function doOrderCreate(params) {  // 创建订单
   return request({
-    url: 'queryParkOrder/queryParkingRecordPageByCarNumbers',
+    url: 'unionpay/doOrderCreate',
     method: 'post',
     data: params
   })
@@ -45,8 +50,3 @@ export function queryParkingRecordPageByCarNumbers(params) {  // 支付完成后
 
 
 
-
-
-
-
-
diff --git a/src/api/selfNav/selfNav.js b/src/api/selfNav/selfNav.js
new file mode 100644
index 0000000..9f7f18e
--- /dev/null
+++ b/src/api/selfNav/selfNav.js
@@ -0,0 +1,41 @@
+import request from '@/utils/request'
+
+export function getOpenIdByCode(params) {  // 获取opendid
+  return request({
+    url: 'weixinPublicPay/getOpenIdByCode',
+    method: 'post',
+    data: params
+  })
+}
+
+
+export function getTokenByOpenId(params) {  // 获取token和手机号
+  return request({
+    url: 'wxPublicUser/getTokenByOpenId',
+    method: 'post',
+    data: params
+  })
+}
+
+
+export function queryUserInfo(params) {  // 获取用户信息
+  return request({
+    url: 'user/queryUserInfo',
+    method: 'post',
+    data: params
+  })
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main.js b/src/main.js
index ebb25e9..a2761a8 100644
--- a/src/main.js
+++ b/src/main.js
@@ -6,19 +6,21 @@ import router from './router'
 
 import './assets/css/reset.css'  // 引入公共样式
 
-import h5Popup from 'vue-h5-popup' // 引入弹窗
-Vue.use(h5Popup)
+// import h5Popup from 'vue-h5-popup' // 引入弹窗
+// Vue.use(h5Popup)
 
 
-// import MintUI from 'mint-ui'
-// import 'mint-ui/lib/style.css'
-// Vue.use(MintUI)  // 引入MintUI
 
 
+import Mint from 'mint-ui';
 import 'mint-ui/lib/style.css'
+Vue.use(Mint);
+
 import { MessageBox } from 'mint-ui'
-// Vue.use(MessageBox)
+import { Toast } from 'mint-ui';
+
 Vue.prototype.$msgbox = MessageBox
+Vue.prototype.$toast = Toast
 
 //全局设置的基本样式
 import './assets/css/base.scss'
@@ -33,13 +35,11 @@ Vue.prototype.$moment = moment
 import utils from './utils/utils' // 工具类
 Vue.prototype.$utils = utils
 
-import Mint from 'mint-ui';
-import 'mint-ui/lib/style.css'
-Vue.use(Mint);
 
 
-import 'swiper/dist/css/swiper.min.css' // 轮播
-import 'swiper/dist/js/swiper.min'
+
+// import 'swiper/dist/css/swiper.min.css' // 轮播
+// import 'swiper/dist/js/swiper.min'
 
 import vueFilter from './utils/filters'  // 公共filter
 for (let key in vueFilter){
diff --git a/src/router/index.js b/src/router/index.js
index 41df084..3884741 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -2,7 +2,7 @@ import Vue from 'vue'
 import Router from 'vue-router'
 import plateNumber from '@/views/parkPay/plateNumber'
 // import parkRecord from '@/views/parkPay/parkRecord'
-// import selfNav from '@/views/mySelf/selfNav'
+import selfNav from '@/views/mySelf/selfNav'
 
 Vue.use(Router)
 
@@ -37,12 +37,12 @@ export default new Router({
       component: () => import("@/views/parkPay/orderPay.vue")
     },
 
-    //  //---------------- 个人页面导航
-    // {
-    //   path: '/selfNav',
-    //   name: 'selfNav',
-    //   component: () => import("@/views/mySelf/selfNav.vue")
-    // },
+     //---------------- 个人页面导航
+    {
+      path: '/selfNav',
+      name: 'selfNav',
+      component: () => import("@/views/mySelf/selfNav.vue")
+    },
     //
     // // ------------------------建议反馈
     // {
@@ -60,11 +60,11 @@ export default new Router({
     //
     //
     // // ------------------------停车记录
-    // {
-    //   path: '/binDing',
-    //   name: 'binDing',
-    //   component: () => import("@/views/binding/binDing.vue")
-    // },
+    {
+      path: '/binDing',
+      name: 'binDing',
+      component: () => import("@/views/binding/binDing.vue")
+    },
     //
     //
     // // ------------------------购买会员卡提示
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 8ca08b7..d2f3e00 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -1,4 +1,5 @@
 import md5 from './md5.min.js';
+
 export default {
   myCommonSalt: function (val) { // 获取盐值
     let len = parseInt(val);
@@ -12,36 +13,45 @@ export default {
     return pwd;
   },
 
-  formatDate: function(secs, type=0){         //type是可选参数，因为json中时间的格式是year-month-date,不能识别XX年XX月XX日
+  formatDate: function (secs, type = 0) {         //type是可选参数，因为json中时间的格式是year-month-date,不能识别XX年XX月XX日
     var t = new Date(secs)
     var year = t.getFullYear()
     var month = t.getMonth() + 1
-    if(month < 10){ month = '0' + month }
+    if (month < 10) {
+      month = '0' + month
+    }
     var date = t.getDate()
-    if(date < 10){ date = '0' + date }
+    if (date < 10) {
+      date = '0' + date
+    }
     var hour = t.getHours()
-    if(hour < 10){ hour = '0' + hour }
+    if (hour < 10) {
+      hour = '0' + hour
+    }
     var minute = t.getMinutes()
-    if(minute < 10){ minute = '0' + minute }
+    if (minute < 10) {
+      minute = '0' + minute
+    }
     var second = t.getSeconds()
-    if(second < 10){ second = '0' + second }
-    if(type==0){
+    if (second < 10) {
+      second = '0' + second
+    }
+    if (type == 0) {
       return year + '年' + month + '月' + date + '日'
-    }else{
-      return year + '-'+month+'-'+date
-    }},
+    } else {
+      return year + '-' + month + '-' + date
+    }
+  },
 
   timestampToTime: function (timestamp) {
     var d = new Date(timestamp);//时间戳为10位需*1000，时间戳为13位的话不需乘1000
-    var youWant=d.getFullYear() + '-' + this.completedString(d.getMonth() + 1) + '-' + this.completedString(d.getDate()) ;
-    return  youWant
+    var youWant = d.getFullYear() + '-' + this.completedString(d.getMonth() + 1) + '-' + this.completedString(d.getDate());
+    return youWant
   },
-  completedString:function(s) {
+  completedString: function (s) {
     return s < 10 ? '0' + s : s
   },
 
-
-
   dateFormat: function (msd) {  // 时间转换
     var time = msd
 
@@ -78,21 +88,43 @@ export default {
             parseInt((parseFloat(time / 3600.0) - parseInt(time / 3600.0)) * 60)) * 60) + "秒";
 
       }
-
       else {
-
         time = parseInt(time) + "秒";
-
       }
-
     }
 
     return time;
   },
 
-  signObject: function (jsonObj){ //签名字段
+  GetOpenid: function () { // 获取openid
+    let openid = sessionStorage.getItem('wx_openId');
+    if (!openid || openid == '') {
+      openid = null;
+    }
+    return openid;
+  },
+
+  SetOpenid: function (openid) {  // 存储openid
+    sessionStorage.setItem('wx_openId', openid);
+  },
+
+  SetToken: function (token) { // 存储 token
+    sessionStorage.setItem('wx_Token', token);
+  },
+  GetToken: function () {
+    let token = sessionStorage.getItem('wx_Token');
+    //测试环境
+    if (!token || token == '') {
+      token = null;
+    }
+    return token;
+  },
+  SetPhone: function (phone) { // 存储 手机号
+    sessionStorage.setItem('WXPhone', phone);
+  },
+  signObject: function (jsonObj) { //签名字段
     let sort = []
-    for(let k in jsonObj){
+    for (let k in jsonObj) {
       sort.push({
         keyname: k,
         value: jsonObj[k]
@@ -111,10 +143,10 @@ export default {
     } else if (/BankabciPhone/.test(window.navigator.userAgent)) {
       console.log("农行客户端");
       return '立即'
-    }else if (/BankabcAndroid/.test(window.navigator.userAgent)) {
+    } else if (/BankabcAndroid/.test(window.navigator.userAgent)) {
       console.log("农行客户端");
       return '立即'
-    }else {
+    } else {
       console.log("其他浏览器");
       return '支付宝'
     }
@@ -131,10 +163,10 @@ export default {
     } else if (/BankabciPhone/.test(window.navigator.userAgent)) {
       console.log("农行客户端");
       return '34'
-    }else if (/BankabcAndroid/.test(window.navigator.userAgent)) {
+    } else if (/BankabcAndroid/.test(window.navigator.userAgent)) {
       console.log("农行客户端");
       return '34'
-    }else {
+    } else {
       console.log("其他浏览器");
       return '1'
     }
@@ -145,7 +177,7 @@ export default {
   // ud8yq5tv0inxupc05xfeau39jywlqoj2  新的id
   // ny1u72b6k374sg379z0kqjgfxe2ycnpw 新的签名
 
-  myVarAppid:'0eca8f5373ca4866aec2f8e9d9367104',// 公共请求Appid
+  myVarAppid: '0eca8f5373ca4866aec2f8e9d9367104',// 公共请求Appid
 
   myDeviceInfo: 'BC0703A4-AFB0-4B51-9089-9B7487C0CC6E', // 公共请求设备信息
 
@@ -170,15 +202,15 @@ export default {
     }
     objb.sort(compare);
     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;
+    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';
     // console.log('strmd5-------->'+strmd5);
     strmd5 = md5(strmd5);
-    strmd5=strmd5.toUpperCase();
+    strmd5 = strmd5.toUpperCase();
     return strmd5;
   },
 
diff --git a/src/views/binding/binDing.vue b/src/views/binding/binDing.vue
index a7fe640..de02463 100644
--- a/src/views/binding/binDing.vue
+++ b/src/views/binding/binDing.vue
@@ -1,19 +1,21 @@
 <template>
   <div>
 
-    <mt-field label="手机号" placeholder="请输入正确的手机号" type="tel" v-model="phone" :attr="{ maxlength: 13 }"></mt-field>
+    <mt-field label="手机号" placeholder="请输入正确的手机号" type="tel" v-model.trim="phone" :attr="{ maxlength: 11 }"></mt-field>
 
-    <mt-field label="验证码" v-model="codeText">
-      <div class="getCode" @click="getCode">{{timeNum}}</div>
+    <mt-field label="验证码" v-model.trim="codeText" :attr="{ maxlength: 6 }">
+      <div class="getCode" @click="getCodeHandle">{{timeNum}}</div>
     </mt-field>
 
     <div style="margin-top: 34px" class="leftRightPadding">
-      <mt-button type="danger" size="large">绑定</mt-button>
+      <mt-button type="danger" size="large" @click="bingUser">绑定</mt-button>
     </div>
   </div>
 </template>
 
 <script>
+import { sendverificode, bindCustByOpenId } from '@/api/binDing/binDing'
+
 export default {
   name: 'binDing',
   data() {
@@ -22,23 +24,119 @@ export default {
       phone: '',
       timeText: '获取验证码',
       timeNum: 60,
+      clickFlag: true, // 获取验证码按钮是否可以点击
     }
   },
-  created(){
+  created() {
     this.timeNum = this.timeText
   },
   methods: {
-    getCode: function () {
-      var _this = this
-      // this.timeText = this.timeNum+'S'
-      let Num = 5
-      var timer = setInterval(function () {
-        _this.timeNum = Num-- +'s'
-        if(Num== -1){
-          _this.timeNum = '获取验证码'
-          clearInterval(timer)
+    getCodeHandle: function () { // 获取验证码事件
+      if (!(/^1[3456789]\d{9}$/.test(this.phone))) {  // 先判断手机号是否输入正确
+        this.$msgbox('提示', '请输入正确手机号')
+      } else {
+        if (this.clickFlag) {
+          let _this = this
+          this.clickFlag = false
+
+          _this.getCode()
+          // this.timeText = this.timeNum+'S'
+          let Num = 5
+          var timer = setInterval(function () {
+            _this.timeNum = Num-- + 's'
+            if (Num == -1) {
+              _this.clickFlag = true
+              _this.timeNum = _this.timeText
+              Num = 5
+              clearInterval(timer)
+            }
+          }, 1000)
         }
-      }, 1000)
+      }
+    },
+    getCode: function () {  //  获取验证码接口
+      let salt = this.$utils.myCommonSalt(32);
+      let jsondata = {
+        app_id: this.$utils.myVarAppid,
+        deviceInfo: this.$utils.myDeviceInfo,
+        salt: salt,
+        sign_type: "md5",
+        phone: this.phone
+      }
+      jsondata.sign = this.$utils.signObject(jsondata)
+      sendverificode(jsondata).then(response => {
+        this.$toast({
+          message: '获取验证码成功',
+          iconClass: 'icon icon-success',
+          duration: 1500
+        })
+      })
+    },
+
+    bingUser: function () { // 用户绑定
+      let openid = this.$utils.GetOpenid();
+
+      if (!(/^1[3456789]\d{9}$/.test(this.phone))) {  // 先判断手机号是否输入正确
+        this.$toast({
+          message: '请输入正常手机号',
+          duration: 1500
+        });
+        return
+      }
+      if (this.codeText.length < 6) {
+        this.$toast({
+          message: '请输入正常验证码',
+          duration: 1500
+        });
+        return
+      }
+
+      let jsondata = {
+        phoneNum: this.phone,
+        verifyCode: this.codeText,
+        openid: openid
+      }
+
+      bindCustByOpenId(jsondata).then(data => {
+        if (data.code == 0 || data.code == '0') {
+          // $.alert('亲，您已绑定成功!', '成功', function () {
+          //   var datas = data.data;
+          //   var urll = document.referrer;
+          //   jsajax.gett(openid, function (n) {
+          //     window.location.href = document.referrer;
+          //   });
+          // });
+
+          this.$messagebox.alert('亲，您已绑定成功!').then(action => {
+            this.$router.push({
+              path:'selfNav'
+            })
+          });
+
+        } else {
+          if (data.code == 1017 || data.code == '1017') {
+            // $.alert('已经绑定过', function () {
+            //   var urll = document.referrer;
+            //   jsajax.gett(openid, function (n) {
+            //     window.location.href = document.referrer;
+            //   });
+            // });
+
+
+            this.$messagebox.alert('亲，您已经绑定过!').then(action => {
+
+            });
+
+          } else {
+            // $.alert('亲，请重新绑定!', '失败', function () {
+            //   return false;
+            // });
+            this.$toast('亲,绑定失败，请重新绑定!')
+          }
+
+        }
+      })
+
     }
   }
 }
diff --git a/src/views/mySelf/selfNav.vue b/src/views/mySelf/selfNav.vue
index 607589c..4dc1b54 100644
--- a/src/views/mySelf/selfNav.vue
+++ b/src/views/mySelf/selfNav.vue
@@ -4,31 +4,141 @@
       <div class="person-ifo">
         <div class="person-pic"></div>
         <ul class="person-con">
-          <li>15911111111</li>
-          <li>账户余额: <span>￥100.00</span></li>
-          <li>我的卡券：<span>20张</span></li>
+          <li>{{ phoneNum }}</li>
+          <li>账户余额: <span>￥ {{ acctBalance }}</span></li>
+          <li>我的卡券：<span>{{couponNum}}  张</span></li>
         </ul>
       </div>
     </div>
 
-    <mt-cell title="会员卡"  is-link :to="{ name: 'Toast' }"></mt-cell>
+    <mt-cell title="会员卡" is-link :to="{ name: 'Toast' }"></mt-cell>
 
-    <mt-cell title="车辆管理"  is-link :to="{ name: 'Toast' }"></mt-cell>
+    <mt-cell title="车辆管理" is-link :to="{ name: 'Toast' }"></mt-cell>
 
-    <mt-cell title="停车记录"  is-link :to="{ name: 'parkNotes' }"></mt-cell>
+    <mt-cell title="停车记录" is-link :to="{ name: 'parkNotes' }"></mt-cell>
 
-    <mt-cell title="建议反馈"  is-link :to="{ name: 'suggestionBack' }"></mt-cell>
+    <mt-cell title="建议反馈" is-link :to="{ name: 'suggestionBack' }"></mt-cell>
 
     <div class="leftRightPadding" style="margin-top: 34px">
-      <mt-button type="danger" size="large">退出账户</mt-button>
+      <mt-button type="danger" size="large" @click="toBinDing">退出账户</mt-button>
     </div>
 
   </div>
 </template>
 
 <script>
+import { getOpenIdByCode, getTokenByOpenId, queryUserInfo } from '@/api/selfNav/selfNav'
+
 export default {
-  name: 'selfNav'
+  name: 'selfNav',
+  data(){
+    return {
+      couponNum:'3', // 卡券数量
+      acctBalance: '420.00', // 账户余额
+      phoneNum:'',//  用户手机号
+    }
+  },
+  created() {
+    if (this.$utils.clientBrowser() == "微信") {
+      var appID = this.$utils.myVxAppId;
+      var code = this.getUrlParam('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,0#wechat_redirect'
+      } else {
+        return code;
+      }
+    }
+  },
+  mounted() {
+    if(this.$utils.GetOpenid()){
+      this.getTokenByOpenId(this.$utils.GetOpenid())
+    }else{
+      this.getOpenId()
+    }
+
+  },
+  methods: {
+    getUrlParam(name) {
+      var reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)');
+      var r = window.location.search.substr(1).match(reg)
+      if (r != null) return unescape(r[2])
+      return null
+    },
+    getOpenId: function () { // 第一步获取openid
+      let getCode = location.href
+      console.log(getCode)
+      let dataCode = getCode.split('?')[1]
+      let wxCode = dataCode.split('&')[0].split('=')[1]
+      let jsondata = {
+        appId: this.$utils.myVxAppId,
+        code: wxCode
+      };
+      getOpenIdByCode(jsondata).then(data => {
+        console.log(data)
+        // SetOpenid
+        if(data.code=='0'){
+          let openid = data.data;
+          this.$utils.SetOpenid(openid);
+          // mUrl.setApporWX('wx');
+          console.log("用户 openid "+openid);
+          this.getTokenByOpenId(openid)
+        }
+      })
+    },
+    getTokenByOpenId: function (openid) { // 获取token和手机号
+      let jsondata = {
+        openid: openid,
+        deviceInfo: this.$utils.myDeviceInfo
+      }
+      getTokenByOpenId(jsondata).then(data => {
+        console.log('执行获取token的接口  '+JSON.stringify(data));
+        if(data.code==0){
+          console.log("用户 token "+data.data.token);
+          this.$utils.SetToken(data.data.token)
+          this.$utils.SetPhone(data.data.phoneNum)
+          this.phoneNum = data.data.phoneNum
+          //  用户已经绑定手机号，获取用户信息
+          this.getInfoSelf()
+        }else{
+          //  用户未绑定手机号
+          this.$router.push({
+            path: 'binDing'
+          })
+        }
+      })
+    },
+
+    getInfoSelf: function () {  // 获取用户信息
+      let salt = this.$utils.myCommonSalt(32);
+      var jsondata = {
+        app_id: this.$utils.myVarAppid,
+        deviceInfo: this.$utils.myDeviceInfo,
+        salt: salt,
+        sign_type: "md5",
+        token: this.$utils.GetToken(),
+      }
+      jsondata.sign = this.$utils.signObject(jsondata)
+
+      queryUserInfo(jsondata).then(data => {
+        console.log(data)
+        if(data.code == '0'){
+          let datas = data.data
+          this.couponNum = datas.couponNum;//卡券数量
+          this.acctBalance = (datas.acctBalance/100).toFixed(2);//账户余额 单位：分
+
+        }
+      })
+
+    },
+
+    toBinDing: function () { // 退出账户 去绑定页面
+      this.$router.push({
+        path:'binDing'
+      })
+    }
+
+  }
 }
 </script>
 
@@ -44,21 +154,22 @@ export default {
     padding-top: 45px;
     display: flex;
     color: #ffbfbf;
-    .person-pic{
+    .person-pic {
       width: 64px;
       height: 64px;
       margin-right: 15px;
       background: url("../../assets/images/mySelf/photoBG.png") no-repeat;
     }
   }
-  .person-con{
-    span{
+
+  .person-con {
+    span {
       font-size: 16px;
       font-weight: bold;
     }
   }
 
-  .mint-cell{
+  .mint-cell {
     border-bottom: 1px solid #EFEDED;
   }
 </style>
diff --git a/src/views/parkPay/orderPay.vue b/src/views/parkPay/orderPay.vue
index 0d85238..1ebe5bf 100644
--- a/src/views/parkPay/orderPay.vue
+++ b/src/views/parkPay/orderPay.vue
@@ -25,7 +25,7 @@
       <div class="toPay" @click="toPay">{{clientBrowser}}支付</div>
     </div>
 
-    <div v-if="appOrderTimeout.length>0">
+    <div v-if="appOrderTimeout">
       <p class="tip">
         温馨提示：
       </p>
@@ -40,31 +40,26 @@
 </template>
 
 <script>
-// import CryptoJS from '../utils/AES.js'
-// let Base64 = require('js-base64').Base64
-
-import {aliPay, getOpenId, vxPayQuery, bankH5Pay, queryParkingRecordPageByCarNumbers} from '@/api/orderPay/orderPay'
+import {aliPay, getOpenId, vxPayQuery, doPay, doOrderCreate} from '@/api/orderPay/orderPay'
 
 export default {
   name: 'orderPay',
   data() {
     return {
       carWrapBG: 0,
-      carNumber: '',
+      carNumber: '京A12312',
       arrearageActFee: 0,
       arrearageDiscFee: 0,
       arrearageActFee: 0,
-      parkingData: [], //  在停数据
-      historyList: [], // 历史欠费数据
       clientBrowser: '', // 客户端
       paySrcType: '', //支付的类型   101 是本次   103是历史欠费
       orderId: '',  //支付的订单
       webAppCode: '', // 微信code
       appOrderTimeout: '', // 超时描述
+      isAndroid: '', // 终端类型
     }
   },
   created() {
-
     this.carWrapBG = this.$route.query.carColor //车牌颜色
     this.carNumber = this.$route.query.carNumber
     this.arrearageTotalFee = this.$route.query.arrearageTotalFee // 应收
@@ -72,16 +67,16 @@ export default {
     this.arrearageActFee = this.$route.query.arrearageActFee // 实收
     this.clientBrowser = this.$utils.clientBrowser() //支付方式
     this.paySrcType = this.$route.query.paySrcType // 实收
-    this.orderId = this.$route.query.ordeID
+    this.orderId = this.$route.query.ordeID // 订单号
     console.log(this.orderId)
-    this.appOrderTimeout = this.$route.query.appOrderTimeout
+    this.appOrderTimeout = this.$route.query.appOrderTimeout  //提示
+
+    let userAgent = navigator.userAgent;
+    this.isAndroid = userAgent.indexOf('Android') > -1 || userAgent.indexOf('Adr') > -1; //android终端
+
     if (this.clientBrowser == "微信") {
       this.webAppCode = this.getCode();
     }
-
-  },
-  mounted() {
-
   },
   methods: {
     getCode() {
@@ -94,95 +89,130 @@ export default {
         return code;
       }
     },
+    doOrderCreate(orderID) { // 欠费创建订单号
+      var jsondata = {
+        orderBigType: 100,
+        payOrderType: this.paySrcType,
+        parkOrderIds: orderID,
+        terminalSource: 7,
+        operName: '',
+        operCode: '',
+      };
+      // jsondata = JSON.stringify(jsondata);
+      doOrderCreate(jsondata).then(res => {
+        console.log(res)
+        this.orderId = res.data.rltOrderId
+        console.log(this.orderId)
+        this.dopay(this.orderId)
+      })
+
+    },
     getUrlParam(name) {
       var reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)');
       var r = window.location.search.substr(1).match(reg)
       if (r != null) return unescape(r[2])
       return null
     },
+    dopay(orderID) {
+      let me = this
+
+      if (this.clientBrowser == '微信') { // 微信支付
+        var vm = this
+        //第一步获取openid
+        var codeParams = {
+          code: this.webAppCode,
+          appId: this.$utils.myVxAppId
+        };
+        getOpenId(codeParams).then(resu => {
+          if (resu.code == 0) {
+            // me.vxPay(res.data, this.orderId)
+
+            var jsondata = {
+              orderBigType: 100,
+              payOrderType: this.paySrcType,
+              rltOrderId: orderID,
+              payType: 2, // 1 是支付宝    2是微信
+              terminalSource: 7,
+              orderActFee: this.arrearageActFee,
+              orderTotalFee: this.arrearageTotalFee,
+              orderDicountFee: this.arrearageDiscFee,
+              payUserId: resu.data,
+              terminalOS: this.isAndroid ? 'AND' : 'IOS',
+              couponType: 1, //优惠类型
+              couponCode: this.arrearageDiscFee,
+            };
+
+            doPay(jsondata).then(res => {
+              console.log(res)
+              if (res.code == 0) { //
+                //alertMsg("出场成功");
+                if (res.data) {
+                  var data = JSON.parse(res.data.jsPayRequest);
+                  console.log(JSON.stringify(data));
+                  if (typeof WeixinJSBridge === 'undefined') { // 微信浏览器内置对象。参考微信官方文档
+                    if (document.addEventListener) {
+                      document.addEventListener('WeixinJSBridgeReady', vm.onBridgeReady(data), false)
+                    } else if (document.attachEvent) {
+                      document.attachEvent('WeixinJSBridgeReady', vm.onBridgeReady(data))
+                      document.attachEvent('onWeixinJSBridgeReady', vm.onBridgeReady(data))
+                    }
+                  } else {
+                    console.log('准备调用微信支付')
+                    vm.onBridgeReady(data)
+                  }
+                } else {
+                  alert("没有找到返回值");
+                }
+              } else {
+                alert('支付错误')
+                console.log(res.message);
+                alert(res.message);
+              }
+
+            })
+
+          } else if (res.code == 40163) { //code been used, hints[重复code问题]
+            alert('获取opendid错误--------')
+            alert(res.message)
+            console.log(res.message);
+          } else {
+            alert('获取opendid错误')
+            alert(res.message)
+          }
+        })
+
+      }
+    },
     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
-          })
-        })
-        this.orderId = []
-        this.orderId = _order
-      }
+        this.doOrderCreate(this.orderId)
+      } else {
+        console.log(this.orderId)
+        console.log(typeof this.orderId)
 
-      if (this.clientBrowser == '微信') { // 微信支付
-        let _openId = sessionStorage.getItem('openIdData')
-        if (_openId) {
-          me.vxPay(_openId, this.orderId)
-        } else {
-          //第一步获取openid
-          var codeParams = {
-            code: this.webAppCode,
-            appId: this.$utils.myVxAppId
-          };
-          getOpenId(codeParams).then(res => {
-            if (res.code == 0) {
-              me.vxPay(res.data, this.orderId)
-              sessionStorage.setItem('openIdData', res.data)
-            } else if (res.code == 40163) { //code been used, hints[重复code问题]
-              this.$msgbox('提示', '请重新扫码重复code问题')
-              console.log(res.message);
-            } else {
-              this.$msgbox('提示', '请重新扫码')
-            }
-          })
-        }
+        this.dopay(this.orderId)
       }
+
     },
-    vxPay(openIdData, orderIdData) {
-      let vm = this
-      var wxParams = {};
-      wxParams.orderId = orderIdData;
-      wxParams.backType = 2,
-      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 => {
-        if (res.code == 0) { //
-          if (res.data) {
-            var data = res.data;
-            console.log(JSON.stringify(data));
-            if (typeof WeixinJSBridge === 'undefined') { // 微信浏览器内置对象。参考微信官方文档
-              if (document.addEventListener) {
-                document.addEventListener('WeixinJSBridgeReady', vm.onBridgeReady(data), false)
-              } else if (document.attachEvent) {
-                document.attachEvent('WeixinJSBridgeReady', vm.onBridgeReady(data))
-                document.attachEvent('onWeixinJSBridgeReady', vm.onBridgeReady(data))
-              }
-            } else {
-              console.log('准备调用微信支付')
-              vm.onBridgeReady(data)
-            }
-          } else {
-            this.$msgbox('提示', '没有找到返回值')
-          }
-        } else {
-          console.log(res.message);
-          this.$msgbox('提示', res.message)
-        }
-      })
-    },
+
     onBridgeReady(params) {
-      let me = this
       console.log('调用微信支付WeixinJSBridge')
       WeixinJSBridge.invoke(
-        'getBrandWCPayRequest', params,
+        'getBrandWCPayRequest', {
+          "appId": params.appId,     //公众号名称，由商户传入
+          "timeStamp": params.timeStamp,         //时间戳，自1970年以来的秒数
+          "nonceStr": params.nonceStr, //随机串
+          "package": params.package,
+          "signType": params.signType,         //微信签名方式：
+          "paySign": params.paySign //微信签名
+        },
+
+        // 'getBrandWCPayRequest', params,
         //
         // 'getBrandWCPayRequest', { // 下面参数内容都是后台返回的
         //   'appId': data.appId, // 公众号名称，由商户传入
@@ -196,120 +226,15 @@ export default {
           // 使用以上方式判断前端返回,微信团队郑重提示：res.err_msg将在用户支付成功后返回ok，但并不保证它绝对可靠。
           if (res.err_msg === 'get_brand_wcpay_request:ok') {
             console.log('成功')
-            var salt = me.$utils.myCommonSalt(32);
-            let wxparams = {
-              pageNum: 1,
-              pageSize: 10000,
-              parkState: 10,
-              terminalSource: 7,
-              carNumber: me.carNumber,
-              app_id: me.$utils.myVarAppid,
-              deviceInfo: me.$utils.myDeviceInfo,
-              salt: salt,
-              sign_type: "md5",
-              token: '',
-            }
-            wxparams.sign = me.$utils.signObject(wxparams)
-            queryParkingRecordPageByCarNumbers(wxparams).then(response => {
-              console.log(response)
-              me.parkList = response.data.dataList
-
-              // alert(JSON.stringify(me.parkList))
-              // alert(me.parkList.length)
-              if (me.parkList.length == 0) {
-                me.$router.push({
-                  path: 'parkRecord',
-                  query: {
-                    carNumber: me.carNumber,
-                    carNumberColor: me.carWrapBG,
-                    parkFlag: 0 //  0表示在停    1表示历史
-                  }
-                })
-
-              } else {
-                me.parkingData = me.parkList.filter(item => {
-                  return item.parkState == '10'
-                })
-                console.log(me.parkingData)
-                me.historyList = me.parkList.filter(item => {
-                  return item.parkState == '20'
-                })
-                console.log(me.historyList)
-
-                if (me.historyList.length > 0) {
-                  MessageBox.confirm('', {
-                    message: '您当前有历史欠费 是否立即补缴?',
-                    title: '温馨提示',
-                    confirmButtonText: '去补缴',
-                    cancelButtonText: '取消'
-                  }).then(action => {
-                    if (action == 'confirm') {     //确认的回调
-                      console.log('确定');
-                      me.$router.push({
-                        path: 'parkRecord',
-                        query: {
-                          carNumber: me.carNumber,
-                          carNumberColor: me.carWrapBG,
-                          parkFlag: 1 //  0表示在停    1表示历史
-                        }
-                      })
-                    }
-                  }).catch(err => {
-                    if (err == 'cancel') {     //取消的回调
-                      console.log('取消');
-                    }
-                  });
-                } else {
-
-                  if (me.paySrcType == 101) {  //缴费了本次
-                    me.$router.push({
-                      path: 'parkRecord',
-                      query: {
-                        carNumber: me.carNumber,
-                        carNumberColor: me.carWrapBG,
-                        parkFlag: 0 //  0表示在停    1表示历史
-                      }
-                    })
-                  } else {
-                    MessageBox.confirm('', {
-                      message: '您当前有在停订单 是否立即支付?',
-                      title: '温馨提示',
-                      confirmButtonText: '去支付',
-                      cancelButtonText: '取消'
-                    }).then(action => {
-                      if (action == 'confirm') {     //确认的回调
-                        console.log('确定');
-                        me.$router.push({
-                          path: 'parkRecord',
-                          query: {
-                            carNumber: me.carNumber,
-                            carNumberColor: me.carWrapBG,
-                            parkFlag: 0 //  0表示在停    1表示历史
-                          }
-                        })
-                      }
-                    }).catch(err => {
-                      if (err == 'cancel') {     //取消的回调
-                        console.log('取消');
-                      }
-                    });
-                  }
-
-                }
-              }
-
-            })
-
           } else {
             console.log('失败')
-            this.$msgbox('提示', '支付失败')
-            me.$router.go(-2);
+            alert('支付失败')
           }
         }
       )
     },
   },
-  filters: {}
+
 }
 </script>
 
--
libgit2 0.21.4