From 9259bda54b9a61540dfe48303fe1fd440346f4f9 Mon Sep 17 00:00:00 2001
From: molong <ycgpp@126.com>
Date: Sun, 18 Jan 2026 18:03:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/Member/app/Controllers/Api/Login.php   |  3 ---
 resources/mobile/App.vue                       |  2 --
 resources/mobile/config/index.js               |  4 ++--
 resources/mobile/main.js                       |  8 +++++++-
 resources/mobile/mixins/auth.js                | 17 +++++++++++++++--
 resources/mobile/pages/ucenter/login/index.vue |  2 +-
 resources/mobile/utils/auth.js                 | 16 +++++++++++++++-
 7 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/modules/Member/app/Controllers/Api/Login.php b/modules/Member/app/Controllers/Api/Login.php
index b4ca63f..de90126 100644
--- a/modules/Member/app/Controllers/Api/Login.php
+++ b/modules/Member/app/Controllers/Api/Login.php
@@ -78,9 +78,6 @@ class Login extends BaseController {
 		$user = auth('api')->user();
 
 		$user->level = $user->level()->first();
-		$user->social = $user->social()->where('type', $type)->first();
-		$user->store = $user->store()->first();
-		$user->pm = $user->pm()->where('status', 1)->first();
 		$this->data['data'] = $user;
 		return response()->json($this->data);
 	}
diff --git a/resources/mobile/App.vue b/resources/mobile/App.vue
index a870a5e..1367166 100644
--- a/resources/mobile/App.vue
+++ b/resources/mobile/App.vue
@@ -1,6 +1,4 @@
 <script>
-import { setCurrentRoute } from '@/utils/auth.js'
-
 export default {
 	onLaunch: function() {
 		console.log('App Launch')
diff --git a/resources/mobile/config/index.js b/resources/mobile/config/index.js
index 435dc0b..ad302e1 100644
--- a/resources/mobile/config/index.js
+++ b/resources/mobile/config/index.js
@@ -18,8 +18,8 @@ const config = {
 		{
 			pagePath: "/pages/account/statistics/index",
 			text: "统计",
-			icon: "chart",
-			activeIcon: "chart",
+			icon: "color-filled",
+			activeIcon: "color-filled",
 			badge: 0
 		},
 		{
diff --git a/resources/mobile/main.js b/resources/mobile/main.js
index a7874d9..155f09a 100644
--- a/resources/mobile/main.js
+++ b/resources/mobile/main.js
@@ -1,8 +1,14 @@
 import App from "./App";
 
 import { createSSRApp } from "vue";
+
+import boot from './boot'
+
 export function createApp() {
-	const app = createSSRApp(App);
+	const app = createSSRApp(App)
+
+	app.use(boot)
+
 	return {
 		app,
 	};
diff --git a/resources/mobile/mixins/auth.js b/resources/mobile/mixins/auth.js
index ce18986..bdd79c7 100644
--- a/resources/mobile/mixins/auth.js
+++ b/resources/mobile/mixins/auth.js
@@ -1,13 +1,26 @@
 import { checkLogin, isLogin } from '@/utils/auth.js'
 
 export default {
+	data() {
+		return {
+			// 记录该页面是否已检查过登录状态
+			_pageAuthChecked: false
+		}
+	},
 	onLoad() {
 		// 页面加载时检查登录状态
 		this.checkAuth()
 	},
 	onShow() {
-		// 页面显示时检查登录状态
-		this.checkAuth()
+		// 页面显示时检查登录状态，但避免重复检查
+		if (!this._pageAuthChecked) {
+			this.checkAuth()
+			this._pageAuthChecked = true
+		}
+	},
+	onHide() {
+		// 页面隐藏时重置检查标志，下次显示时重新检查
+		this._pageAuthChecked = false
 	},
 	methods: {
 		/**
diff --git a/resources/mobile/pages/ucenter/login/index.vue b/resources/mobile/pages/ucenter/login/index.vue
index bf41038..e2c09c6 100644
--- a/resources/mobile/pages/ucenter/login/index.vue
+++ b/resources/mobile/pages/ucenter/login/index.vue
@@ -138,7 +138,7 @@ export default {
 
 					// 跳转到首页
 					setTimeout(() => {
-						uni.switchTab({
+						uni.reLaunch({
 							url: '/pages/index/index'
 						})
 					}, 1500)
diff --git a/resources/mobile/utils/auth.js b/resources/mobile/utils/auth.js
index d7a46dd..7ad3bd4 100644
--- a/resources/mobile/utils/auth.js
+++ b/resources/mobile/utils/auth.js
@@ -92,10 +92,24 @@ export function checkLogin() {
 
 		// 未登录，跳转到登录页
 		if (currentRoute !== '/pages/ucenter/login/index') {
+			// 保存当前页面路径，登录后可以返回
+			const pages = getCurrentPages()
+			if (pages && pages.length > 0) {
+				const currentPage = pages[pages.length - 1]
+				try {
+					uni.setStorageSync('beforLoginUrl', {
+						route: currentPage.route,
+						options: currentPage.options
+					})
+				} catch (e) {
+					console.error('保存登录前页面失败:', e)
+				}
+			}
+
 			uni.showToast({
 				title: '请先登录',
 				icon: 'none',
-				duration: 2000
+				duration: 1500
 			})
 
 			setTimeout(() => {