From 0ae93da5a6d56cf4e430882b59eb9cd39018e1d0 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Fri, 23 Aug 2024 22:23:27 +0800
Subject: [PATCH] fix

---
 src/router/index.ts   | 29 ++++++++++++++---------------
 src/views/Upgrade.vue |  4 ++--
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/router/index.ts b/src/router/index.ts
index 5c64c305..cd873d31 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -10,8 +10,8 @@ const routes: Array<RouteRecordRaw> = [
 	{
 		path: "/",
 		// redirect重定向
-		redirect: "/Square"
-		// redirect: "/upgrade"
+		// redirect: "/Square"
+		redirect: "/upgrade"
 		
 	},
 	{
@@ -232,20 +232,20 @@ if (vuex_setSystemUser == 0 || vuex_setSystemUser == 1) {
 }
 
 router.beforeEach((to, from, next) => {
+    let upgradeList = ['/feedbackSurvey','/feedbackSurveyCN']//指定页面系统维护也可以访问
 	
 	// 	系统维护
-    // let upgradeList = ['/feedbackSurvey','/feedbackSurveyCN']//指定页面系统维护也可以访问
-	// const toName = to.name === 'upgrade';
-	// if(upgradeList.indexOf(to.path) > -1){
-	// 	next();
-	// }else{
-	// 	if (toName) {
-	// 		next();
-	// 	} else {
-	// 		next({ name: 'upgrade' });
-	// 	}
-	// }
-	// return
+	const toName = to.name === 'upgrade';
+	if(upgradeList.indexOf(to.path) > -1){
+		next();
+	}else{
+		if (toName) {
+			next();
+		} else {
+			next({ name: 'upgrade' });
+		}
+	}
+	return
 	// 检查路由是否存在
 	// 机房用户
 	let userInfo = JSON.parse(getCookie("userInfo") as any);
@@ -256,7 +256,6 @@ router.beforeEach((to, from, next) => {
     let routeList = ['/testClickData','/trialApproval']//指定页面需要指定id才能进入
     let userIdList = [88,6,46,31,73,83,87,4]
     let isSystemUserRouteList = ['/login','/Square']//游客用户只能进入这两个页面
-    let upgradeList = ['/feedbackSurvey','/feedbackSurveyCN']//指定页面系统维护也可以访问
 
 
 	let systemUser = state.UserHabit.systemUser
diff --git a/src/views/Upgrade.vue b/src/views/Upgrade.vue
index baf0ff74..b6b1dc82 100644
--- a/src/views/Upgrade.vue
+++ b/src/views/Upgrade.vue
@@ -8,10 +8,10 @@
 			<div class="upgrade-content-text">System upgrading</div>
 			<!-- <div class="upgrade-content-text">System maintenance</div> -->
 			<!-- 没有截至时间 -->
-			<div class="upgrade-content-textab">Due to system server upgrades, We will be upgrading from 9:30 am Hong Kong time on Tuesday, July 9 until further notice. During this period, access to the AiDA system will be temporarily unavailable.<br> We apologize for any inconvenience this may cause and appreciate your understanding.</div>
+			<!-- <div class="upgrade-content-textab">Due to system server upgrades, We will be upgrading from 9:30 am Hong Kong time on Tuesday, July 9 until further notice. During this period, access to the AiDA system will be temporarily unavailable.<br> We apologize for any inconvenience this may cause and appreciate your understanding.</div> -->
 			<!-- 有截至时间 -->
 			<!-- <div class="upgrade-content-textab">Due to system server upgrades, We will be upgrading from 9:30 am Hong Kong time on Tuesday, July 9 until 17:00 PM on Tuesday, July 9. During this period, access to the AiDA system will be temporarily unavailable.<br> We apologize for any inconvenience this may cause and appreciate your understanding.</div> -->
-			<!-- <div class="upgrade-content-textab">The AiDA system cannot be accessed temporarily due to system server maintenance. We apologize for any inconvenience this may cause and thank you for your understanding.</div> -->
+			<div class="upgrade-content-textab">The AiDA system cannot be accessed temporarily due to system server maintenance. We apologize for any inconvenience this may cause and thank you for your understanding.</div>
 		</div>
 	</div>
 </template>