Merge remote-tracking branch 'origin/develop' into StableVersion

src/router/index.ts

@@ -69,6 +69,41 @@ const routes: Array<RouteRecordRaw> = [
 				path:'eventsDetail',
 				name:'eventsDetail',
 				component: _import_component('Events/eventsDetail.vue'),
+			},{
+				path:'account',
+				name:'account',
+				component: _import_component('Account/account.vue'),
+				children:[
+					{
+						path: "",
+						name:'accountChil',
+						redirect: "/home/account/accountHome"
+					},
+					{
+						path:'accountHome',
+						name:'accountHome',
+						component: _import_component('Account/accountHome.vue'),
+					},
+					{
+						path:'accountEdit',
+						name:'accountEdit',
+						component: _import_component('Account/accountEdit.vue'),
+					},
+					{
+						path:'accountMessage',
+						name:'accountMessage',
+						component: _import_component('Account/accountMessage.vue'),
+					},
+					{
+						path:'accountFollowFans',
+						name:'accountFollowFans',
+						component: _import_component('Account/accountFollowFans.vue'),
+					}
+				]
+			},{
+				path:'otherUsers',
+				name:'otherUsers',
+				component: _import_component('Account/otherUsers.vue'),
 			}
 		]
 	},
@@ -206,11 +241,21 @@ const routes: Array<RouteRecordRaw> = [
 		name: 'feedbackSurveyCN',
 		component: _import('feedbackSurveyCN'),
 	},
+	{
+		path: '/emailVerify',
+		name: 'emailVerify',
+		component: _import('emailVerify'),
+	},
 	{
 		path: '/404',
 		name: '404',
 		component: _import('404')
 	},
+	{
+		path: "/:catchAll(.*)",
+		redirect: "/404",
+	},
+	
 ]
 
 const router = createRouter({
@@ -221,15 +266,24 @@ const router = createRouter({
 // 刷新保存数据-
 let state:any = store.state
 window.addEventListener("beforeunload", (e) => {
-	sessionStorage.setItem(
+	localStorage.setItem(
 		"vuex_setSystemUser",
 		JSON.stringify(state.UserHabit.systemUser.value)
 	);
+	localStorage.setItem(
+		"vuex_setUserInfo",
+		JSON.stringify(state.UserHabit.userInfo)
+	);
 });
-var vuex_setSystemUser:any = sessionStorage.getItem("vuex_setSystemUser");
+var vuex_setSystemUser:any = localStorage.getItem("vuex_setSystemUser");
+var vuex_setUserInfo:any = localStorage.getItem("vuex_setUserInfo");
 if (vuex_setSystemUser == 0 || vuex_setSystemUser == 1) {
 	store.commit("setSystemUser", JSON.parse(vuex_setSystemUser));
-	sessionStorage.removeItem("vuex_setSystemUser");
+	localStorage.removeItem("vuex_setSystemUser");
+}
+if (vuex_setUserInfo) {
+	store.commit("setUserInfo", JSON.parse(vuex_setUserInfo));
+	localStorage.removeItem("vuex_setSystemUser");
 }
 
 let setMurmur = (id:any)=> {
@@ -264,7 +318,7 @@ let setMurmur = (id:any)=> {
 }
 
 router.beforeEach((to:any, from, next) => {
-    let upgradeList = ['/feedbackSurvey','/feedbackSurveyCN']//指定页面系统维护也可以访问
+    let upgradeList = ['/feedbackSurvey','/feedbackSurveyCN','emailVerify']//指定页面系统维护也可以访问
 	
 	// 	系统维护
 	const toName = to.name === 'upgrade';
@@ -323,30 +377,27 @@ router.beforeEach((to:any, from, next) => {
 		}
 		return
 	}
-	if (routeExists) {//检测档期那页面是否存在
-		if (isMurmur && murmurStr && token) {
-			const toName = to.name === 'login';
-			if (toName) {
-				next({ name: '/home' });//机房用户
-			} else {
-				next();
-			}
-		} else {
-			if (routeList.indexOf(to.path) > -1 ) {//指定也买你必须指定用户可以进入
-				if(userIdList.indexOf(userInfo.userId) > -1){
-					next();
-				}else{
-					next({ name: '/404' });
-				}
-			}else{
-				next();
-			}
-				// 如果页面存在，正常跳转
-		}
+	if (isMurmur && murmurStr && token) {
+		const toName = to.name === 'login';
+		if (toName) {
+			return next({ name: '/home' });//机房用户
+		} 
 	} else {
-		// 如果页面不存在，可以跳转到404页面或者其他页面
-		next('/404');
+		if (routeList.indexOf(to.path) > -1 ) {//指定也买你必须指定用户可以进入
+			if(userIdList.indexOf(userInfo.userId) > -1){
+			}else{
+				return next({ name: '/404' });
+			}
+		}
+			// 如果页面存在，正常跳转
 	}
+	next();
+	// if (routeExists) {//检测档期那页面是否存在
+		
+	// } else {
+	// 	// 如果页面不存在，可以跳转到404页面或者其他页面
+	// 	next('/404');
+	// }
 
 
 });