From 481ef6edd48a404fe4bd2e1043236ab364a84887 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9A=E5=95=A6C=E6=A2=A6?= <15709267061@163.com>
Date: Sat, 21 Jun 2025 15:38:38 +0800
Subject: [PATCH] update

---
 src/api/system/index.js                       |   7 ++++++
 src/components/XImage.vue                     |   3 +++
 src/components/XSquareCarouselImage.vue       |  12 +++++++++--
 src/components/XUpload.vue                    |   2 +-
 src/hooks/useTableQuery.js                    |  10 +++++++++
 .../components/CollectMaterials.vue           |   4 +++-
 .../taskDetails/components/MyBackfill.vue     |  20 ++++++++++++------
 .../taskDetails/components/QuickOperation.vue |  11 ++++++++--
 .../components/ReviewCommunication.vue        |   2 +-
 .../taskDetails/components/TaskDetails.vue    |   3 ++-
 src/pages/taskDetails/index.vue               |  10 ++++-----
 src/static/icons/icon-wrapper.png             | Bin 0 -> 203 bytes
 src/static/icons/水印_预览.png                | Bin 0 -> 12773 bytes
 13 files changed, 64 insertions(+), 20 deletions(-)
 create mode 100644 src/static/icons/icon-wrapper.png
 create mode 100644 src/static/icons/水印_预览.png

diff --git a/src/api/system/index.js b/src/api/system/index.js
index 5f7be92..568b841 100644
--- a/src/api/system/index.js
+++ b/src/api/system/index.js
@@ -383,6 +383,13 @@ const system = {
             data: data
         });
     },
+    confirmTask: async (data) => {
+        return request({
+            method: MethodsENUM.POST,
+            url: "/task/confirmTask",
+            data: data
+        });
+    },
 }
 
 export default system;
diff --git a/src/components/XImage.vue b/src/components/XImage.vue
index d5d0d1e..051bbda 100644
--- a/src/components/XImage.vue
+++ b/src/components/XImage.vue
@@ -1,5 +1,6 @@
 <script setup>
 import {ref} from 'vue';
