Browse Source

no message

linwenxin 1 week ago
parent
commit
aeaa6bfc5d
2 changed files with 11 additions and 4 deletions
  1. 10 3
      src/common/utils/util.js
  2. 1 1
      src/packageHome/pages/codeActivity/activityForm.vue

+ 10 - 3
src/common/utils/util.js

@@ -972,10 +972,12 @@ export const weixinPay = function (data, successful, cancel, failure) {
 var jishu = 0
 
 // 微信授权验证配置
-export const wxConfig = function (configInfo, userInfo, cb) {
+export const wxConfig = function (configInfo, userInfo, cb, _url) {
   let url = ''
   const systemInfo = uni.getSystemInfoSync()
-  if (systemInfo.platform === 'ios') {
+  if (_url) {
+    url = _url
+  } else if (systemInfo.platform === 'ios') {
     // iOS平台
     url = getStorage('realAuthUrl')
   } else {
@@ -1037,7 +1039,12 @@ export const wxConfig = function (configInfo, userInfo, cb) {
           if (jishu < 30) {
             jishu++
             setTimeout(function () {
-              wxConfig(configInfo, userInfo, cb)
+              wxConfig(
+                configInfo,
+                userInfo,
+                cb,
+                jishu % 2 ? window.location.href.split('#')[0] : getStorage('realAuthUrl')
+              )
             }, 1000)
           } else {
             cb?.()

+ 1 - 1
src/packageHome/pages/codeActivity/activityForm.vue

@@ -174,7 +174,7 @@
 <script>
 import carousel from '@/components/carousel'
 import { uploadImgFull } from '@/common/utils/util.js'
-
+import { wxConfig, mini_env } from '@/common/utils/util'
 export default {
   components: {
     carousel