From a9fa506e048d067961206cf34e66031f94f8b20e Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Sun, 14 Jul 2024 13:01:59 +0800
Subject: [PATCH] uu

---
 components/buns-api/login/mp-login.vue | 11 ++++++++---
 pages/login/login.vue                  | 12 +++++-------
 pages/tabBar/mine/mine.vue             |  5 +++--
 store/modules/user.js                  | 20 ++++++++++----------
 4 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/components/buns-api/login/mp-login.vue b/components/buns-api/login/mp-login.vue
index 4ab4cbb..d41e0e0 100644
--- a/components/buns-api/login/mp-login.vue
+++ b/components/buns-api/login/mp-login.vue
@@ -58,6 +58,7 @@
 	import * as apiService from "@/common/api"
 	import { getCommonReqData } from "@/common/manageServer"
 	import { doRequest } from "@/common/upload"
+	import { getSessionUserInfo } from "@/session"
 	
 	export default {
 		data() {
@@ -100,9 +101,13 @@
 						nickName: userInfo.nickName,
 						avatarUrl: userInfo.avatar,
 						phoneNumber: userInfo.phonenumber,
-					}) 
-					await checkParams(this.submitLogin, this.submitValidConfig, false)
-					this.loginSucceed()
+					})
+					let seInfo = getSessionUserInfo()
+					// 手动退出的场景，不做自动登录
+					if(!seInfo.logout){
+						await checkParams(this.submitLogin, this.submitValidConfig, false)
+						this.loginSucceed()
+					}
 				}
 				this.pageLoading = false
 			},
diff --git a/pages/login/login.vue b/pages/login/login.vue
index b34588a..f40a445 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -25,15 +25,13 @@
 		},
 		data() {
 			return {
-				
+				queryOption: {
+					
+				},
 			}
 		},
-		onShareAppMessage() {
-			return {
-				title: '',
-			}
-		},
-		onLoad() {
+		onLoad(option) {
+			this.queryOption = option
 			setSessionXToken() // 登录前先清除xtoke
 		},
 		methods: {
diff --git a/pages/tabBar/mine/mine.vue b/pages/tabBar/mine/mine.vue
index eb496bb..a5383ae 100644
--- a/pages/tabBar/mine/mine.vue
+++ b/pages/tabBar/mine/mine.vue
@@ -19,7 +19,7 @@
 								</u-col>
 							</u-row>
 						</u-col>
-						<u-col span="1" align="end">
+						<u-col @click="handleUnlogin" span="1" align="end">
 							<image style="height: 32rpx;width: 32rpx;" :src="getCdnUrl(`mine/right.png`)"/>
 						</u-col>
 					</u-row>
@@ -62,6 +62,7 @@
 <script>
 	import getCdnUrl from "@/common/getCdnUrl"
 	import { dealBtnMap } from "@/common/enum"
+	import { USERKEY } from "@/store/actionKey"
 	import * as apiService from "@/common/api"
 	
 	export default {
@@ -117,7 +118,7 @@
 			},
 			async handleUnlogin() {
 				await this.$store.dispatch(USERKEY.LOGOUT)
-				this.goto(`login/login`, 2)
+				this.goto(`login/login?isConfirmLogin=true`, 2)
 			},
 		}
 	}
diff --git a/store/modules/user.js b/store/modules/user.js
index d2b0c00..d39d0f8 100644
--- a/store/modules/user.js
+++ b/store/modules/user.js
@@ -15,18 +15,16 @@ export default {
 	},
 	mutations: {
 		[USERKEY.LOGIN](state, provider) {
-			const {
-				token,
-				info
-			} = provider
+			const { token, info } = provider
 			state.token = provider
 		},
 		[USERKEY.GETUSERINFO](state, provider) {
 			state.info = provider
 		},
-		[USERKEY.LOGOUT](state) {
-			state.token = '';
-			state.info = {}
+		[USERKEY.LOGOUT](state, provider) {
+			const { token, info } = provider
+			state.token = token;
+			state.info = info
 		},
 	},
 	getters: {
@@ -62,10 +60,12 @@ export default {
 			state,
 			rootState
 		}, options) {
-			setSessionUserInfo({})
-			setSessionXToken('')
+			let info = { logout: true }
+			let token = ''
+			setSessionUserInfo(info)
+			setSessionXToken(token)
 			
-			commit(USERKEY.LOGOUT)
+			commit(USERKEY.LOGOUT, { info, token })
 		},
 		async [USERKEY.GETUSERINFO]({
 			dispatch,