@dongkboy 3 месяцев назад
Родитель
Сommit
86dbb85338
2 измененных файлов с 11 добавлено и 33 удалено
  1. 1 2
      pages/set/set.vue
  2. 10 31
      store/modules/user.js

+ 1 - 2
pages/set/set.vue

@@ -87,9 +87,8 @@
 			...mapMutations(['emptyUserInfo']),
 			logout() {
 				this.emptyUserInfo();
-
 				setTimeout(() => {
-					uni.navigateTo({
+					uni.reLaunch({
 						url: "/pages/login/login"
 					})
 				}, 1500);

+ 10 - 31
store/modules/user.js

@@ -1,30 +1,11 @@
-// 从持久化存储中读取初始值
-const getStorageItem = (key, defaultValue = "") => {
-	// #ifdef H5
-	try {
-		const item = window.sessionStorage.getItem(key);
-		return item ? JSON.parse(item) : defaultValue;
-	} catch (e) {
-		return defaultValue;
-	}
-	// #endif
-	// #ifndef H5
-	try {
-		return uni.getStorageSync(key) || defaultValue;
-	} catch (e) {
-		return defaultValue;
-	}
-	// #endif
-};
-
 export const state = {
 	//用户数据
-	userInfo: getStorageItem('userInfo', {}),
-	userCheckInfo: getStorageItem('userCheckInfo', {}),
-	userLoginId: getStorageItem('userLoginId', ""),
-	token: getStorageItem('token', ""),
-	avatar: getStorageItem('avatar', ""),
-	userStatus: getStorageItem('userStatus', "")
+	userInfo: {},
+	userCheckInfo: {},
+	userLoginId: "",
+	token: "",
+	avatar: "",
+	userStatus: ""
 };
 export const mutations = {
 	setUserModules(state, obj = {}) {
@@ -108,22 +89,20 @@ export const mutations = {
 	emptyUserInfo(state) {
 		state.userInfo = {};
 		state.userCheckInfo = {};
-		state.avatar = '';
 		state.token = '';
-		state.userStatus = '1';
 		// #ifdef H5
 		window.sessionStorage.removeItem("userInfo");
 		window.sessionStorage.removeItem("userCheckInfo");
-		window.sessionStorage.removeItem("avatar");
 		window.sessionStorage.removeItem("token");
-		window.sessionStorage.removeItem("userStatus");
+		window.sessionStorage.removeItem("system_Name");
+		window.sessionStorage.removeItem("system_code");
 		// #endif
 		// #ifndef H5
 		uni.removeStorageSync("userInfo");
 		uni.removeStorageSync("userCheckInfo");
-		uni.removeStorageSync("avatar");
 		uni.removeStorageSync("token");
-		uni.removeStorageSync("userStatus");
+		uni.removeStorageSync("system_Name");
+		uni.removeStorageSync("system_code");
 		// #endif
 	},
 };