From a869b04c3b496cbba53d35b1b9017d0dcf97ed45 Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Thu, 11 Jul 2024 22:33:38 +0800
Subject: [PATCH] uu

---
 common/untool.js      | 2 +-
 manifest.json         | 2 +-
 pages/login/login.vue | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/common/untool.js b/common/untool.js
index eab3c69..c974ee2 100644
--- a/common/untool.js
+++ b/common/untool.js
@@ -245,7 +245,7 @@ const uniPromiseApi = (name, options = {}, extObj = {  })=> {
 	})
 }
 
-const promiseTimeout = (time) => {
+const promiseTimeout = (time = 300) => {
 	return new Promise((resolve, reject)=> {
 		setTimeout(()=> {
 			resolve()
diff --git a/manifest.json b/manifest.json
index c2ff339..a363376 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,7 +3,7 @@
     "appid" : "__UNI__BCB0FB5",
     "description" : "探路国际速运",
     "versionName" : "1.0.0",
-    "versionCode" : "1017",
+    "versionCode" : "1018",
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 228f200..be8ce86 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -49,6 +49,7 @@
 	import { getSessionLoginInfo, setSessionLoginInfo, setSessionXToken } from "@/session"
 	import { encrypt } from "@/common/libs/jsencrypt_utils"
 	import { getSystemInfo } from "@/common/appUpdate"
+	import { promiseTimeout } from "@/common/untool"
 	
 	export default {
 		props: {
@@ -76,6 +77,7 @@
 			if(remberPassport[0]) {
 				Object.assign(this.submitParams, info)
 			}
+			setSessionXToken() // 登录前先清除xtoke
 		},
 		methods: {
 			async handleLogin() {
@@ -90,6 +92,7 @@
 							username: encrypt(submitParams.username),
 						} : {})
 					})
+					await promiseTimeout(300)
 					await this.$store.dispatch(USERKEY.GETUSERINFO)
 					setSessionLoginInfo(submitParams)
 					this.goto("tabBar/home/home")