From 756e3f18555dda05cfdbd7d67a985bc09a3c2c25 Mon Sep 17 00:00:00 2001
From: dingtalk_umvbsp <m13724205240@163.com>
Date: Thu, 27 Jul 2023 10:21:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BF=9D=E5=AD=98=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95token=EF=BC=8C=E8=87=AA=E5=8A=A8=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue              |  6 ++----
 pages/home/index.vue |  2 +-
 pages/home/login.vue |  6 ++++--
 store/index.js       | 23 +++++++++++++++++++----
 4 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/App.vue b/App.vue
index 21e9769..9d92993 100644
--- a/App.vue
+++ b/App.vue
@@ -16,10 +16,8 @@
 </style>
 <script>
 	export default {
-		onLaunch: function() {
-			if(this.$store.getters.token){
-				
-			}else{
+		onLaunch: async function() {
+			if(await this.$store.dispatch('getUserInfo', this.$store.getters.token||uni.getStorageSync('token'))){
 				this.$store.commit('outLogin')
 			}
 		},
diff --git a/pages/home/index.vue b/pages/home/index.vue
index f676f9d..a9afb00 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -433,7 +433,7 @@ import request,{host} from '@/common/request'
 						this.plantBase=[res.data]
 						this.$store.commit("setBaseId", {id:res.data[0].id,name:res.data[0].baseName})
 					}else{
-						uni.showToast({title:"请在管理端维护基地！",icon:"none",duration:5000})
+						uni.showToast({title:"请先至管理端维护基地信息！",icon:"none",duration:5000})
 					}
 				}else{
 					uni.showModal({
diff --git a/pages/home/login.vue b/pages/home/login.vue
index 59774ce..33dc676 100644
--- a/pages/home/login.vue
+++ b/pages/home/login.vue
@@ -112,6 +112,7 @@ export default {
 		//#ifdef APP-PLUS
 		this.getVersion()
 		plus.runtime.getProperty(plus.runtime.appid, async info=>{
+			console.log("app ",info)
 			this.versionCode = info.versionCode
 		})
 		//#endif
@@ -123,8 +124,8 @@ export default {
 				body:this.formData
 			})
 			if(res.statu){
-				this.$store.commit("setUserInfo",res.data)
-				uni.switchTab({url:'/pages/home/index'})
+				this.$store.dispatch("getUserInfo",res.data.token)
+				// uni.switchTab({url:'/pages/home/index'})
 			}else{
 				uni.showModal({
 					title:"提示",
@@ -140,6 +141,7 @@ export default {
 				params:{type:1}
 			})
 			if(res.statu){
+				console.log(res.data.appVersionCode,'----appVersion--')
 				if(res.data.appVersionCode!=this.versionCode){
 					this.isShowModal=true
 					this.appDownLoadUrl=host("version",res.data.appDownloadUrl)
diff --git a/store/index.js b/store/index.js
index ff07fa1..28945e9 100644
--- a/store/index.js
+++ b/store/index.js
@@ -21,17 +21,16 @@ export default new Vuex.Store({
 	},
 	mutations:{
 		setUserInfo(state, val){
-			state.userInfo={
-				...val.userInfo,
-				companyName:val.departs[0].departName
-			}
+			state.userInfo=val.userInfo
 			state.token=val.token
+			uni.setStorageSync('token', val.token)
 			this.dispatch('getSysMsg')
 		},
 		outLogin(state){
 			state.userInfo={}
 			state.baseInfo={}
 			state.token=''
+			uni.removeStorageSync('token')
 			clearTimeout(timer)
 			uni.reLaunch({
 				url:"/pages/home/login",
@@ -63,5 +62,21 @@ export default new Vuex.Store({
 			}
 			timer=setTimeout(()=>dispatch('getSysMsg'),30*60*1000)
 		},
+		async getUserInfo({commit},val){
+			console.log(val,'------------token---------------')
+			if(val){
+				var res=await request("/common/api/dict/queryUserInfoByToken",{
+					params:{token:val}
+				})
+				if(res.statu){
+					commit('setUserInfo',{userInfo:res.data, token:val})
+					uni.switchTab({url:'/pages/home/index'})
+					return false
+				}else{
+					return true
+				}
+			}
+			return true
+		},
 	}
 })