diff --git a/components/task/taskItem.vue b/components/task/taskItem.vue index 422f16c..b2950a6 100644 --- a/components/task/taskItem.vue +++ b/components/task/taskItem.vue @@ -151,6 +151,10 @@ ], // 村管理跳转/subpkg/townTask/townTask的任务 1 navToList: ["village_task_type_4", "village_task_type_5", "town_task_type_6", "town_task_type_master_6", ], + // 新增入股任务跳转/subpkg/townTask/villageTask6 + navToVillageTask6List: ['village_task_type_8', 'town_task_type_master_2', 'town_task_type_master_7', + 'town_task_type_master_8' + ] }; @@ -206,6 +210,10 @@ return this.navTo( `/subpkg/townTask/villageTask4?task_id=${this.$props.datas?.id}&type_value=${this.$props.datas.task_type_value}` ); + if (this.navToVillageTask6List.includes(this.$props.datas.task_type_value)) + return this.navTo( + `/subpkg/townTask/villageTask6?task_id=${this.$props.datas?.id}&type_value=${this.$props.datas.task_type_value}` + ); switch (this.$props.datas.task_type_value) { case "1": if (this.$store.state.app.userInfo.admin_id) this.navTo( @@ -239,27 +247,27 @@ // case 67: // this.navTo(`/subpkg/townTask/villageTask6?task_id=${this.$props.datas?.id}`); // break; - case "village_task_type_8": - this.navTo(`/subpkg/townTask/villageTask6?task_id=${this.$props.datas?.id}`); - break; - case "town_task_type_master_2": - this.navTo( - `/subpkg/townTask/villageTask6?task_id=${this.$props.datas?.id}&type_value=${this.$props.datas.task_type_value}` - ); - break; + // case "village_task_type_8": + // this.navTo(`/subpkg/townTask/villageTask6?task_id=${this.$props.datas?.id}`); + // break; + // case "town_task_type_master_2": + // this.navTo( + // `/subpkg/townTask/villageTask6?task_id=${this.$props.datas?.id}&type_value=${this.$props.datas.task_type_value}` + // ); + // break; case "town_task_type_master_3": this.navTo(`/subpkg/townTask/gatherRecords?task_id=${this.$props.datas?.id}`); break; - case "town_task_type_master_7": - this.navTo( - `/subpkg/townTask/villageTask6?task_id=${this.$props.datas?.id}&type_value=${this.$props.datas.task_type_value}` - ); - break; - case "town_task_type_master_8": - this.navTo( - `/subpkg/townTask/villageTask6?task_id=${this.$props.datas?.id}&type_value=${this.$props.datas.task_type_value}` - ); - break; + // case "town_task_type_master_7": + // this.navTo( + // `/subpkg/townTask/villageTask6?task_id=${this.$props.datas?.id}&type_value=${this.$props.datas.task_type_value}` + // ); + // break; + // case "town_task_type_master_8": + // this.navTo( + // `/subpkg/townTask/villageTask6?task_id=${this.$props.datas?.id}&type_value=${this.$props.datas.task_type_value}` + // ); + // break; default: this.navTo(''); break; diff --git a/subpkg/topUp/topUp.vue b/subpkg/topUp/topUp.vue index 997e646..53154e0 100644 --- a/subpkg/topUp/topUp.vue +++ b/subpkg/topUp/topUp.vue @@ -1,359 +1,392 @@ \ No newline at end of file diff --git a/subpkg/townTask/villageTask4.vue b/subpkg/townTask/villageTask4.vue index 2ec09ce..8b3fbd6 100644 --- a/subpkg/townTask/villageTask4.vue +++ b/subpkg/townTask/villageTask4.vue @@ -163,8 +163,6 @@ } }, async submitFn() { - - if (!this.amount) return Toast("请输入金额") let data = { id: this.task_id, diff --git a/subpkg/townTask/villageTask6.vue b/subpkg/townTask/villageTask6.vue index eb7b1eb..73cac18 100644 --- a/subpkg/townTask/villageTask6.vue +++ b/subpkg/townTask/villageTask6.vue @@ -211,9 +211,6 @@ video_annex: this.videoList }); } - - - this.other.is_commit = 1; this.approve_status = 1; Toast('提交成功');