|
@@ -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?.()
|