From be915a150707b5a5b1da75121cd443866d774d82 Mon Sep 17 00:00:00 2001
From: Zuncle <34310384@qq.com>
Date: Sun, 15 Mar 2026 13:18:38 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B5=A0=E9=80=81=E5=A1=AB=E5=86=99?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80=E9=A1=B5=E5=BC=BA=E5=88=B6=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=EF=BC=8C=E9=98=B2=E6=AD=A2=E5=9C=B0=E5=9D=80=E5=BD=92=E5=B1=9E?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 未登录时弹窗引导登录后再填写
- onShow检测登录状态变化，登录后自动加载地址列表
- onSubmit增加登录检查防线
---
 pages-user/address/submit.vue | 36 +++++++++++++++++++++++++++++++----
 1 file changed, 32 insertions(+), 4 deletions(-)

diff --git a/pages-user/address/submit.vue b/pages-user/address/submit.vue
index 9853ae2..89dbd4b 100755
--- a/pages-user/address/submit.vue
+++ b/pages-user/address/submit.vue
@@ -73,7 +73,7 @@
 
 <script setup>
 import { ref, reactive, onMounted } from 'vue'
-import { onLoad } from '@dcloudio/uni-app'
+import { onLoad, onShow } from '@dcloudio/uni-app'
 import { request } from '@/utils/request'
 import { listAddresses } from '@/api/appUser'
 
@@ -95,15 +95,39 @@ const form = reactive({
 onLoad((options) => {
   if (options.token) {
     token.value = options.token
-    // 如果已登录，加载用户的地址列表
-    if (isLoggedIn.value) {
-      loadAddressList()
+    // 检查登录状态，未登录则引导登录
+    if (!isLoggedIn.value) {
+      uni.showModal({
+        title: '需要登录',
+        content: '请先登录后再填写收货地址，以便将奖品转移至您的账户',
+        confirmText: '去登录',
+        cancelText: '取消',
+        success: (res) => {
+          if (res.confirm) {
+            const currentPage = `/pages-user/address/submit?token=${token.value}`
+            uni.navigateTo({ url: `/pages/login/index?redirect=${encodeURIComponent(currentPage)}` })
+          } else {
+            uni.navigateBack()
+          }
+        }
+      })
+      return
     }
+    loadAddressList()
   } else {
     uni.showToast({ title: '参数错误', icon: 'none' })
   }
 })
 
+// 从登录页返回后，重新检测登录状态
+onShow(() => {
+  const newLoginState = !!uni.getStorageSync('token')
+  if (newLoginState && !isLoggedIn.value) {
+    isLoggedIn.value = true
+    loadAddressList()
+  }
+})
+
 // 加载用户地址列表
 async function loadAddressList() {
   if (!isLoggedIn.value) return
@@ -145,6 +169,10 @@ function onRegionChange(e) {
 
 async function onSubmit() {
   if (!token.value) return
+  if (!isLoggedIn.value) {
+    uni.showToast({ title: '请先登录后再提交', icon: 'none' })
+    return
+  }
   if (!form.name || !form.mobile || !form.province || !form.address) {
     uni.showToast({ title: '请完善收货信息', icon: 'none' })
     return