From 48679dc607acbd4a027a8eac76ac3649e4f012a8 Mon Sep 17 00:00:00 2001
From: pengda <1111@qq.com>
Date: Wed, 13 Aug 2025 10:23:47 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=8A=A0=E7=9B=9F=E9=A1=B5=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E8=B7=B3=E8=BD=AC=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/login.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/utils/login.js b/src/utils/login.js
index 2c07763..7b92817 100644
--- a/src/utils/login.js
+++ b/src/utils/login.js
@@ -51,10 +51,15 @@ export async function autoLoginByToken(timeout = 10000) {
 
   const nick = localStorage.getItem('nick')
 
-  //非代理商 直接跳至加盟页
-  if(nick === ''){
+  //非代理商 直接跳至加盟页 访问加盟页的话 不再重复跳转
+  const currentPath = window.location.pathname
+  if(!nick && currentPath !== '/franchise'){
     const aid = urlParams.get('aid')
-    window.location.href = "/franchise?aid="+aid
+    if(aid){
+      window.location.href = "/franchise?aid="+aid
+    }else{
+      window.location.href = "/franchise"
+    }
     return true
   }
 

From e7746da2e029d63a320844cbe838e3de90786145 Mon Sep 17 00:00:00 2001
From: pengda <1111@qq.com>
Date: Wed, 13 Aug 2025 10:38:44 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=8A=A0=E7=9B=9F=E9=A1=B5=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E8=B7=B3=E8=BD=AC=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/login.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/utils/login.js b/src/utils/login.js
index 7b92817..7e1a363 100644
--- a/src/utils/login.js
+++ b/src/utils/login.js
@@ -28,9 +28,9 @@ export async function autoLoginByToken(timeout = 10000) {
       throw new Error('登陆失败');
     }
 
-    // 可选：将 token 存入 localStorage
-    localStorage.setItem('token', res.data.data.access_token)
-    localStorage.setItem('nick', res.data.data.nick)
+    // 存入 localStorage
+    if(res.data.data.access_token) localStorage.setItem('token', res.data.data.access_token)
+    if(res.data.data.nick) localStorage.setItem('nick', res.data.data.nick)
   }
 
   const res = await axiosWithTimeout(
@@ -45,13 +45,12 @@ export async function autoLoginByToken(timeout = 10000) {
   }
 
   const access_token = localStorage.getItem('token')
-  if(access_token === ''){
+  if(!access_token){
     throw new Error('登陆有误');
   }
 
-  const nick = localStorage.getItem('nick')
-
   //非代理商 直接跳至加盟页 访问加盟页的话 不再重复跳转
+  const nick = localStorage.getItem('nick')
   const currentPath = window.location.pathname
   if(!nick && currentPath !== '/franchise'){
     const aid = urlParams.get('aid')