From 4ded24ec55fd952e334f28bf97194dc4278c3653 Mon Sep 17 00:00:00 2001 From: liup <1454939542@qq.com> Date: Fri, 20 Dec 2024 15:00:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=A1=E5=88=92=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 5 + pages/index.vue | 59 +- pages/login/login.vue | 83 +- pages/main/home/home.vue | 8 +- pages/main/message/message.vue | 137 +- pages/main/my/my.vue | 2 +- pages/main/plan/plan.vue | 601 +++ store/index.js | 2 +- .../dist/dev/app-plus/app-config-service.js | 4 +- unpackage/dist/dev/app-plus/app-service.js | 3290 ++++++++----- unpackage/dist/dev/app-plus/app-view.js | 4080 ++++++++++------- 11 files changed, 5444 insertions(+), 2827 deletions(-) create mode 100644 pages/main/plan/plan.vue diff --git a/pages.json b/pages.json index 28d13495..8a9dbada 100644 --- a/pages.json +++ b/pages.json @@ -28,6 +28,11 @@ "style": { "navigationBarTitleText": "消息" } + },{ + "path": "pages/main/plan/plan", + "style": { + "navigationBarTitleText": "计划" + } }, { "path": "pages/main/task/page2/scan_review", diff --git a/pages/index.vue b/pages/index.vue index 53163236..995f237d 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -5,7 +5,7 @@ - @@ -14,8 +14,9 @@ - + @@ -23,7 +24,7 @@ - @@ -32,26 +33,26 @@ - - + - - + - + @@ -154,7 +155,7 @@ import Task from './main/task/task.vue'; import Message from './main/message/message.vue'; import Home from './main/home/home.vue'; - import Task4 from './main/task/task.vue'; + import Plan from './main/plan/plan.vue'; import my from './main/my/my.vue'; export default { @@ -170,7 +171,7 @@ Task, Message, Home, - Task4, + Plan, my }, data() { @@ -209,6 +210,15 @@ tabbarPageScrollLower(e) { if (this.currentTabbarIndex === 1) { this.$refs.message.reachBottom() + }else if (this.currentTabbarIndex === 3) { + this.$refs.plan.reachBottom() + } + }, + tabbarPageScrollTop(){ + if (this.currentTabbarIndex === 1) { + this.$refs.message.reachBottom() + }else if (this.currentTabbarIndex === 3) { + this.$refs.plan.reachBottom() } }, @@ -247,9 +257,30 @@ this.oldScrollTop = e.detail.scrollTop }, handleBtnClick(e) { - console.log('扫码复核') - wx.vibrateShort(); - this.$refs.task.openSan() + + if(this.currentTabbarIndex == 2){ + console.log('扫码复核') + wx.vibrateShort(); + this.$refs.task.openSan() + }else if(this.currentTabbarIndex == 0){ + this.scrollTop = this.oldScrollTop + this.$nextTick(function() { + this.scrollTop = 0 + }); + this.$refs.home.refresh() + }else if(this.currentTabbarIndex == 1){ + this.scrollTop = this.oldScrollTop + this.$nextTick(function() { + this.scrollTop = 0 + }); + this.$refs.message.refresh() + }else if(this.currentTabbarIndex == 3){ + this.scrollTop = this.oldScrollTop + this.$nextTick(function() { + this.scrollTop = 0 + }); + this.$refs.plan.refresh() + } }, } diff --git a/pages/login/login.vue b/pages/login/login.vue index 4eab2b1d..0bfc58eb 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -16,6 +16,9 @@
+
+
+