From 6f34382e7537b30448f5341aa1a2c2ebc0ecf80d Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Sat, 18 Nov 2023 10:17:52 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/task/taskItem.vue     |  8 +++-----
 subpkg/townTask/villageTask4.vue | 14 +++++++++-----
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/components/task/taskItem.vue b/components/task/taskItem.vue
index 7dfcf7e..ff886fb 100644
--- a/components/task/taskItem.vue
+++ b/components/task/taskItem.vue
@@ -148,11 +148,10 @@
 					"town_task_type_master_2",
 					"town_task_type_master_4",
 					"town_task_type_master_5",
-					"town_task_type_master_6",
 					"town_task_type_master_7",
 					"town_task_type_master_8"
 				], // 村管理跳转/subpkg/townTask/townTask的任务  1
-				navToList: ["village_task_type_4", "village_task_type_5", "town_task_type_6"],
+				navToList: ["village_task_type_4", "village_task_type_5", "town_task_type_6", "town_task_type_master_6", ],
 
 
 			};
@@ -202,12 +201,11 @@
 					);
 				if (this.navToVillageListA.includes(this.$props.datas.task_type_value))
 					return this.navTo(
-						`/subpkg/townTask/villageTask4?task_id=${this.$props.datas?.id}&type_value=${this.taskRoleTypeList[2]}`
+						`/subpkg/townTask/townTask?task_id=${this.$props.datas?.id}&type_value=${this.taskRoleTypeList[2]}`
 					);
 				if (this.navToList.includes(this.$props.datas.task_type_value))
-
 					return this.navTo(
-						`/subpkg/townTask/villageTask4?task_id=${this.$props.datas?.id}&type_value=${this.taskRoleTypeList[2]}`
+						`/subpkg/townTask/villageTask4?task_id=${this.$props.datas?.id}&type_value=${this.$props.datas.task_type_value}`
 					);
 				switch (this.$props.datas.task_type_value) {
 					case "1":
diff --git a/subpkg/townTask/villageTask4.vue b/subpkg/townTask/villageTask4.vue
index 1ba9c42..2ec09ce 100644
--- a/subpkg/townTask/villageTask4.vue
+++ b/subpkg/townTask/villageTask4.vue
@@ -133,10 +133,12 @@
 				local_src: "",
 				fileTit: "",
 				file_type: "pdf",
+				type_value: "",
 			};
 		},
 		onLoad(options) {
 			this.task_id = options.task_id;
+			this.type_value = options.type_value
 			this.loadTask();
 			uni.$on('upBuyShare', this.loadTask);
 			this.fileOption = {
@@ -161,6 +163,8 @@
 				}
 			},
 			async submitFn() {
+
+
 				if (!this.amount) return Toast("请输入金额")
 				let data = {
 					id: this.task_id,
@@ -170,28 +174,28 @@
 				}
 
 
-				if (this.task.type == 66) {
+				if (this.type_value == "village_task_type_5") {
 					let res = await commit_village_task_5API({
 						...data
 					})
 				}
 
-				if (this.task.type == 65) {
+				if (this.type_value == "village_task_type_4") {
 					let res = await commit_village_task_4API({
 						...data
 					})
 				}
-				if (this.task.type == 49) {
+				if (this.type_value == "town_task_type_6") {
 					let res = await commit_town_service_manager_task_6API({
 						...data
 					})
 				}
-				if (this.task.type == 79) {
+				if (this.type_value == "town_task_type_master_6") {
 					let res = await commit_town_master_task_6API({
 						...data
 					})
 				}
-				return
+
 				Toast("操作成功!")
 				setTimeout(() => {
 					uni.navigateBack()