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;
 				})