update

MP_verify_HNvRVFt0FD3vltU7.txt

+HNvRVFt0FD3vltU7
\ No newline at end of file

src/modules/home/api.js

@@ -45,3 +45,7 @@ export function importPeople(data) {
     withCredentials: true
   })
 }
+// 获取openid
+export function getOpenid(data) {
+  return httpRequest.post('/api/register/v2/frontend/wechat/get-openid', data)
+}

src/modules/home/views/OrderConfirm.vue

@@ -108,7 +108,7 @@
 </template>
 
 <script>
-import { getPayInfo } from '../api'
+import { getPayInfo, getOpenid } from '../api'
 import PayDetail from './PayDetail.vue'
 import Commonheader from '../components/Commonheader.vue'
 import OfflinePay from '../components/OfflinePay.vue'
@@ -251,7 +251,23 @@ export default {
     onSubmit() {
       this.getPayDetail()
     },
+    // 微信授权
+    wxAuthorize(call) {
+      if (!this.$route.query.code) {
+        const url = encodeURIComponent(window.location.href)
+        console.log(url, '123', window.location.href)
+        window.location.href = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa41d0081d4889921&redirect_uri=${url}&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect`
+      } else {
+        getOpenid({ code: this.$route.query.code, identity: 'road' }).then(res => {
+          call(res)
+        })
+      }
+    },
     getPayDetail() {
+      // 判断是否是支付宝
+      const isAlipay = /AlipayClient/.test(window.navigator.userAgent)
+      // 判断微信
+      const isWx = /MicroMessenger/.test(window.navigator.userAgent)
       // let ua = window.navigator.userAgent.toLowerCase()
       // 选择微信和支付宝支付走这
       if (this.payMode !== '3') {
@@ -262,7 +278,8 @@ export default {
           join_rand: this.data.payData.join_rand,
           pay_type: this.payMode === '1' ? '1' : '11'
         }
-        if (/AlipayClient/.test(window.navigator.userAgent)) {
+        // 支付宝环境支付
+        if (isAlipay) {
           params.pay_type = '12'
           const url =
             window.location.href.indexOf('?') === -1
@@ -271,31 +288,17 @@ export default {
           params.redirect_url =
             window.location.href.indexOf('qr') !== -1 ? encodeURIComponent(window.location.href) : url
         }
-        // 获取支付二维码 订单id
-        getPayInfo(params).then(res => {
-          this.data.payMode = this.payMode
-          if (res.code === 0) {
-            this.payDetail = Object.assign({ qrData: res.data }, this.data)
-            this.payDetail.order_id = res.data.order_id
-            window.localStorage.payDetail = JSON.stringify(this.payDetail)
-            if (/AlipayClient/.test(window.navigator.userAgent)) {
-              // window.localStorage.payUrl = res.data.url
-              window.location.href = res.data.url
-            }
-            this.isQrPageShow = true
-          }
-          if (res.code === 100) {
-            if (this.stepList.length === this.data.num) {
-              this.$router.push('/')
-            } else {
-              this.$emit('next')
-            }
-          }
-          // 订单为0元时，判断该步骤后面是否有步骤，若有就去下一步骤，否则返回首页
-          if (res.code === 999) {
-            this.stepList.length === this.data.num ? this.$router.push('/') : this.$emit('next')
-          }
-        })
+        // 微信环境支付
+        console.log(isWx)
+        // if (isWx) {
+        //   this.wxAuthorize((res) => {
+        //     this.getPayInfo(params, isAlipay)
+        //   })
+        //   params.pay_type = '3'
+        // } else {
+        //   this.getPayInfo(params, isAlipay)
+        // }
+        this.getPayInfo(params, isAlipay)
       } else {
         // 线下支付
         this.data.params = {
@@ -304,6 +307,33 @@ export default {
         }
         this.isQrPageShow = true
       }
+    },
+    getPayInfo(params, isAlipay) {
+      // 获取支付二维码 订单id
+      getPayInfo(params).then(res => {
+        this.data.payMode = this.payMode
+        if (res.code === 0) {
+          this.payDetail = Object.assign({ qrData: res.data }, this.data)
+          this.payDetail.order_id = res.data.order_id
+          window.localStorage.payDetail = JSON.stringify(this.payDetail)
+          // 支付宝
+          if (isAlipay) {
+            window.location.href = res.data.url
+          }
+          this.isQrPageShow = true
+        }
+        if (res.code === 100) {
+          if (this.stepList.length === this.data.num) {
+            this.$router.push('/')
+          } else {
+            this.$emit('next')
+          }
+        }
+        // 订单为0元时，判断该步骤后面是否有步骤，若有就去下一步骤，否则返回首页
+        if (res.code === 999) {
+          this.stepList.length === this.data.num ? this.$router.push('/') : this.$emit('next')
+        }
+      })
     }
   }
 }