From 25d3d40fd1ca0fa24b6b5dc83f1a6789eb199fd5 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Fri, 17 May 2024 19:41:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=BA=E7=89=A9=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.dev                            | 4 ++--
 src/component/Detail/habit.vue      | 1 +
 src/component/HomePage/TaskPage.vue | 8 ++++----
 src/views/HomeView/HomeView.vue     | 5 +++--
 4 files changed, 10 insertions(+), 8 deletions(-)

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/src/component/Detail/habit.vue b/src/component/Detail/habit.vue
index 932ccf16..91b5dc7a 100644
--- a/src/component/Detail/habit.vue
+++ b/src/component/Detail/habit.vue
@@ -90,6 +90,7 @@
                 <a-slider id="system_silder"
                     v-model:value="workspaceItem.systemDesignerPercentage"
                     @afterChange="systemDesigner"
+					:tooltip-visible="openType.slider"
 					:tip-formatter="formatter"
 				>
                 </a-slider>
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 766e33ac..929db62a 100644
--- a/src/views/HomeView/HomeView.vue
+++ b/src/views/HomeView/HomeView.vue
@@ -518,7 +518,6 @@ export default defineComponent({
 			this.allBoardData?.sketchboardFiles?.forEach((sketchItem:any) => {
 				
 				this.workspacePosition.forEach((positionItem:any) => {
-				console.log(sketchItem,positionItem);
 
 					if(positionItem.value == sketchItem.category){
 						num ++ 
@@ -635,6 +634,7 @@ export default defineComponent({
 							"setDesignCollectionList",
 							rv.designCollectionItems
 						);
+						
 						this.store.commit("setLikeDesignCollectionList", []);
 						this.store.commit("deleteUserGroupId");
 						this.store.commit(
@@ -644,7 +644,6 @@ export default defineComponent({
 						this.store.commit("setDesignId", rv.designId);
 						// this.designProgress = 0;
 						this.startDesignType = "design";
-						
 					}
 				})
 				.catch((res) => {
@@ -679,6 +678,7 @@ export default defineComponent({
 						);
 						// this.designProgress = 0,
 						this.startDesignType = "resDesign";
+						this.store.commit("setDesignId", rv.designId);
 					}
 				})
 				.catch((res) => {
@@ -828,6 +828,7 @@ export default defineComponent({
 			if (this.likeLoading) {
 				return;
 			}
+			
 			this.likeLoading = true;
 			Https.axiosPost(Https.httpUrls.designLike, data)
 				.then((rv: any) => {