From fa947ee6258e79be8d9632c555d18295646a6e64 Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Tue, 15 Apr 2025 23:51:42 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=BC=B9=E6=A1=86=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/buns-api/login/index.vue    | 23 +++++++++-----
 components/buns-api/login/mp-login.vue | 42 +++++++++++++-------------
 2 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/components/buns-api/login/index.vue b/components/buns-api/login/index.vue
index b6b65c3..1d63403 100644
--- a/components/buns-api/login/index.vue
+++ b/components/buns-api/login/index.vue
@@ -1,6 +1,7 @@
 <template>
-	<tpx-dialog v-model:show="lgDialog.show" title="登录" :rootStyle="'min-height:auto;'">
-		<LoginComponent ref="lcRef" @succeedBack="handleLoginedBack" @needLoginInput="handleShowLogin"></LoginComponent>
+	<tpx-dialog v-model:show="lgDialog.show" :renderDefaultSlot="true" title="登录" :rootStyle="'min-height:auto;'">
+		<LoginComponent ref="lcRef" @succeedBack="handleLoginedBack" 
+			@userinfoUpdateBack="handleUpdateUserInfoBanck"/>
 	</tpx-dialog>
 </template>
 
@@ -42,15 +43,21 @@
 			async handleLoginedBack() {
 				await promiseTimeout(300)
 				await this.$store.dispatch(USERKEY.GETUSERINFO)
-				this.lgDialog.show = false
-				// showToast("登录成功")
 				this.reloadCurrentPage(this) // 刷新当前页面
 			},
-			handleShowLogin() {
-				this.lgDialog.show = true
+			async handleUpdateUserInfoBanck(){
+				this.lgDialog.show = false
+				await this.$store.dispatch(USERKEY.GETUSERINFO)
+				this.reloadCurrentPage(this) // 刷新当前页面
 			},
-			triggerLogin(){
-				this.$refs.lcRef.initData()
+			async handleCheckUserInfo() {
+				let bl = await this.$refs.lcRef.handleCheckUserInfo()
+				this.lgDialog.show = !bl
+				return bl
+			},
+			async triggerLogin(){
+				setSessionXToken() // 登录前先清除xtoke
+				await this.$refs.lcRef.initData()
 			}
 		}
 	}
diff --git a/components/buns-api/login/mp-login.vue b/components/buns-api/login/mp-login.vue
index 854d53c..3e7590d 100644
--- a/components/buns-api/login/mp-login.vue
+++ b/components/buns-api/login/mp-login.vue
@@ -33,7 +33,7 @@
 			</template>
 			
 			<template #footer>
-				<u-button v-if="!pageLoading" @click="handleConfirmLogin" type="primary" custom-style="height:66rpx;font-size:32rpx;border-radius: 16rpx;">登录</u-button>
+				<u-button v-if="!pageLoading" @click="handleUpdateUserinfo" type="primary" custom-style="height:66rpx;font-size:32rpx;border-radius: 16rpx;">登录</u-button>
 			</template>
 		</tpx-layout>
 	</view>
@@ -81,7 +81,6 @@
 			commodHeaders(){
 				return {
 					...getCommonReqData().header,
-					"Oms-X-Token": this.token,
 				}
 			},
 			async initData(){
@@ -94,23 +93,7 @@
 				if(!isLogined) {
 					try{
 						await this.autoLogin()
-						if(this.token) {
-							// 如果用户信息已绑定，直接触发登录成功
-							const res = await apiService.getInfoByApp({ _loading: true }, this.commodHeaders())
-							let userInfo = res?.user || {}
-							Object.assign(this.submitLogin , {
-								nickName: userInfo.nickName,
-								avatarUrl: userInfo.avatar,
-								phoneNumber: userInfo.phonenumber,
-							})
-							try{
-								await checkParams(this.submitLogin, this.submitValidConfig, false)
-								this.loginSucceed()
-							}catch(err){
-								this.$emit("needLoginInput")
-								console.error("auto login checkParams err=====", err)
-							}
-						}
+						this.loginSucceed()
 					}catch(err){
 						console.error("isLogined ==== err", err)
 					}
@@ -145,15 +128,32 @@
 			handleNicknamereview(e){
 				console.log(e)
 			},
-			async handleConfirmLogin() {
+			async handleUpdateUserinfo() {
 				await checkParams(this.submitLogin, this.submitValidConfig)
+				// 更新用户信息
 				await this.autoLogin()
-				this.loginSucceed()
+				this.$emit("userinfoUpdateBack")
 			},
 			async loginSucceed(){
 				let token = this.token
 				await this.$store.dispatch(USERKEY.UPDATETOKEN, { token })
 				this.$emit("succeedBack")
+			},
+			async handleCheckUserInfo(){
+				const res = await apiService.getInfoByApp({ _loading: true })
+				let userInfo = res?.user || {}
+				Object.assign(this.submitLogin , {
+					// nickName: userInfo.nickName,
+					// avatarUrl: userInfo.avatar,
+					// phoneNumber: userInfo.phonenumber,
+				})
+				try{
+					await checkParams(this.submitLogin, this.submitValidConfig, false)
+				}catch(err){
+					return false
+					console.error("auto login checkParams err=====", err)
+				}
+				return true
 			}
 		}
 	}