From 036c737f1d72639ee86449411c88c9bd507d9d20 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Thu, 14 Sep 2023 14:27:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BB=BB=E5=8A=A1=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/task.js                    |  10 ++-
 subpkg/otherTask/otherTask.vue | 117 +++++++++++++++++++++------------
 2 files changed, 84 insertions(+), 43 deletions(-)

diff --git a/api/task.js b/api/task.js
index 94b0299..b982545 100644
--- a/api/task.js
+++ b/api/task.js
@@ -29,9 +29,15 @@ export const taskAddTricycleCoordinate = (data) => oahttp.post('/task/add_tricyc
 /**
  * 任务:入股详情
  */
-export const taskShareholder = (data) => oahttp.post('/task/shareholder', data)
+export const taskShareholder = (data) => oahttp.get('/task/shareholder', data)
 
 /**
- * 任务:三轮车详情
+ * 任务:其他任务详情
  */
 export const taskOtherTaskDetail = (data) => oahttp.get('/task/other_task_detail', data)
+
+/**
+ * 任务:提交其他任务
+ */
+export const taskOtherTaskUpload = (data) => oahttp.post('/task/commit', data)
+
diff --git a/subpkg/otherTask/otherTask.vue b/subpkg/otherTask/otherTask.vue
index 64a4321..e8dccef 100644
--- a/subpkg/otherTask/otherTask.vue
+++ b/subpkg/otherTask/otherTask.vue
@@ -1,68 +1,97 @@
 <template>
   <view style="padding-top: 28rpx;padding-bottom: 160rpx;">
     <view class="card">
-      <view class="title">任务名称: 入股任务</view>
+      <view class="title">任务名称: {{task_info.title}}</view>
       <u-line style="margin: 14rpx 0;"></u-line>
-      <view class="text">阶段类型: 单次</view>
-      <view class="text" style="color: #FF7C32;">任务金额: 3000元</view>
+      <!-- <view class="text">阶段类型: 单次</view> -->
+      <view class="text" style="color: #FF7C32;">任务金额: {{task_info.money}}元</view>
     </view>
     <view class="card">
       <view class="title">任务描述</view>
       <u-line style="margin: 14rpx 0;"></u-line>
-      <view class="text">完成公司分配入股任务，时限30日内。完成公司分配入股任务，时限30日内。完成公司分配入股任务，时限30日内。</view>
+      <view class="text">{{task_info.content}}</view>
     </view>
     <view class="card">
       <view class="title">详情描述</view>
       <u-line style="margin: 14rpx 0;"></u-line>
-      <u--textarea v-model="formData.text" placeholder="请输入内容" placeholderStyle="font-size: 22rpx;" style="font-size: 28rpx;background-color: #eee;min-height: 100px;" autoHeight maxlength="-1"></u--textarea>
+      <u--textarea v-model="other.note" placeholder="请输入内容" placeholderStyle="font-size: 22rpx;"
+        style="font-size: 28rpx;background-color: #eee;min-height: 100px;" autoHeight maxlength="-1"></u--textarea>
       <view class="title" style="margin: 16rpx 0;">添加附件</view>
       <view class="file">
-        <view class="file_item" v-for="(item, index) in formData.fileList" :key="'file'+index">
+        <view class="file_item" v-for="(item, index) in fileList" :key="'file'+index">
           <image class="image" :src="item" @click="priview(index)"></image>
           <image class="del" src="/static/icons/delete.png" @click.stop="deleteFile(index)"></image>
         </view>
-        <view class="file_btn" @click="chooseFile"><image src="/static/icons/plus.png"></image></view>
+        <view class="file_btn" @click="chooseFile">
+          <image src="/static/icons/plus.png"></image>
+        </view>
         <view class="file_empty" v-for="k in placeholderLength" :key="'empty'+k"></view>
       </view>
     </view>
-    <mybtn text="确认提交"></mybtn>
+    <mybtn v-if="!other.is_commit" text="确认提交" @click="$u.throttle(submit, 1500)"></mybtn>
+    <mybtn v-else-if="task_info.status==3" text="已完成" :my_btn_disabled="true"></mybtn>
+    <mybtn v-else-if="task_info.status==5" text="已关闭" :my_btn_disabled="true"></mybtn>
+    <mybtn v-else text="已提交" :my_btn_disabled="true"></mybtn>
   </view>
 </template>
 
 <script>
   import {
-  	upLoadImage
+    upLoadImage
   } from "@/api/file.js"
   import {
-    taskOtherTaskDetail
+    taskOtherTaskDetail,
+    taskOtherTaskUpload
   } from "@/api/task.js"
+import { Toast } from "../../libs/uniApi";
   export default {
     data() {
       return {
         task_id: -1,
-        formData: {
-          text: '',
-          fileList: []
-        }
+        task_info: {
+
+        },
+        other: {
+          annex: [], // 附件列表
+          is_commit: 0, // 是否提交
+          note: "", // 详情描述
+        },
+        fileList: []
       };
     },
     onLoad(options) {
       this.task_id = options.task_id;
       this.initDetail();
     },
-    computed:{
+    computed: {
       // 占位长度 
-      placeholderLength(){
-        return (this.formData.fileList.length+1)%3==0? 0 : 3-(this.formData.fileList.length+1)%3;
+      placeholderLength() {
+        return (this.fileList.length + 1) % 3 == 0 ? 0 : 3 - (this.fileList.length + 1) % 3;
       }
     },
-    methods:{
-      initDetail(){
-        taskOtherTaskDetail({id: this.task_id}).then((res)=>{
-          this.formData = res.data;
+    methods: {
+      initDetail() {
+        taskOtherTaskDetail({ id: this.task_id }).then((res) => {
+          this.task_info = res.data;
+          this.other = res.data?.extend?.other;
         })
       },
-      chooseFile(){
+      async submit(){
+        console.log('提交');
+        if(this.other.note.trim()=='')return Toast('详情描述不能为空');
+        await taskOtherTaskUpload({
+          id: this.task_id,
+          extend: {
+            other: {
+              note: this.other.note,
+              annex: this.other.annex
+            }
+          }
+        });
+        this.other.is_commit = 1;
+        Toast('提交成功')
+      },
+      chooseFile() {
         uni.chooseImage({
           sizeType: ['compressed'],
           success: async (res) => {
@@ -71,41 +100,41 @@
                 filePath: item.path,
                 name: 'file'
               });
-              this.formData.fileList.push(res.data.uri);
+              this.fileList.push(res.data.uri);
             }
-            // this.formData.fileList = [...this.formData.fileList, res.tempFiles]
+            // this.fileList = [...this.fileList, res.tempFiles]
           }
         })
       },
-      priview(index){
+      priview(index) {
         uni.previewImage({
-          urls: this.formData.fileList,
+          urls: this.fileList,
           current: index,
           longPressActions: {
             itemList: ['删除'],
             itemColor: '#ff0000',
             success(e) {
-              if(e.tapIndex==0)this.deleteFile(e.index);
+              if (e.tapIndex == 0) this.deleteFile(e.index);
             }
           },
         })
       },
-      deleteFile(index){
-        this.formData.fileList.splice(index, 1);
+      deleteFile(index) {
+        this.fileList.splice(index, 1);
       },
-      navTo (url) {
-        if(url){
+      navTo(url) {
+        if (url) {
           uni.showLoading({
             title: '加载中',
             mask: true
           });
           uni.navigateTo({
-          	url: url,
+            url: url,
             success() {
               uni.hideLoading()
             }
           })
-        }else Toast('暂未开放')
+        } else Toast('暂未开放')
       },
     }
   }
@@ -129,12 +158,13 @@
     .text {
       line-height: 50rpx;
     }
-    
-    .file{
+
+    .file {
       display: flex;
       justify-content: left;
       flex-wrap: wrap;
-      &_item{
+
+      &_item {
         flex-shrink: 0;
         width: 200rpx;
         height: 200rpx;
@@ -144,11 +174,13 @@
         border-radius: 10rpx;
         overflow: hidden;
         position: relative;
-        .image{
+
+        .image {
           width: 100%;
           height: 100%;
         }
-        .del{
+
+        .del {
           position: absolute;
           height: 40rpx;
           width: 40rpx;
@@ -156,7 +188,8 @@
           right: 10rpx;
         }
       }
-      &_btn{
+
+      &_btn {
         flex-shrink: 0;
         width: 200rpx;
         height: 200rpx;
@@ -168,12 +201,14 @@
         align-items: center;
         flex-direction: column;
         border-radius: 10rpx;
-        image{
+
+        image {
           width: 100rpx;
           height: 100rpx;
         }
       }
-      &_empty{
+
+      &_empty {
         flex-shrink: 0;
         width: 200rpx;
         height: 200rpx;