From 0849334c64e3f4941df9be92a11eb08f571096d6 Mon Sep 17 00:00:00 2001
From: liugongyu <290219706@qq.com>
Date: Mon, 7 Aug 2023 10:11:06 +0800
Subject: [PATCH] 宣化聚合支付

---
 src/utils/request.js          |  2 +-
 src/views/binding/binDing.vue | 11 ++++++++---
 src/views/mySelf/selfNav.vue  | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++------
 3 files changed, 65 insertions(+), 10 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index b5c0e72..fa29390 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -8,7 +8,7 @@ const service = axios.create({
   // http://pay.service.renniting.cn/  赤峰
   // http://pay.service.huangshiparking.com/  黄石正式环境
   //  http://39.98.54.240:8090/   黄石测试环境
-  baseURL: 'http://wxzhifu.natapp1.cc', // url = base url + request url
+  baseURL: 'http://test.ccccitd.cc/pay', // url = base url + request url
   // withCredentials: true, // send cookies when cross-domain requests
   timeout: 6000 // request timeout
 })
diff --git a/src/views/binding/binDing.vue b/src/views/binding/binDing.vue
index 601baad..c6668dc 100644
--- a/src/views/binding/binDing.vue
+++ b/src/views/binding/binDing.vue
@@ -29,7 +29,7 @@ export default {
   },
   created() {
     this.timeNum = this.timeText;
-    this.webAppCode = this.getWxCode();  // 正式打开注释
+    // this.webAppCode = this.getWxCode();  // 正式打开注释
   },
   methods: {
     getWxCode() {
@@ -79,7 +79,9 @@ export default {
     bindPhoneHandle() {
       const reg = /^1[3-9]\d{9}$/;
       if (reg.test(this.phone)) {
-        this.getOpenIdByCode(); // 获取openid
+        // this.getOpenIdByCode(); // 获取openid
+
+        this.bindCustByOpenId(this.$route.query.openid)
 
       } else {
         this.$toast("请输入正确手机号");
@@ -137,7 +139,10 @@ export default {
           localStorage.setItem('userToken',response.data.token)
           localStorage.setItem('userPhoneNum',response.data.phoneNum)
           this.$router.push({
-              name: "selfNav"
+              name: "selfNav",
+              query:{
+                openId:openId
+              }
             }
           );
         }
diff --git a/src/views/mySelf/selfNav.vue b/src/views/mySelf/selfNav.vue
index d6b5af6..c8aa69b 100644
--- a/src/views/mySelf/selfNav.vue
+++ b/src/views/mySelf/selfNav.vue
@@ -38,7 +38,7 @@
 
 <script>
 
-import { getTokenByOpenId } from "@/api/getUserIfo";
+import { getTokenByOpenId, getOpenIdByCode } from "@/api/getUserIfo";
 export default {
   name: "selfNav",
   data() {
@@ -63,7 +63,7 @@ export default {
   },
 
   created() {
-
+    // this.phoneNum = localStorage.getItem('userPhoneNum')
   },
   mounted() {
     // this.openId = this.$utils.openId;
@@ -71,11 +71,58 @@ export default {
     //   this.getTokenAndphoneNum();
     // }
     // console.log(this.openId);
+    // this.phoneNum = localStorage.getItem('userPhoneNum')
+
+
+    if(this.$route.query.openId){
+      this.openId = this.$route.query.openId
+      this.getTokenAndphoneNum(this.openId)
+    }else{
+      this.webAppCode = this.getWxCode();
+      this.getOpenIdByCode()
+    }
 
-    this.phoneNum = this.$utils.userPhoneNum
     console.log(this.$utils.userPhoneNum)
   },
   methods: {
+    getWxCode() {
+      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#wechat_redirect";
+      } else {
+        return code;
+      }
+    },
+    getUrlParam(name) { // 获取url里面的参数
+      var reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)');
+      var r = window.location.search.substr(1).match(reg)
+      if (r != null) return unescape(r[2])
+      return null
+    },
+    getOpenIdByCode() {  // 获取openid
+
+      // this.bindCustByOpenId() // 正式注释
+
+
+
+      // 正式打开注释
+
+      let jsondata = {
+        appId: this.$utils.myVxAppId,
+        code: this.webAppCode
+      };
+      jsondata.sign = this.$utils.signObject(jsondata);
+      console.log("停车记录传参  " + JSON.stringify(jsondata));
+      getOpenIdByCode(jsondata).then(response => {
+        if(response.code=='0'){
+          let openId = response.data
+          this.openId = openId
+          this.getTokenAndphoneNum(openId) // 获取token和用户手机号
+        }
+      });
+    },
     toNextPage(path) {
       if (this.phoneNum) {
         this.$router.push({
@@ -92,13 +139,16 @@ export default {
     },
     toBindingPage() {
       this.$router.push({
-          name: "binDing"
+          name: "binDing",
+          query:{
+            openid: this.openId
+          }
         }
       );
     },
-    getTokenAndphoneNum() {
+    getTokenAndphoneNum(openId) {
       let jsondata = {
-        openid: this.$utils.openId
+        openid: openId
       };
       jsondata.sign = this.$utils.signObject(jsondata);
       console.log("停车记录传参  " + JSON.stringify(jsondata));
--
libgit2 0.21.4