From b3659ad67ba6679b89c65e09f4ead74eb7c82b07 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Fri, 17 May 2024 17:10:35 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9develop=E6=89=93=E5=8C=85?= =?UTF-8?q?=E7=94=A8=E7=9A=84=E5=90=8E=E7=AB=AF=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.dev_build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.env.dev_build b/.env.dev_build index dfdddc08..13c76fb1 100644 --- a/.env.dev_build +++ b/.env.dev_build @@ -3,5 +3,6 @@ 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' +VUE_APP_BASE_URL = 'https://api.aida.com.hk' + From f7f2fa0911693a197d57b486646e60e93086c5c4 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Fri, 17 May 2024 17:18:25 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=93=E5=8C=85?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.dev_build | 1 - 1 file changed, 1 deletion(-) diff --git a/.env.dev_build b/.env.dev_build index 13c76fb1..ce7505ea 100644 --- a/.env.dev_build +++ b/.env.dev_build @@ -3,6 +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' From da14fe949a6927b80578522f59bb8c78e245fcaa Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Fri, 17 May 2024 18:20:37 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/Detail/habit.vue | 1 - src/views/HomeView/HomeView.vue | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/component/Detail/habit.vue b/src/component/Detail/habit.vue index 91b5dc7a..932ccf16 100644 --- a/src/component/Detail/habit.vue +++ b/src/component/Detail/habit.vue @@ -90,7 +90,6 @@ diff --git a/src/views/HomeView/HomeView.vue b/src/views/HomeView/HomeView.vue index b25e43a2..766e33ac 100644 --- a/src/views/HomeView/HomeView.vue +++ b/src/views/HomeView/HomeView.vue @@ -516,8 +516,11 @@ 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){ + console.log(sketchItem,positionItem); + + if(positionItem.value == sketchItem.category){ num ++ // console.log(num,this.allBoardData?.sketchboardFiles.length); } 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 4/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=BA=E7=89=A9?= =?UTF-8?q?=E5=88=97=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 @@ 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) => { From 3961638804b2b6b1ddae2ac694a56fa0dd387b93 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Fri, 17 May 2024 20:02:32 +0800 Subject: [PATCH 5/5] fix --- src/views/HomeView/HomeView.vue | 2 +- src/views/LoginPage.vue | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/HomeView/HomeView.vue b/src/views/HomeView/HomeView.vue index 929db62a..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") { @@ -892,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"); }, //获取当前语言