Merge branch 'StableVersion' into localDevelop

src/views/HomeView/HomeView.vue

@@ -441,7 +441,6 @@ export default defineComponent({
 		
 		let noRefresh = this.$route.params.noRefresh; //判断是否主动刷新还是路由跳转过来的 true 路由跳转过来的
 		window.addEventListener('beforeunload', (event)=>{
-			this.store.commit("setUserGroupId", this.$route.params.id);
 			this.store.commit("clearAllCollection");
 		});
 		if (this.$route.name == "homePage") {
@@ -520,8 +519,10 @@ export default defineComponent({
 			this.isMannequinShow = false
 			let num = 0
 			this.allBoardData?.sketchboardFiles?.forEach((sketchItem:any) => {
+				
 				this.workspacePosition.forEach((positionItem:any) => {
-					if(positionItem.name == sketchItem.category){
+
+					if(positionItem.value == sketchItem.category){
 						num ++ 
 						// console.log(num,this.allBoardData?.sketchboardFiles.length);
 					}
@@ -636,6 +637,7 @@ export default defineComponent({
 							"setDesignCollectionList",
 							rv.designCollectionItems
 						);
+						
 						this.store.commit("setLikeDesignCollectionList", []);
 						this.store.commit("deleteUserGroupId");
 						this.store.commit(
@@ -645,7 +647,6 @@ export default defineComponent({
 						this.store.commit("setDesignId", rv.designId);
 						// this.designProgress = 0;
 						this.startDesignType = "design";
-						
 					}
 				})
 				.catch((res) => {
@@ -680,6 +681,7 @@ export default defineComponent({
 						);
 						// this.designProgress = 0,
 						this.startDesignType = "resDesign";
+						this.store.commit("setDesignId", rv.designId);
 					}
 				})
 				.catch((res) => {
@@ -829,6 +831,7 @@ export default defineComponent({
 			if (this.likeLoading) {
 				return;
 			}
+			
 			this.likeLoading = true;
 			Https.axiosPost(Https.httpUrls.designLike, data)
 				.then((rv: any) => {
@@ -892,6 +895,7 @@ export default defineComponent({
 				Https.httpUrls.historyChoose + `?userGroupId=${userGroupId}`;
 			Https.axiosGet(url)
 				.then((rv: any) => {
+					this.store.commit("setUserGroupId", rv.userGroupId);
 					this.dealHistoryChooseData(rv, type);
 					this.isShowMark = false;
 				})

src/views/LoginPage.vue

@@ -527,6 +527,8 @@ export default defineComponent({
             // this.$router.push("/home");
 			// console.log(window.location.search.substring(1));
 			this.store.commit("clearAllData");
+			this.store.commit("clearAllCollection");
+			this.store.commit("setAllBoardDataChoose",{});
 			this.$router.push("/home");
         },
 		//获取当前语言

src/views/Upgrade.vue

@@ -7,7 +7,8 @@
 			<div class="upgrade-content-wire"></div>
 			<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 conducting maintenance on Friday, May 17 from 10:30 AM to 11:30 PM Hong Kong time. 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 Friday, March 17 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 carry out repairs on Friday, March 17th, from 9:30 AM to 16:00 PM Hong Kong time. 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>
 	</div>
 </template>