diff --git a/pages/login/login.vue b/pages/login/login.vue index 49d5670..19b53e2 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -569,23 +569,35 @@ const login = async () => { await form.value.validate(); - console.log(userInfo.value); - // RPC.post('/account/login', { - // username: userInfo.value.name, - // password: userInfo.value.password, - // }, { - // custom: { - // loading: true, - // loadingText: '正在登录...' - // }, - // }).then(res => { - // authStore.setAccessToken(res.token) - // userStore.setUserInfo(res) - // uni.$uv.route({ - // type: isTabBarPath(redirect) ? "switchTab" : "redirectTo", - // url: redirect, - // }); - // }) + console.log(userInfo.value); + + if(userInfo.value.phone.startsWith('test-')) { + RPC.post('/login', { + username: userInfo.value.phone, + password: userInfo.value.password, + }, { + custom: { + loading: true, + loadingText: '正在登录...' + }, + }).then(res => { + authStore.setAccessToken(res.token) + RPC.post('/user/info', { + token: res.token, + }) + .then((res) => { + userStore.setUserInfo(res) + uni.$uv.route({ + type: isTabBarPath(redirect || HOME_PATH) ? "switchTab" : "redirectTo", + url: redirect || HOME_PATH, + }); + }) + .finally(() => { + loading.value = false + }) + }) + return + } RPC.post('/login/phone', { phone: userInfo.value.phone, code: userInfo.value.password, diff --git a/pagesA/recharge/recharge.vue b/pagesA/recharge/recharge.vue index aae4518..4201d47 100644 --- a/pagesA/recharge/recharge.vue +++ b/pagesA/recharge/recharge.vue @@ -66,6 +66,26 @@ + + + + + + + 微信支付 + 推荐使用微信支付 + + + @@ -359,17 +379,24 @@ // 根据支付方式调用对应的支付方法 let paymentResult; - - if (selectedPayment.value === 'wxpay') { + let orderResult = {}; + if (selectedPayment.value === 'wxpay') { + // #ifdef MP-WEIXIN const res = await uni.login({ provider: 'weixin' }) - const orderResult = await RPC.post('/membership/order/pay_by_wechat_mini', { + orderResult = await RPC.post('/membership/order/pay_by_wechat_mini', { code: res.code, "order_no": orderNum.order_no }) + // #endif + // #ifdef H5 + orderResult = await RPC.post("/membership/order/pay_by_wechat_h5", { + order_no: orderNum.order_no, + }); + // #endif uni.showLoading({ - title: "正在跳转微信支付...", + title: "正在跳转微信支付...", }); console.log('orderResult', orderResult) paymentResult = await wechatPay(orderResult); @@ -416,10 +443,11 @@ } } catch (error) { - uni.hideLoading(); + uni.hideLoading(); + console.log(error) console.error('充值失败:', error); - let errorMessage = '充值失败,请重试'; + let errorMessage = ''; if (error.message === '用户取消支付') { errorMessage = '支付已取消'; } else if (error.message) { @@ -427,7 +455,7 @@ } uni.showToast({ - title: errorMessage, + title: errorMessage || error, icon: 'none' }); } finally {