diff --git a/config/url.js b/config/url.js index eb68337..0219e93 100644 --- a/config/url.js +++ b/config/url.js @@ -1,7 +1,7 @@ // export const URL = "https://my.gxfs123.com/api" //正式服务器-弃用 export const URL = "https://manager.fdzpower.com/api" //正式服务器 // export const URL = "https://fansdev.gxfs123.com/api" //测试服务器 -// export const URL = "http://192.168.5.108:8080" //本地调试 +// export const URL = "http://192.168.5.11:8080" //本地调试 // export const URL = "http://127.0.0.1:8080" //本地调试 export const appid = "wx2165f0be356ae7a9" //微信小程序appid diff --git a/pages/index/index.vue b/pages/index/index.vue index 9ef4e73..6a318c1 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -379,7 +379,7 @@ `${k}=${encodeURIComponent(current.options[k])}`).join('&') : '' const redirect = encodeURIComponent(query ? `${route}?${query}` : route) uni.reLaunch({ - url: redirect + url: `/subPackages/user/login/index?redirect=${redirect}` }) } catch (e) { uni.reLaunch({ diff --git a/subPackages/order/payment.vue b/subPackages/order/payment.vue index 90a8721..a34b886 100644 --- a/subPackages/order/payment.vue +++ b/subPackages/order/payment.vue @@ -295,14 +295,19 @@ try { const osType = getOsType(); const res = await getAntomPaymentMethods(orderInfo.value.orderNo, osType); - if (res.code === 200 && res.data && res.data.paymentOptions) { - res.data.paymentOptions.forEach(item => { - methods.push({ - paymentMethodType: item.paymentMethodType, - paymentMethodName: item.paymentMethodName || item.paymentMethodType - }); - }); - } + // if (res.code === 200 && res.data && res.data.paymentOptions) { + // res.data.paymentOptions.forEach(item => { + // methods.push({ + // paymentMethodType: item.paymentMethodType, + // paymentMethodName: item.paymentMethodName || item.paymentMethodType + // }); + // }); + // } + //因后端约束,固定支付方式ALIPAY_HK + methods.push({ + paymentMethodType:'ALIPAY_HK', + paymentMethodName:'ALIPAY_HK' + }) } catch (error) { console.error('获取 Antom 支付方式失败:', error); } diff --git a/subPackages/user/my/index.vue b/subPackages/user/my/index.vue index 46bb4a3..743dafa 100644 --- a/subPackages/user/my/index.vue +++ b/subPackages/user/my/index.vue @@ -345,12 +345,11 @@ const query = current && current.options ? Object.keys(current.options).map(k => `${k}=${encodeURIComponent(current.options[k])}`).join('&') : '' const redirect = encodeURIComponent(query ? `${route}?${query}` : route) - console.log(redirect); - uni.redirectTo({ - url: redirect + uni.reLaunch({ + url: `/subPackages/user/login/index?redirect=${redirect}` }) } catch (e) { - uni.redirectTo({ + uni.reLaunch({ url: '/subPackages/user/login/index' }) } diff --git a/subPackages/user/userProfile/index.vue b/subPackages/user/userProfile/index.vue index 672035c..379a24b 100644 --- a/subPackages/user/userProfile/index.vue +++ b/subPackages/user/userProfile/index.vue @@ -130,7 +130,7 @@ `${k}=${encodeURIComponent(current.options[k])}`).join('&') : ''; const redirect = encodeURIComponent(query ? `${route}?${query}` : route); uni.reLaunch({ - url: redirect + url: `/subPackages/user/login/index?redirect=${redirect}` }); } catch (e) { uni.reLaunch({