From 6d66f7362cefb15d4c6966271408d5ff6191d5ec Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Fri, 17 Mar 2023 17:22:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9token=E5=A2=9E=E5=8A=A0=E5=8D=95?=
 =?UTF-8?q?=E7=8B=AC=E7=9A=84h5=E7=9A=84=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/login/login.vue |  5 -----
 utils/token.js        | 30 +++++++++++++++++++++++-------
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/pages/login/login.vue b/pages/login/login.vue
index 798ea5f..c70138c 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -47,11 +47,6 @@
 				}
 				console.log(pv,'=',options[pv]);
 			});
-			//if(params){
-				console.log(this.redirect+params)
-			//}
-			
-			
 		},
 		mounted() {
 			//对cookies进行操作，这里是写
diff --git a/utils/token.js b/utils/token.js
index 60f59d7..d2e5ea8 100644
--- a/utils/token.js
+++ b/utils/token.js
@@ -2,19 +2,35 @@
 const TOKEN_KEY = 'token'
 
 export function getToken() {
-	let token=uni.getStorageSync(TOKEN_KEY);
-	if(!token){
-	 	token=uni.getStorageSync('userInfo');
-		if(token){
-			token=JSON.parse(token).token;
+	
+	let token='';
+	// #ifdef H5
+	var ca = document.cookie.split(';');
+	for(var i=0; i<ca.length; i++) 
+	{
+	    var c = ca[i].trim();
+	    if (c.indexOf(TOKEN_KEY)==0){
+			token=c.substring(TOKEN_KEY.length+1,c.length);
+			break;
 		}
 	}
+	// #endif
+	// #ifndef H5
+	token = uni.getStorageSync(TOKEN_KEY);
+	// #endif
 	return token;
-  //return uni.getStorageSync(TOKEN_KEY);
+
 }
 
 export function setToken(token) {
-	return uni.setStorageSync(TOKEN_KEY,token);
+	//如果是h5,token两个小时过期
+	// #ifdef H5
+	var expires = "max-age="+(2*60*60*1000);
+	document.cookie = TOKEN_KEY + "=" + token + ";path=/;" + expires;
+	// #endif
+	// #ifndef H5
+	uni.setStorageSync(TOKEN_KEY,token);
+	// #endif
 }
 
 export function removeToken() {