From 3c0d404de187c2bd5a24933d1bb07b028cd0145d Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Wed, 16 Apr 2025 01:34:06 +0800
Subject: [PATCH] uu

---
 common/env.js                           |  2 +-
 components/buns-api/login/com-login.vue |  3 ---
 components/buns-api/login/index.vue     | 20 +++++++++++++++++++-
 components/buns-api/login/mp-login.vue  | 16 ----------------
 4 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/common/env.js b/common/env.js
index 7131435..5c74562 100644
--- a/common/env.js
+++ b/common/env.js
@@ -1,6 +1,6 @@
 let envMap = {
 	development: {
-		apiHost: 'http://47.102.220.189:59089/api/omssvr',
+		apiHost: 'https://api-sapp.jtrs56.com/api/omssvr',
 	},
 	production: {
 		// apiHost: 'https://api-sapp.tanex56.com/api/omssvr',
diff --git a/components/buns-api/login/com-login.vue b/components/buns-api/login/com-login.vue
index 26fbb1e..7c7eaab 100644
--- a/components/buns-api/login/com-login.vue
+++ b/components/buns-api/login/com-login.vue
@@ -98,9 +98,6 @@
 			},
 			async loginSucceed(){
 				this.$emit("succeedBack")
-			},
-			handleCheckUserInfo(){
-				return true
 			}
 		}
 	}
diff --git a/components/buns-api/login/index.vue b/components/buns-api/login/index.vue
index 7a3274a..3faa6ec 100644
--- a/components/buns-api/login/index.vue
+++ b/components/buns-api/login/index.vue
@@ -12,6 +12,7 @@
 	import { promiseTimeout, showToast } from "@/common/untool"
 	import { getCurrentInstance } from "vue"
 	import { sysEventNames } from "@/common/enum"
+	import { checkParams } from "@/common/validate"
 	
 	// #ifdef MP
 	import LoginComponent from "@/components/buns-api/login/mp-login"
@@ -26,6 +27,11 @@
 		data() {
 			return {
 				lgDialog: { show: false },
+				submitValidConfig: {
+					nickName: { required: true, requiredMsg: '昵称不能为空' },
+					// avatarUrl: { required: true, requiredMsg: '头像不能为空' },
+					phoneNumber: { required: true, requiredMsg: '手机号不能为空' },
+				},
 			}
 		},
 		computed: {
@@ -52,7 +58,19 @@
 				this.reloadCurrentPage(this) // 刷新当前页面
 			},
 			async handleCheckUserInfo() {
-				let bl = await this.$refs.lcRef.handleCheckUserInfo()
+				let bl = false
+				const userInfo = this.$store.getters.userInfo
+				let data = {
+					nickName: userInfo.nickName,
+					avatarUrl: userInfo.avatar,
+					phoneNumber: userInfo.phonenumber,
+				}
+				try{
+					await checkParams(data, this.submitValidConfig, false)
+					bl = true
+				}catch(err){
+					console.error("auto login checkParams err=====", err)
+				}
 				this.lgDialog.show = !bl
 				return bl
 			},
diff --git a/components/buns-api/login/mp-login.vue b/components/buns-api/login/mp-login.vue
index c24afd4..78a9384 100644
--- a/components/buns-api/login/mp-login.vue
+++ b/components/buns-api/login/mp-login.vue
@@ -139,22 +139,6 @@
 				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
-			}
 		}
 	}
 </script>