diff --git a/.env.dev b/.env.dev
index d429345a..b6e5858c 100644
--- a/.env.dev
+++ b/.env.dev
@@ -1,8 +1,8 @@
 NODE_ENV = 'development'
 # VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk'
-# VUE_APP_BASE_URL = 'https://api.aida.com.hk'
+VUE_APP_BASE_URL = 'https://api.aida.com.hk'
 
 # VUE_APP_BASE_URL = 'http://18.167.251.121:10086'
-VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk'
+# VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk'
 # VUE_APP_BASE_URL = 'http://192.168.1.9:17088'
 # VUE_APP_BASE_URL = 'http://192.168.1.7:5567'
diff --git a/.env.dev_build b/.env.dev_build
index dfdddc08..ce7505ea 100644
--- a/.env.dev_build
+++ b/.env.dev_build
@@ -3,5 +3,5 @@ NODE_ENV = 'production'
 # VUE_APP_BASE_URL = 'http://18.167.251.121:10088'
 # VUE_APP_BASE_URL = 'https://api.aida.com.hk'
 VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk'
-# VUE_APP_BASE_URL = 'https://api.aida.com.hk'
+
 
diff --git a/src/component/HomePage/TaskPage.vue b/src/component/HomePage/TaskPage.vue
index bcd695bc..58c7a2bc 100644
--- a/src/component/HomePage/TaskPage.vue
+++ b/src/component/HomePage/TaskPage.vue
@@ -152,13 +152,13 @@ export default defineComponent({
         init(data:any){
 			this.visible = true
 			// this.getTaskList()
-			this.isShowMark = true
-			let time = 0
+			let time = 100
 			if(data){
 				time = 1000
 			}
 			setTimeout(() => {
 				this.currentPage = 1
+				this.isShowMark = true
 				this.getTaskMoreList()
 				this.getTaskTime = null
 			}, time);
@@ -236,11 +236,11 @@ export default defineComponent({
 			}
 			Https.axiosPost(Https.httpUrls.getTasksHistory,data).then((rv)=>{
 				this.isShowMark = false
-				this.currentPage += 1
-				if(this.currentPage > 1 && rv.content.length == 0){
+				if(this.currentPage != 1 && rv.content.length == 0){
 					this.currentPage = 1
 					this.getTaskMoreList()
 				}else{
+					this.currentPage += 1
 					this.taskListMore.push(...rv.content)
 					this.total = rv.total
 					this.taskListUnfinished = []
diff --git a/src/views/HomeView/HomeView.vue b/src/views/HomeView/HomeView.vue
index b25e43a2..50febce2 100644
--- a/src/views/HomeView/HomeView.vue
+++ b/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") {
@@ -516,8 +515,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);
 					}
@@ -632,6 +633,7 @@ export default defineComponent({
 							"setDesignCollectionList",
 							rv.designCollectionItems
 						);
+						
 						this.store.commit("setLikeDesignCollectionList", []);
 						this.store.commit("deleteUserGroupId");
 						this.store.commit(
@@ -641,7 +643,6 @@ export default defineComponent({
 						this.store.commit("setDesignId", rv.designId);
 						// this.designProgress = 0;
 						this.startDesignType = "design";
-						
 					}
 				})
 				.catch((res) => {
@@ -676,6 +677,7 @@ export default defineComponent({
 						);
 						// this.designProgress = 0,
 						this.startDesignType = "resDesign";
+						this.store.commit("setDesignId", rv.designId);
 					}
 				})
 				.catch((res) => {
@@ -825,6 +827,7 @@ export default defineComponent({
 			if (this.likeLoading) {
 				return;
 			}
+			
 			this.likeLoading = true;
 			Https.axiosPost(Https.httpUrls.designLike, data)
 				.then((rv: any) => {
@@ -888,6 +891,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;
 				})
diff --git a/src/views/LoginPage.vue b/src/views/LoginPage.vue
index cc0119da..0ca19b7c 100644
--- a/src/views/LoginPage.vue
+++ b/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");
         },
 		//获取当前语言