1

pages/login/login.vue

@@ -570,22 +570,34 @@
 	const login = async () => {
 		await form.value.validate();
 		console.log(userInfo.value);
-		// RPC.post('/account/login', {
+			
-		// 	username: userInfo.value.name,
+		if(userInfo.value.phone.startsWith('test-')) {
-		// 	password: userInfo.value.password,
+			RPC.post('/login', {
-		// }, {
+				username: userInfo.value.phone,
-		// 	custom: {
+				password: userInfo.value.password,
-		// 		loading: true,
+			}, {
-		// 		loadingText: '正在登录...'
+				custom: {
-		// 	},
+					loading: true,
-		// }).then(res => {
+					loadingText: '正在登录...'
-		// 	authStore.setAccessToken(res.token)
+				},
-		// 	userStore.setUserInfo(res)
+			}).then(res => {
-		// 	uni.$uv.route({
+				authStore.setAccessToken(res.token)
-		// 		type: isTabBarPath(redirect) ? "switchTab" : "redirectTo",
+				RPC.post('/user/info', {
-		// 		url: redirect,
+						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,

pagesA/recharge/recharge.vue

@@ -67,6 +67,26 @@
 					<uv-icon name="checkmark-circle-fill" :color="selectedPayment === 'alipay' ? '#4285f4' : '#ccc'"
 						size="20"></uv-icon>
 				</view>
+				
+				<view
+				v-if="showAlipay"
+				  class="payment-item"
+				  :class="{ active: selectedPayment === 'wxpay' }"
+				  @click="selectPayment('wxpay')"
+				>
+				  <view class="payment-info">
+				    <uv-icon name="weixin-fill" color="#07c160" size="24"></uv-icon>
+				    <view class="payment-details">
+				      <view class="payment-name">微信支付</view>
+				      <view class="payment-desc">推荐使用微信支付</view>
+				    </view>
+				  </view>
+				  <uv-icon
+				    name="checkmark-circle-fill"
+				    :color="selectedPayment === 'wxpay' ? '#ff3333' : '#ccc'"
+				    size="20"
+				  ></uv-icon>
+				</view>
 			</view>
 		</view>
 
@@ -359,15 +379,22 @@
 
 			// 根据支付方式调用对应的支付方法
 			let paymentResult;
-
+			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: "正在跳转微信支付...",
 				});
@@ -417,9 +444,10 @@
 
 		} catch (error) {
 			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 {