From adb164a77062b9acb470d4fda2708bf39202cb92 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Fri, 22 Sep 2023 18:17:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=9D=A3=E4=BF=83=E5=B0=8F?=
 =?UTF-8?q?=E7=BB=84=E5=AD=A6=E4=B9=A0=E4=BB=BB=E5=8A=A1=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E5=92=8C=E6=8F=90=E4=BA=A4=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/task.js                         |  9 ++++++++
 subpkg/serviceTask/serviceTask4.vue | 35 ++++++++++++++++++++++-------
 2 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/api/task.js b/api/task.js
index 9488848..99b1534 100644
--- a/api/task.js
+++ b/api/task.js
@@ -41,3 +41,12 @@ export const taskOtherTaskDetail = (data) => oahttp.get('/task/other_task_detail
  */
 export const taskOtherTaskCommit = (data) => oahttp.post('/task/cimmit_other_task', data)
 
+/**
+ * 任务:服务任务详情
+ */
+export const serviceTaskDetails = (data) => oahttp.get('/task/service_task_detail', data)
+
+/**
+ * 任务:提交督促小组服务团队学习任务
+ */
+export const serviceTask4Commit = (data) => oahttp.post('/task/cimmit_service_task4', data)
diff --git a/subpkg/serviceTask/serviceTask4.vue b/subpkg/serviceTask/serviceTask4.vue
index 2b3a7eb..861d02e 100644
--- a/subpkg/serviceTask/serviceTask4.vue
+++ b/subpkg/serviceTask/serviceTask4.vue
@@ -50,8 +50,9 @@
 <script>
   import {
     upLoadImage,
-  } from "@/api/file.js"
+  } from "@/api/file.js";
   import { Toast } from "../../libs/uniApi";
+  import { serviceTaskDetails, serviceTask4Commit } from "@/api/task.js"
   export default {
     data() {
       return {
@@ -61,13 +62,21 @@
           note: "", // 详情描述
           video_annex: [] // 视频列表
         },
-        taskInfo:{},
+        taskInfo:{
+          id: '',
+          title: '',
+          content: '',
+          extend: {}
+        },
         study_photo: [],
         sign_in_table: '',
         study_content: ''
       }
     },
-    onLoad() {},
+    onLoad(options) {
+      options.task_id?this.taskInfo.task_id=options.task_id:null;
+      this.initTask();
+    },
     onShow() {},
     computed: {
       // 占位长度
@@ -77,16 +86,26 @@
       },
     },
     methods: {
+      async initTask(){
+        let res = await serviceTaskDetails({
+          id: this.taskInfo.id
+        });
+        console.log(res);
+        this.taskInfo = res.data;
+        this.sign_in_table = this.taskInfo?.extend?.town_task_type_4?.sign_in_table;
+        this.study_content = this.taskInfo?.extend?.town_task_type_4?.study_content;
+        this.study_photo = JSON.parse(JSON.stringify(this.taskInfo?.extend?.town_task_type_4?.study_photo||{}));
+      },
       // 提交
       async submit() {
         if(this.study_photo.length<5)return Toast('学习照片不能低于5张');
         if(!this.sign_in_table)return Toast('签到表照片不能为空');
         if(this.study_content.trim().length <50) return Toast('培训内容不得低于50字');
-        await taskOtherTaskCommit({
-          id: this.task_id,
-          note: this.note,
-          annex: this.fileList,
-          video_annex: this.videoList
+        await serviceTask4Commit({
+          id: this.taskInfo.id,
+          study_photo: this.study_photo,
+          sign_in_table: this.sign_in_table,
+          study_content: this.study_content
         });
         this.other.is_commit = 1;
         Toast('提交成功');