+import SY_ICON from '../static/icons/水印_预览.png';
 
 const {src, list, imageClass, sy} = defineProps({
     src: {
@@ -57,6 +58,8 @@ defineExpose({
                 <swiper class="!size-full" :current="cur" @change="({detail:{current}})=>cur=current">
                     <swiper-item v-for="src in list">
                         <image class="!size-full" :src="src" mode="aspectFit"></image>
+                        <image v-if="sy" class="!size-full !absolute left-0 top-0" :src="SY_ICON"
+                               mode="aspectFit"></image>
                     </swiper-item>
                 </swiper>
 
diff --git a/src/components/XSquareCarouselImage.vue b/src/components/XSquareCarouselImage.vue
index 935be0f..d44db38 100644
--- a/src/components/XSquareCarouselImage.vue
+++ b/src/components/XSquareCarouselImage.vue
@@ -1,8 +1,10 @@
 <script setup>
+import {ref} from "vue";
 import testIcon from '../static/images/test.png';
 import XImage from "./XImage.vue";
 import ICON from "../static/icons/水印_素材案例.png";
 
+const XImageRef = ref();
 const {list, showSY} = defineProps({
     list: {
         type: Array,
@@ -15,13 +17,19 @@ const {list, showSY} = defineProps({
         default: false,
     }
 });
+
+const openPrew = () => {
+    XImageRef.value.open();
+}
 </script>
 
 <template>
     <view class="relative">
-        <x-image class="!w-[160rpx] !h-[160rpx]" mode="aspectFill" :src="list[0]" :list="list"></x-image>
+        <x-image :sy="showSY" ref="XImageRef" class="!w-[160rpx] !h-[160rpx]" mode="aspectFill" :src="list[0]"
+                 :list="list"></x-image>
 
-        <image v-if="showSY" class="!size-full !absolute left-0 top-0" :src="ICON" mode="aspectFill"></image>
+        <image v-if="showSY" class="!size-full !absolute left-0 top-0" :src="ICON" mode="aspectFill"
+               @click="openPrew"></image>
 
         <view class="!flex absolute left-1/2 -translate-x-1/2 bottom-[20rpx] z-10 gap-[8rpx]">
             <view v-for="(_v, index) in list"
diff --git a/src/components/XUpload.vue b/src/components/XUpload.vue
index 5763c9e..f7addc2 100644
--- a/src/components/XUpload.vue
+++ b/src/components/XUpload.vue
@@ -34,7 +34,7 @@ const upload = async () => {
 
 <template>
     <view class="!flex gap-[12rpx] flex-wrap">
-        <view class="x-upload" @click="upload" v-if="!single || single && files.length < 1">
+        <view class="x-upload" @click="upload" v-if="!single || single && files?.length < 1">
             <image class="!size-[28rpx]" :src="ADDICON"></image>
             <view>上传图片</view>
         </view>
diff --git a/src/hooks/useTableQuery.js b/src/hooks/useTableQuery.js
index ebbfe1f..64c8424 100644
--- a/src/hooks/useTableQuery.js
+++ b/src/hooks/useTableQuery.js
@@ -48,10 +48,20 @@ function useTableQuery({
                 rows: data.list.map(v => ({...v, key: v.id})),
             };
 
+            if (data.list.length === 0) {
+                if (pagination.page > 1) pagination.page--;
+            }
+
             Object.assign(vo, data);
             vo.page = _vo.page;
             vo.total = _vo.total;
             vo.rows = [...vo.rows, ..._vo.rows];
+            vo.rows = Array.from(
+                vo.rows.reduce((map, item) => {
+                    map.set(item.id, item);
+                    return map;
+                }, new Map()).values()
+            )
 
             callback && callback(vo);
         } finally {
diff --git a/src/pages/taskDetails/components/CollectMaterials.vue b/src/pages/taskDetails/components/CollectMaterials.vue
index 7beb8cd..149b73d 100644
--- a/src/pages/taskDetails/components/CollectMaterials.vue
+++ b/src/pages/taskDetails/components/CollectMaterials.vue
@@ -72,7 +72,9 @@ const list = computed(() => data.children.material[current.value].comment?.flatM
                 <view v-for="(v, index) in list">
                     <view>
                         评论{{ index + 1 }}:
-                        <text v-if="v.pid" class="text-[rgba(134,144,156)]">回复{{
+                        <text v-if="v.pid" class="text-[rgba(134,144,156)]">
+                            <image class="!size-[20rpx]" src="/static/icons/msgback.png"></image>
+                            回复{{
                                 list.findIndex(k => k.pid === v.pid)
                             }}
                         </text>
diff --git a/src/pages/taskDetails/components/MyBackfill.vue b/src/pages/taskDetails/components/MyBackfill.vue
index b0f084c..dbba607 100644
--- a/src/pages/taskDetails/components/MyBackfill.vue
+++ b/src/pages/taskDetails/components/MyBackfill.vue
@@ -120,18 +120,24 @@ onMounted(() => {
 
     <template v-if="data.children.back[current]">
         <view class="text-[#165DFF] test-24r py-[32rpx]" v-if="data.children.back[current]?.status === 1">
-            {{ dayjs(data.children.createtime * 1000).format('YYYY-MM-DD HH:mm') }}已提交，审核通过
+            {{ dayjs(data.children.back[current].back_time * 1000).format('YYYY-MM-DD HH:mm') }}已提交，审核通过
         </view>
         <template v-if="data.children.back[current]?.status === 2">
             <view class="text-[#165DFF] test-24r py-[32rpx]" v-if="data.children.back[current]?.operate === 1">
-                <view>{{ dayjs(data.children.createtime * 1000).format('YYYY-MM-DD HH:mm') }}已提交，审核拒绝</view>
+                <view>{{
+                        dayjs(data.children.back[current].back_time * 1000).format('YYYY-MM-DD HH:mm')
+                    }}已提交，审核拒绝
+                </view>
                 <view>请请点击审核沟通，查看修改建议</view>
                 <view>
                     并于{{ dayjs(data.children.back[current].end_time * 1000).format('YYYY-MM-DD HH:mm') }}前点击下方重新提交本次回填
                 </view>
             </view>
             <view class="text-[#165DFF] test-24r py-[32rpx]" v-if="data.children.back[current]?.operate === 2">
-                <view>{{ dayjs(data.children.createtime * 1000).format('YYYY-MM-DD HH:mm') }}已提交，审核拒绝</view>
+                <view>{{
+                        dayjs(data.children.back[current].back_time * 1000).format('YYYY-MM-DD HH:mm')
+                    }}已提交，审核拒绝
+                </view>
                 <view>请请点击审核沟通，查看修改建议</view>
                 <view>
                     并于{{
@@ -142,20 +148,20 @@ onMounted(() => {
         </template>
         <view class="text-[#165DFF] test-24r py-[32rpx]"
               v-if="data.children.back[current]?.status === 0">
-            {{ dayjs(data.children.createtime * 1000).format('YYYY-MM-DD HH:mm') }}已提交，审核中
+            {{ dayjs(data.children.back[current].back_time * 1000).format('YYYY-MM-DD HH:mm') }}已提交，审核中
         </view>
         <view class="text-[#165DFF] test-24r py-[32rpx]"
               v-if="data.children.back[current]?.status === -1">
-            {{ dayjs(data.children.createtime * 1000).format('YYYY-MM-DD HH:mm') }}已提交，审核失败
+            {{ dayjs(data.children.back[current].back_time * 1000).format('YYYY-MM-DD HH:mm') }}已提交，审核失败
         </view>
     </template>
 
     <template
         v-if="!data.children.back[current] || data.children.back[current]?.operate === 0 || data.children.back[current]?.operate === 3">
         <tui-button @click="success"
-                    :disabled="data.children.back[current]?.status === 0 || data.children.back[current]?.status === -1">
+                    :disabled="data.children.back[current]?.status === 0 || data.children.back[current]?.status === -1 || data.children.back[current]?.status === 1">
             {{
-                data.children.back[current]?.status === 0 || data.children.back[current]?.status === -1 ? '已提交' : '提交'
+                data.children.back[current]?.status === 0 || data.children.back[current]?.status === -1 || data.children.back[current]?.status === 1 ? '已提交' : '提交'
             }}
         </tui-button>
     </template>
diff --git a/src/pages/taskDetails/components/QuickOperation.vue b/src/pages/taskDetails/components/QuickOperation.vue
index 40a045c..0018d0e 100644
--- a/src/pages/taskDetails/components/QuickOperation.vue
+++ b/src/pages/taskDetails/components/QuickOperation.vue
@@ -17,7 +17,13 @@ const {operate, data} = defineProps({
 });
 
 const abandonTask = async () => {
-    const {msg} = await Api.system.abandonTask({id: data.id});
+    const {msg} = await Api.system.abandonTask({id: data.children.id});
+    showToast(msg);
+    emits('success');
+}
+
+const confirmTask = async () => {
+    const {msg} = await Api.system.confirmTask({id: data.children.id});
     showToast(msg);
     emits('success');
 }
@@ -91,13 +97,14 @@ const abandonTask = async () => {
                 </view>
             </reply-message-modal>
         </template>
-        <template v-if="operate===4">
+        <template v-if="operate===5">
             <view
                 class="w-full py-[8rpx] bg-[#F2F3F5] px-[30rpx] test-22r text-[#86909C] !flex items-center gap-[10rpx] rounded-[4rpx]">
                 <image :src="YY_ICON" class="!size-[26rpx]"></image>
                 提示：点击下方按钮，快速回复
             </view>
             <view
+                @click="confirmTask"
                 class="py-[15rpx] !flex justify-center flex-col items-center test-28r text-[#165DFF] bg-[#E8F3FF] px-[26rpx]">
                 我同意
                 <view class="w-full h-[2rpx] bg-[#E5E6EB] !my-[8rpx]"></view>
diff --git a/src/pages/taskDetails/components/ReviewCommunication.vue b/src/pages/taskDetails/components/ReviewCommunication.vue
index 890c369..700ede1 100644
--- a/src/pages/taskDetails/components/ReviewCommunication.vue
+++ b/src/pages/taskDetails/components/ReviewCommunication.vue
@@ -106,7 +106,7 @@ const {loading, pagination, initFetchData, fetchData} = useTableQuery({
                     发起申述
                 </x-button>
             </reply-message-modal>
-            <reply-message-modal :data="data"></reply-message-modal>
+            <reply-message-modal :data="data" @success="fetchData"></reply-message-modal>
         </view>
     </view>
 </template>
diff --git a/src/pages/taskDetails/components/TaskDetails.vue b/src/pages/taskDetails/components/TaskDetails.vue
index 117fb10..3ea6051 100644
--- a/src/pages/taskDetails/components/TaskDetails.vue
+++ b/src/pages/taskDetails/components/TaskDetails.vue
@@ -3,6 +3,7 @@ import fmt from "../../../static/images/fmt.png";
 import linkIcon from '../../../static/icons/link.png';
 import XImage from "../../../components/XImage.vue";
 import XSquareCarouselImage from "../../../components/XSquareCarouselImage.vue";
+import HF_ICON from "../../../static/icons/icon-wrapper.png";
 
 const {data, home} = defineProps({
     data: {
@@ -60,7 +61,7 @@ const {data, home} = defineProps({
                 </view>
                 <view v-for="(v, index) in data.comment_arr.children">
                     评论{{ index + 2 }}:
-                    <text v-if="data.comment_arr.pid!==0" class="text-[#86909C]">
+                    <text class="text-[#86909C]">
                         <image class="!size-[20rpx]" src="/static/icons/msgback.png"></image>
                         回复1:
                     </text>
diff --git a/src/pages/taskDetails/index.vue b/src/pages/taskDetails/index.vue
index b9dfec3..d510b3d 100644
--- a/src/pages/taskDetails/index.vue
+++ b/src/pages/taskDetails/index.vue
@@ -41,17 +41,17 @@ const tabs = computed(() => [
     {
         name: "我的回填",
         component: MyBackfill,
-        isDot: details.value.children.is_back > 0,
+        isDot: details.value?.children.is_back > 0,
     },
     {
         name: "审核沟通",
         component: ReviewCommunication,
-        isDot: details.value.children.is_read > 0,
+        isDot: details.value?.children.is_read > 0,
     },
 ]);
 
 const getData = async (id, task_children_id) => {
-    const {data} = await Api.system.getTaskinfo(id || details.value.id, task_children_id);
+    const {data} = await Api.system.getTaskinfo(id || details.value.id, task_children_id || details.value?.children?.id);
     details.value = data;
 }
 
@@ -110,9 +110,9 @@ onMounted(() => {
                 style="font-size: 24rpx">
                 <view>发布账号</view>
                 <view class="bg-[#E5E6EB] w-[5rpx] h-auto"></view>
-                <view>昵称: {{ details.children.account.nickname }}</view>
+                <view>昵称: {{ details.children?.account?.nickname }}</view>
                 <view class="bg-[#E5E6EB] w-[5rpx] h-auto"></view>
-                <view>账号: {{ details.children.account.account }}</view>
+                <view>账号: {{ details.children?.account?.account }}</view>
             </view>
 
             <view class="!grid grid-cols-4 gap-[20rpx]">
diff --git a/src/static/icons/icon-wrapper.png b/src/static/icons/icon-wrapper.png
new file mode 100644
index 0000000000000000000000000000000000000000..0b9e3c935cbbaf41210419b85e4551a81a4bb317
GIT binary patch
literal 203
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w#^NA%C&rs6b?Si}{s5m4S0Eh_
zk>MAa=@*sd8=1)}Q055~Vl4^s3ubWm->|=ZSByDOAkx#tF{ENna)JUchtfvLsVoyJ
z+`2qu(pF5_I9Z58!|BKr0U7mF#vMj!qAJWY6plH3;kHzW<a+9mYwYmIKvSW3O5mNw
uHRn8z-n?-`;91p#%MY?7TLq1dFfb@sa(vpd{qatqB@CXfelF{r5}E*Gr#>10

literal 0
HcmV?d00001

diff --git a/src/static/icons/水印_预览.png b/src/static/icons/水印_预览.png
new file mode 100644
index 0000000000000000000000000000000000000000..55927cb622db35abc7c52f648f02ec73eb776135
GIT binary patch
literal 12773
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
E0K^~TfB*mh

literal 0
HcmV?d00001