From 8c16199c07facfe9fb40cdff1b8d61c830a5444f Mon Sep 17 00:00:00 2001
From: yangrz <yangrz@vip.qq.com>
Date: Wed, 6 Mar 2024 12:58:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E2=80=9C=E6=9C=AA=E5=A1=AB?=
 =?UTF-8?q?=E5=86=99=E5=9C=B0=E5=9D=80=E2=80=9D=EF=BC=8C=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=B8=BB=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 agentApp/manifest.json                  |  2 +-
 agentApp/pages/merchant-index/index.vue |  2 +-
 agentApp/pages/payment/payment.vue      |  2 +-
 agentApp/pages/user-login/index.vue     | 31 ++++++++++++++-----------
 4 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/agentApp/manifest.json b/agentApp/manifest.json
index b023fb4..47f96c4 100644
--- a/agentApp/manifest.json
+++ b/agentApp/manifest.json
@@ -130,7 +130,7 @@
         "template" : "template.h5.html",
         "router" : {
             "mode" : "history",
-            "base" : "/h5/"
+            "base" : "/wap/"
         },
         "optimization" : {
             "treeShaking" : {
diff --git a/agentApp/pages/merchant-index/index.vue b/agentApp/pages/merchant-index/index.vue
index ea26cdc..7fe96f6 100644
--- a/agentApp/pages/merchant-index/index.vue
+++ b/agentApp/pages/merchant-index/index.vue
@@ -7,7 +7,7 @@
 				<image v-else style="width: 110rpx;height: 110rpx;" src="/static/index/head-sculpture.png" alt="" />
 				<view class="information-content">
 					<view class="information-name">{{accountInfo.name}}</view>
-					<view class="address-text">地址：{{accountInfo.address}}</view>
+					<view class="address-text">地址：{{accountInfo.address || '未填写地址'}}</view>
 				</view>
 			</view>
 			<view class="information-id-content">
diff --git a/agentApp/pages/payment/payment.vue b/agentApp/pages/payment/payment.vue
index 0fa2e81..1b58ff2 100644
--- a/agentApp/pages/payment/payment.vue
+++ b/agentApp/pages/payment/payment.vue
@@ -13,7 +13,7 @@
 							{{merchant.name}}
 						</view>
 						<view class="paddre">
-							{{merchant.address}}
+							{{merchant.address || '未填写地址'}}
 						</view>
 					</view>
 				</view>
diff --git a/agentApp/pages/user-login/index.vue b/agentApp/pages/user-login/index.vue
index 73de309..d4efba4 100644
--- a/agentApp/pages/user-login/index.vue
+++ b/agentApp/pages/user-login/index.vue
@@ -1,34 +1,39 @@
 <template>
 	<view class="app-container">
-			登录中...
+		登录中...
 	</view>
 </template>
 
 <script>
 	export default {
 		data() {
-			return {
-			};
+			return {};
 		},
 		onLoad(q) {
 			let payment_code = q.payment_code;
 			let user_token = q.token;
-			
-			if (!payment_code || !user_token) {
+			let to = q.to;
+
+			if (!to || (to == 'payment' && !payment_code) || !user_token) {
 				uni.showToast({
-					title:'缺少参数',
-					icon:'none'
+					title: '缺少参数',
+					icon: 'none'
 				})
 				return;
 			}
-			
+
 			uni.setStorageSync('user_token', user_token);
 			uni.setStorageSync('payment_code', payment_code);
-			
-			uni.redirectTo({
-				url:'/pages/payment/payment'
+
+			let url = '/pages/payment/payment';
+
+			if (to == 'index') {
+				url = '/pages/user-orders/user-orders'
+			}
+
+			uni.reLaunch({
+				url
 			})
 		}
 	}
-</script>
-
+</script>
\ No newline at end of file