From e10695098c7eb73d46513f729d620ba72612c8a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9A=E5=95=A6C=E6=A2=A6?= <15709267061@163.com>
Date: Thu, 12 Jun 2025 20:53:39 +0800
Subject: [PATCH] update

---
 CHANGELOG.md                                  |   7 +
 src/api/admin.js                              |   7 +
 src/api/merchant.js                           |  28 +++
 src/components/Comment/index.vue              |   6 +-
 src/components/Pay/Alipay.vue                 |   5 +-
 src/components/Pay/GoPay.vue                  |  53 ++++++
 src/components/Pay/PayTask.vue                |   8 +-
 .../components/TaskPassedReviewModal.vue      |  17 +-
 .../manage-reward-mission/subtask-review.vue  |  21 ++-
 .../manage-reward-mission/task-review.vue     |  36 +++-
 src/pages/merchant/components/AddComment.vue  |   5 +-
 .../components/PreviewTaskMaterialModal.vue   |   8 +-
 .../task-center/components/TaskTemplate.vue   | 159 ++++++++++++++++++
 .../task-center/components/new-task-1.vue     |   4 +-
 .../task-center/components/new-task-6.vue     |   6 +-
 .../task-center/components/new-task-7.vue     |   4 +-
 .../pages/task-center/look-min-task.vue       |   2 +-
 .../merchant/pages/task-center/new-task.vue   |  51 +++++-
 .../pages/task-center/reward-mission.vue      |  70 ++++++--
 src/pinia/SystemStore/index.js                |   2 +-
 src/utils/index.js                            |  19 ++-
 21 files changed, 467 insertions(+), 51 deletions(-)
 create mode 100644 src/components/Pay/GoPay.vue
 create mode 100644 src/pages/merchant/pages/task-center/components/TaskTemplate.vue

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d94979b..7cc4678 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+### 2025-06-12
+
+    测试文档过到第145条
+    进度:
+    测试流程(商家&超管端): 创建任务 -> 任务审核(状态流转) -> 子任务素材上传 -> 子任务审核(状态流转) -> 代付款 -> 支付(充值) -> 开始任务
+    大人端 领取任务 -> 查看素材
+
 ### 2025-06-10
 
     测试文档过到第96条
diff --git a/src/api/admin.js b/src/api/admin.js
index 03c9140..610a294 100644
--- a/src/api/admin.js
+++ b/src/api/admin.js
@@ -82,6 +82,13 @@ const admin = {
             data: {id},
         });
     },
+    editTask: async (data) => {
+        return request({
+            url: '/admin/task/editTask',
+            method: Method.POST,
+            data: data,
+        });
+    },
     getStatusList: async () => {
         return request({
             url: '/admin/taskChildren/getStatusList',
diff --git a/src/api/merchant.js b/src/api/merchant.js
index eb2db0f..7015a05 100644
--- a/src/api/merchant.js
+++ b/src/api/merchant.js
@@ -498,6 +498,34 @@ const merchant = {
             data: data
         });
     },
+    TemplateToTask: async (data) => {
+        return request({
+            url: '/index/task/TemplateToTask',
+            method: Method.POST,
+            data: data
+        });
+    },
+    delTemplate: async (data) => {
+        return request({
+            url: '/index/task/delTemplate',
+            method: Method.POST,
+            data: data
+        });
+    },
+    weighTemplate: async (data) => {
+        return request({
+            url: '/index/task/weighTemplate',
+            method: Method.POST,
+            data: data
+        });
+    },
+    saveNewTask: async (data) => {
+        return request({
+            url: '/index/task/saveNewTask',
+            method: Method.POST,
+            data: data
+        });
+    },
 }
 
 export default merchant;
diff --git a/src/components/Comment/index.vue b/src/components/Comment/index.vue
index c92cfb4..50469a2 100644
--- a/src/components/Comment/index.vue
+++ b/src/components/Comment/index.vue
@@ -1,4 +1,5 @@
 <script setup>
+import {computed} from "vue";
 import Api from "../../api/index.js";
 import {Message} from "@arco-design/web-vue";
 
@@ -13,6 +14,7 @@ const {data, hideDelete} = defineProps({
         default: false,
     }
 });
+const list = computed(() => data?.flatMap(v => v.children ? [v, ...v.children] : [v]));
 const del = async (id) => {
     const {msg} = await Api.merchant.delChildrenComment(id);
     Message.success(msg);
@@ -21,12 +23,12 @@ const del = async (id) => {
 </script>
 
 <template>
-    <div v-for="(item, index) in data" :key="item.id" class="flex items-center">
+    <div v-for="(item, index) in list" :key="item.id" class="flex items-center">
         <div class="mr-[5px] min-w-[15px]">{{ index + 1 }}.</div>
         <div class="box">
             <div class="flex items-center whitespace-nowrap" v-if="item.pid>0">
                 <img class="size-[9px] mr-[5px]" src="../../assets/images/back.png" alt=""/>
-                回复{{ data.findIndex(k => k.pid === item.pid) }}:
+                回复{{ list.findIndex(k => k.pid === item.pid) }}:
             </div>
             <img class="size-[32px]" v-if="item.image" :src="item.image" alt=""/>
             <div class="whitespace-nowrap">{{ item.intro }}</div>
diff --git a/src/components/Pay/Alipay.vue b/src/components/Pay/Alipay.vue
index 160f27f..e680852 100644
--- a/src/components/Pay/Alipay.vue
+++ b/src/components/Pay/Alipay.vue
@@ -30,7 +30,10 @@ const initQR = async () => {
 </script>
 
 <template>
-    <a-button type="primary" @click="open">立即充值</a-button>
+    <a-button v-if="!$slots.default" type="primary" @click="open">立即充值</a-button>
+    <div @click="open">
+        <slot></slot>
+    </div>
 
     <a-modal
         :footer="false"
diff --git a/src/components/Pay/GoPay.vue b/src/components/Pay/GoPay.vue
new file mode 100644
index 0000000..26d5b1d
--- /dev/null
+++ b/src/components/Pay/GoPay.vue
@@ -0,0 +1,53 @@
+<script setup lang="ts">
+import {ref} from "vue";
+import Alipay from "./Alipay.vue";
+
+const visible = ref(false);
+const money = ref(null);
+</script>
+
+<template>
+    <div @click="visible=true">
+        <slot></slot>
+    </div>
+
+    <a-modal
+        title="充值"
+        :width="600"
+        title-align="start"
+        id="GoTask-Modal"
+        v-model:visible="visible">
+        <a-alert>平台提示：该款项不会直接打给达人，只有您对子任务确认结算后，才会打款给达人</a-alert>
+        <div class="p-[24px] h-[370px]">
+            <a-form layout="vertical">
+                <a-form-item label="支付方式">
+                    <a-radio :default-checked="true">支付宝</a-radio>
+                </a-form-item>
+                <a-form-item label="充值金额">
+                    <a-input-number :min="0" :precision="2" v-model:model-value="money"
+                                    placeholder="请输入充值金额"></a-input-number>
+                </a-form-item>
+            </a-form>
+        </div>
+        <template v-slot:footer>
+            <div class="flex gap-[24px] justify-end">
+                <a-button @click="visible=false">取消</a-button>
+                <Alipay :money="money">
+                    <a-button type="primary" @click="visible=false">下一步</a-button>
+                </Alipay>
+            </div>
+        </template>
+    </a-modal>
+</template>
+
+<style lang="scss">
+#GoTask-Modal {
+    .arco-modal-body {
+        padding: 0;
+    }
+}
+</style>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/src/components/Pay/PayTask.vue b/src/components/Pay/PayTask.vue
index be5886e..b31c859 100644
--- a/src/components/Pay/PayTask.vue
+++ b/src/components/Pay/PayTask.vue
@@ -1,5 +1,6 @@
 <script setup>
 import {ref} from "vue";
+import GoPay from "./GoPay.vue";
 
 const payInfo = ref(null);
 const visible = ref(false);
@@ -68,10 +69,13 @@ defineExpose({
                     (可用￥{{ payInfo?.user_money?.toFixed(2) }})
                 </a-radio>
             </div>
-            <div class="text-[12px] text-[#86909C] pl-[20px]">
+            <div v-if="payInfo.user_money < payInfo?.total_money" class="text-[12px] text-[#86909C] pl-[20px]">
                 *余额不足本次任务所需，请充值后再进行支付
             </div>
-            <a-button class="mt-[20px]" type="primary">去充值</a-button>
+            <go-pay>
+                <a-button class="mt-[20px]" type="primary">去充值
+                </a-button>
+            </go-pay>
         </div>
     </a-modal>
 </template>
diff --git a/src/pages/manage/pages/manage-reward-mission/components/TaskPassedReviewModal.vue b/src/pages/manage/pages/manage-reward-mission/components/TaskPassedReviewModal.vue
index 5001089..eb898d1 100644
--- a/src/pages/manage/pages/manage-reward-mission/components/TaskPassedReviewModal.vue
+++ b/src/pages/manage/pages/manage-reward-mission/components/TaskPassedReviewModal.vue
@@ -3,10 +3,14 @@ import {reactive, ref, watch} from "vue";
 import Api from "../../../../../api/index.js";
 import {Message} from "@arco-design/web-vue";
 
-const {id} = defineProps({
+const {id, disabled} = defineProps({
     id: {
         type: Number,
         default: 0
+    },
+    disabled: {
+        type: Boolean,
+        default: 0
     }
 });
 const emits = defineEmits(['success']);
@@ -43,7 +47,7 @@ const success = async () => {
 </script>
 
 <template>
-    <a-link :hoverable="false" status="success" @click="visible=true">通过</a-link>
+    <a-link :disabled="disabled" :hoverable="false" status="success" @click="visible=true">通过</a-link>
 
     <a-modal
         @ok="success"
@@ -52,13 +56,16 @@ const success = async () => {
         v-model:visible="visible">
         <a-form :model="form" layout="vertical">
             <a-form-item label="该任务对达人端的展示价格为：">
-                <a-input v-model:model-value="form.real_price" placeholder="请输入价格"></a-input>
+                <a-input-number :min="0" v-model:model-value="form.real_price" placeholder="请输入价格"
+                                :precision="2"></a-input-number>
             </a-form-item>
             <a-form-item label="安全评分">
-                <a-input v-model:model-value="form.security_level" placeholder="请输入安全评分，满分100"></a-input>
+                <a-input-number :min="0" :max="100" :precision="0" v-model:model-value="form.security_level"
+                                placeholder="请输入安全评分，满分100"></a-input-number>
             </a-form-item>
             <a-form-item label="耗时评分">
-                <a-input v-model:model-value="form.time_level" placeholder="请输入耗时评分，满分100"></a-input>
+                <a-input-number :min="0" :max="100" :precision="0" v-model:model-value="form.time_level"
+                                placeholder="请输入耗时评分，满分100"></a-input-number>
             </a-form-item>
         </a-form>
     </a-modal>
diff --git a/src/pages/manage/pages/manage-reward-mission/subtask-review.vue b/src/pages/manage/pages/manage-reward-mission/subtask-review.vue
index d95d9c8..57b29c2 100644
--- a/src/pages/manage/pages/manage-reward-mission/subtask-review.vue
+++ b/src/pages/manage/pages/manage-reward-mission/subtask-review.vue
@@ -20,10 +20,12 @@ const columns = [
     {
         title: '子任务状态',
         dataIndex: 'status_text',
+        slotName: 'status_text',
     },
     {
         title: '平台审核状态',
         dataIndex: 'check_status_text',
+        slotName: 'check_status_text'
     },
     {
         title: '操作',
@@ -116,16 +118,31 @@ const refuseTaskChildren = async (id) => {
             :loading="loading"
             :columns="columns"
             class="flex-grow">
+            <template v-slot:status_text="{record}">
+                <a-tag v-if="record.status===0" color="cyan">{{ record.status_text }}</a-tag>
+                <a-tag v-if="record.status===1" color="orangered">{{ record.status_text }}</a-tag>
+                <a-tag v-if="record.status===2" color="red">{{ record.status_text }}</a-tag>
+                <a-tag v-if="record.status===3" color="arcoblue">{{ record.status_text }}</a-tag>
+                <a-tag v-if="record.status===4" color="green">{{ record.status_text }}</a-tag>
+                <a-tag v-if="record.status===5" color="green">{{ record.status_text }}</a-tag>
+                <a-tag v-if="record.status===6">{{ record.status_text }}</a-tag>
+            </template>
+            <template v-slot:check_status_text="{record}">
+                <a-tag v-if="record.check_status===0" color="cyan">{{ record.check_status_text }}</a-tag>
+                <a-tag v-if="record.check_status===1" color="green">{{ record.check_status_text }}</a-tag>
+                <a-tag v-if="record.check_status===-2">{{ record.check_status_text }}</a-tag>
+                <a-tag v-if="record.check_status===-1" color="red">{{ record.check_status_text }}</a-tag>
+            </template>
             <template v-slot:action="{record}">
                 <div class="flex items-center gap-[20px] justify-between">
                     <PreviewTaskModal :id="record.id" @success="fetchData"></PreviewTaskModal>
                     <a-popconfirm content="确定通过?" @ok="passTaskChildren(record.id)">
-                        <a-link :disabled="record.check_status === 1 || record.check_status === -2" :hoverable="false"
+                        <a-link :disabled="record.check_status !== 0 && record.check_status !== -1" :hoverable="false"
                                 status="success">通过
                         </a-link>
                     </a-popconfirm>
                     <RejectTaskModal
-                        :disabled="record.check_status === 1 || record.check_status === -2"
+                        :disabled="record.check_status !== 0 && record.check_status !== -1"
                         :api="Api.admin.refuseTaskChildren"
                         :id="record.id"
                         @success="fetchData">
diff --git a/src/pages/manage/pages/manage-reward-mission/task-review.vue b/src/pages/manage/pages/manage-reward-mission/task-review.vue
index fa90371..b5de36b 100644
--- a/src/pages/manage/pages/manage-reward-mission/task-review.vue
+++ b/src/pages/manage/pages/manage-reward-mission/task-review.vue
@@ -6,6 +6,7 @@ import Api from "../../../../api/index.js";
 import TaskPassedReviewModal from "./components/TaskPassedReviewModal.vue";
 import RejectTaskModal from "./components/RejectTaskModal.vue";
 import TerminateTask from "../../../../components/TerminateTask/TerminateTask.js";
+import {toPath} from "../../../../utils/index.js";
 
 const columns = [
     {
@@ -43,15 +44,18 @@ const columns = [
     {
         title: '平台审核状态',
         dataIndex: 'check_status_text',
+        slotName: 'check_status_text',
     },
     {
         title: '商家任务状态',
         dataIndex: 'status_text',
+        slotName: 'status_text',
     },
     {
         title: '操作',
         dataIndex: 'action',
         slotName: 'action',
+        fixed: 'right',
         width: 250,
     },
 ];
@@ -144,12 +148,36 @@ const {loading, pagination, initFetchData, fetchData} = useTableQuery({
             :loading="loading"
             :columns="columns"
             class="flex-grow">
+            <template v-slot:check_status_text="{record}">
+                <a-tag v-if="record.check_status===-2">{{ record.check_status_text }}</a-tag>
+                <a-tag v-if="record.check_status===0" color="cyan">{{ record.check_status_text }}</a-tag>
+                <a-tag v-if="record.check_status===1" color="green">{{ record.check_status_text }}</a-tag>
+                <a-tag v-if="record.check_status===-1" color="red">{{ record.check_status_text }}</a-tag>
+            </template>
+            <template v-slot:status_text="{record}">
+                <a-tag v-if="record.status===0 || record.status===2 || record.status===3" color="cyan">
+                    {{ record.status_text }}
+                </a-tag>
+                <a-tag v-if="record.status===1 || record.status === -2" color="orangered">{{
+                        record.status_text
+                    }}
+                </a-tag>
+                <a-tag v-if="record.status===-1" color="orange">{{ record.status_text }}</a-tag>
+                <a-tag v-if="record.status===4" color="arcoblue">{{ record.status_text }}</a-tag>
+                <a-tag v-if="record.status===-3" color="red">{{ record.status_text }}</a-tag>
+                <a-tag v-if="record.status===5" color="green">{{ record.status_text }}</a-tag>
+            </template>
             <template v-slot:action="{record}">
                 <div class="flex items-center gap-[20px]">
-                    <a-link :hoverable="false">编辑</a-link>
-                    <TaskPassedReviewModal :id="record.id" @success="fetchData"></TaskPassedReviewModal>
-                    <RejectTaskModal :id="record.id" @success="fetchData"></RejectTaskModal>
-                    <a-link :hoverable="false" status="danger" class="ml-auto"
+                    <a-link :hoverable="false" @click="toPath('/home/manage-reward-mission/new-task', {id: record.id})">
+                        编辑
+                    </a-link>
+                    <TaskPassedReviewModal :disabled="record.check_status===-2 || record.check_status===1"
+                                           :id="record.id" @success="fetchData"></TaskPassedReviewModal>
+                    <RejectTaskModal :disabled="record.check_status===-2 || record.check_status===1" :id="record.id"
+                                     @success="fetchData"></RejectTaskModal>
+                    <a-link :disabled="record.status_text!==4 && record.status_text!==-2" :hoverable="false"
+                            status="danger" class="ml-auto"
                             @click="TerminateTask({taskId: record.id})">终止
                     </a-link>
                 </div>
diff --git a/src/pages/merchant/components/AddComment.vue b/src/pages/merchant/components/AddComment.vue
index 00f995e..a9b6dee 100644
--- a/src/pages/merchant/components/AddComment.vue
+++ b/src/pages/merchant/components/AddComment.vue
@@ -33,6 +33,7 @@ const success = async () => {
         is_reply: form.is_reply,
     });
     Message.success(msg);
+    Object.keys(form).forEach(key => form[key] = null);
     visible.value = false;
     emits('success');
 }
@@ -58,8 +59,9 @@ const success = async () => {
                     <a-radio :value="1">是</a-radio>
                 </a-radio-group>
             </a-form-item>
-            <a-form-item label="需要回复的评论" v-if="form.is_reply===1">
+            <a-form-item label="需要回复的评论">
                 <x-select
+                    :disabled="form.is_reply===0"
                     v-model:model-value="form.pid"
                     :apiPo="item.id"
                     :api="Api.merchant.getChildrenComment">
@@ -67,6 +69,7 @@ const success = async () => {
             </a-form-item>
             <a-form-item label="添加图片">
                 <UploadAvatar
+                    :multiple="false"
                     v-model:files="form.files"
                     :api="Api.system.uploadFile2">
                 </UploadAvatar>
diff --git a/src/pages/merchant/pages/task-center/components/PreviewTaskMaterialModal.vue b/src/pages/merchant/pages/task-center/components/PreviewTaskMaterialModal.vue
index ff425bb..4def59c 100644
--- a/src/pages/merchant/pages/task-center/components/PreviewTaskMaterialModal.vue
+++ b/src/pages/merchant/pages/task-center/components/PreviewTaskMaterialModal.vue
@@ -22,7 +22,10 @@ const activeKey = ref(0);
 const getData = async () => {
     Api.merchant.getTaskChildrenInfo(task.id).then(({data}) => {
         detail.length = 0;
-        detail.push(...data);
+        detail.push(...data.map(v => ({
+            ...v,
+            tags: v.tags_arr
+        })));
         console.log('我看看我看看', data);
     });
 }
@@ -52,9 +55,10 @@ const refuseTaskChildren = async () => {
 const update = async () => {
     const {msg} = await Api.merchant.editChildrenMaterimal({
         id: task.task_id,
-        data: detail.map(v => ({...v, tags: v.tags_arr.split(",")})),
+        data: detail,
     });
     Message.success(msg);
+    visible.value = false;
     emits('success');
 }
 </script>
diff --git a/src/pages/merchant/pages/task-center/components/TaskTemplate.vue b/src/pages/merchant/pages/task-center/components/TaskTemplate.vue
new file mode 100644
index 0000000..7c7c998
--- /dev/null
+++ b/src/pages/merchant/pages/task-center/components/TaskTemplate.vue
@@ -0,0 +1,159 @@
+<script setup>
+import {reactive, ref, watch} from "vue";
+import Api from "../../../../../api/index.js";
+import {Message} from "@arco-design/web-vue";
+import {findSwappedIds} from "../../../../../utils/index.js";
+
+const visible = ref(false);
+const emits = defineEmits(['success']);
+const loading = ref(false);
+const columns = [
+    {
+        title: '模板备注',
+        key: 'remark',
+        dataIndex: 'remark',
+    },
+    {
+        title: '任务名称',
+        key: 'goods_name',
+        dataIndex: 'goods_name',
+    },
+    {
+        title: '任务渠道',
+        key: 'platform_name',
+        dataIndex: 'platform_name',
+    },
+    {
+        title: '包含子任务',
+        key: 'children_num',
+        dataIndex: 'children_num',
+    },
+    {
+        title: '子任务单价',
+        key: 'children_price',
+        dataIndex: 'children_price',
+    },
+    {
+        title: '发布次数',
+        key: 'fb_num',
+        dataIndex: 'fb_num',
+    },
+    {
+        title: '是否评论',
+        key: 'is_comment',
+        dataIndex: 'is_comment',
+        slotName: 'is_comment',
+    },
+    {
+        title: '回填内容',
+        key: 'content',
+        dataIndex: 'content',
+        slotName: 'content',
+    },
+    {
+        title: '保留时间',
+        key: 'retention_time',
+        dataIndex: 'retention_time',
+        slotName: 'retention_time',
+    },
+    {
+        title: '操作',
+        key: 'action',
+        dataIndex: 'action',
+        slotName: 'action',
+    },
+];
+const po = reactive({});
+const vo = reactive([]);
+
+const gatData = async () => {
+    loading.value = true;
+    const {data} = await Api.merchant.getModeList();
+    vo.length = 0;
+    vo.push(...data);
+    loading.value = false;
+}
+
+watch(
+    () => visible.value,
+    (val) => {
+        if (val) gatData();
+    },
+    {deep: true}
+)
+
+const success = async (id) => {
+    const {msg} = await Api.merchant.TemplateToTask({
+        id: id
+    });
+    Message.success(msg);
+    emits('success');
+    visible.value = false;
+}
+
+const delTaskTemplate = async (id) => {
+    const {msg} = await Api.merchant.delTemplate({
+        id: id
+    });
+    Message.success(msg);
+    await gatData();
+}
+
+const handleChange = async (data) => {
+    const [id, other_id] = findSwappedIds(vo, data);
+    await Api.merchant.weighTemplate({
+        id: id,
+        other_id: other_id
+    });
+    await gatData();
+}
+</script>
+
+<template>
+    <div @click="visible=true">
+        <slot></slot>
+    </div>
+
+    <a-modal
+        :width="1200"
+        title-align="start"
+        v-model:visible="visible">
+        <template v-slot:title>
+            <div class="flex gap-[20px]">
+                从模板快速创建
+                <div class="text-[14px] text-[#4E5969]">模板已创建 {{ vo.length }} / 20</div>
+            </div>
+        </template>
+        <div class="text-[14px] text-[#4E5969] mb-2">选择模板</div>
+        <a-table
+            :loading="loading"
+            @change="handleChange"
+            :draggable="{type: 'handle',fixed: true}"
+            class="min-h-[500px]"
+            :data="vo"
+            :pagination="false"
+            :columns="columns">
+            <template v-slot:is_comment="{record}">
+                {{ record.is_comment === 1 ? '是' : '否' }}
+            </template>
+            <template v-slot:content="{record}">
+                <div v-for="v in record.content">{{ v }}</div>
+            </template>
+            <template v-slot:retention_time="{record}">
+                {{ record.retention_time }}{{ record.retention_type === 2 ? 'h' : 'm' }}
+            </template>
+            <template v-slot:action="{record}">
+                <div>
+                    <a-link @click="success(record.id)">使用</a-link>
+                    <a-popconfirm @ok="delTaskTemplate(record.id)" content="确定删除吗?">
+                        <a-link status="danger">删除</a-link>
+                    </a-popconfirm>
+                </div>
+            </template>
+        </a-table>
+    </a-modal>
+</template>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/src/pages/merchant/pages/task-center/components/new-task-1.vue b/src/pages/merchant/pages/task-center/components/new-task-1.vue
index db38898..002818e 100644
--- a/src/pages/merchant/pages/task-center/components/new-task-1.vue
+++ b/src/pages/merchant/pages/task-center/components/new-task-1.vue
@@ -4,7 +4,9 @@ import Api from "../../../../../api/index.js";
 import XSelect from "../../../../../components/XSelect/index.vue";
 import FormTitle from "../../../../../components/FormTitle/index.vue";
 import {Message} from "@arco-design/web-vue";
+import {useSystemStore} from "../../../../../pinia/SystemStore/index.js";
 
+const SystemStore = useSystemStore();
 const emits = defineEmits(['success']);
 const form = defineModel('form');
 const formRef = useTemplateRef('formRef');
@@ -64,7 +66,7 @@ const success = async () => {
                     :init="true"
                     @change="form.material_id=null"
                     v-model:model-value="form.platform_id"
-                    :api="Api.merchant.getPlatformList">
+                    :api="SystemStore.isRoot ? Api.admin.getPlatform : Api.merchant.getPlatformList">
                 </XSelect>
             </a-form-item>
             <a-form-item label="素材类型" v-if="form.platform_id" field="material_id">
diff --git a/src/pages/merchant/pages/task-center/components/new-task-6.vue b/src/pages/merchant/pages/task-center/components/new-task-6.vue
index a088911..f4b7610 100644
--- a/src/pages/merchant/pages/task-center/components/new-task-6.vue
+++ b/src/pages/merchant/pages/task-center/components/new-task-6.vue
@@ -5,6 +5,7 @@ import {onMounted, reactive, useTemplateRef} from "vue";
 import {v4} from "uuid";
 import Api from "../../../../../api/index.js";
 import {Message} from "@arco-design/web-vue";
+import router from "../../../../../router/index.js";
 
 const settltment_after_list = reactive([]);
 const emits = defineEmits(['success', 'prev']);
@@ -118,7 +119,7 @@ onMounted(() => {
 
             <a-form-item label="结算后" extra="*如有其他要求，可联系管理员添加">
                 <div class="max-w-[618px]">
-                    <a-checkbox-group>
+                    <a-checkbox-group v-model:model-value="form.settlement_after">
                         <a-checkbox v-for="v in settltment_after_list" :value="v.id">
                             {{ v.name }}
                             <a-popover position="rt">
@@ -142,7 +143,8 @@ onMounted(() => {
 
             <a-form-item class="mt-[30px]">
                 <a-button class="mr-[24px]" @click="emits('prev')">上一步</a-button>
-                <a-button type="primary" @click="success">下一步</a-button>
+                <a-button v-if="form.status===0 || form.status===-1" type="primary" @click="success">下一步</a-button>
+                <a-button v-else type="primary" @click="router.back()">返回</a-button>
             </a-form-item>
         </a-form>
     </FormTitle>
diff --git a/src/pages/merchant/pages/task-center/components/new-task-7.vue b/src/pages/merchant/pages/task-center/components/new-task-7.vue
index 0b9bdfb..d514956 100644
--- a/src/pages/merchant/pages/task-center/components/new-task-7.vue
+++ b/src/pages/merchant/pages/task-center/components/new-task-7.vue
@@ -1,8 +1,10 @@
 <script setup>
 import FormTitle from "../../../../../components/FormTitle/index.vue";
 import {toPath} from "../../../../../utils/index.js";
+import {useSystemStore} from "../../../../../pinia/SystemStore/index.js";
 
 const emits = defineEmits(['success', 'init']);
+const SystemStore = useSystemStore();
 
 const success = () => {
     emits('success');
@@ -17,7 +19,7 @@ const success = () => {
             <template #extra>
                 <a-space>
                     <a-button type="secondary" @click="toPath('/home/task-center/reward-mission')">查看任务</a-button>
-                    <a-button type="primary" @click="emits('init')">再次创建</a-button>
+                    <a-button type="primary" @click="emits('init')" v-if="!SystemStore.isRoot">再次创建</a-button>
                 </a-space>
             </template>
         </a-result>
diff --git a/src/pages/merchant/pages/task-center/look-min-task.vue b/src/pages/merchant/pages/task-center/look-min-task.vue
index 4a67829..e2451f6 100644
--- a/src/pages/merchant/pages/task-center/look-min-task.vue
+++ b/src/pages/merchant/pages/task-center/look-min-task.vue
@@ -204,7 +204,7 @@ const passTask = async (id, task_backfill_id) => {
 
                 <template v-slot:action2="{record}">
                     <div class="flex gap-[16px] justify-center items-center">
-                        <PreviewTaskMaterialModal title="查看素材" :task="record">
+                        <PreviewTaskMaterialModal title="查看素材" :task="record" @success="fetchData">
                             <a-link :hoverable="false">查看素材</a-link>
                         </PreviewTaskMaterialModal>
                         <a-dropdown>
diff --git a/src/pages/merchant/pages/task-center/new-task.vue b/src/pages/merchant/pages/task-center/new-task.vue
index cf47175..9b24488 100644
--- a/src/pages/merchant/pages/task-center/new-task.vue
+++ b/src/pages/merchant/pages/task-center/new-task.vue
@@ -7,12 +7,15 @@ import NewTask4 from "./components/new-task-4.vue";
 import NewTask5 from "./components/new-task-5.vue";
 import NewTask6 from "./components/new-task-6.vue";
 import NewTask7 from "./components/new-task-7.vue";
-import {useRoute} from "vue-router";
+import {onBeforeRouteLeave, useRoute} from "vue-router";
 import Api from "../../../../api/index.js";
 import {deleteObjectFields} from "../../../../utils/index.js";
-import {Message} from "@arco-design/web-vue";
+import {Message, Modal} from "@arco-design/web-vue";
+import {useSystemStore} from "../../../../pinia/SystemStore/index.js";
+import dayjs from "dayjs";
 
 const routes = useRoute();
+const SystemStore = useSystemStore();
 const step = ref(1);
 const form = reactive({
     id: null,
@@ -50,6 +53,7 @@ const form = reactive({
     back_type: 1,
 
     settltment_before: [],
+    settlement_after: [],
 });
 
 const init = () => {
@@ -60,10 +64,12 @@ const init = () => {
 const success = async (po) => {
     if (step.value === 6) {
         if (form.id) {
-            const {msg} = await Api.merchant.editTask(form);
+            const api = SystemStore.isRoot ? Api.admin.editTask : Api.merchant.editTask;
+            const {msg} = await api(form);
             Message.success(msg);
         } else {
-            const {data} = await Api.merchant.createTask(form);
+            const {msg} = await Api.merchant.createTask(form);
+            Message.success(msg);
         }
     }
 
@@ -74,13 +80,46 @@ const success = async (po) => {
 
 onMounted(() => {
     const {id} = routes.query;
-    if (id) Api.merchant.getTaskInfo(id).then(({data}) => {
+    const api = SystemStore.isRoot ? Api.admin.getTaskDetail : Api.merchant.getTaskInfo
+    if (id) api(id).then(({data}) => {
         Object.assign(form, data);
         form.choose_area = data.choose_area_arr.map(v => Number(v));
-        form.backfill = data.back;
+        form.backfill = data.back.map(v => ({
+            ...v,
+            start_time: dayjs(v.start_time * 1000).format('YYYY-MM-DD HH:mm:ss'),
+            end_time: dayjs(v.end_time * 1000).format('YYYY-MM-DD HH:mm:ss'),
+        }));
         form.settltment_before = data.before.map(v => ({...v, ratio: Number(v.ratio)}));
+        form.settlement_after = data.settlement_after.map(v => Number(v));
     });
 })
+
+onBeforeRouteLeave((to, from, next) => {
+    if (SystemStore.isRoot) {
+        next(true);
+        return;
+    }
+    if (step.value === 7) {
+        next(true);
+        return;
+    }
+    if (form.status === 0) {
+        Modal.warning({
+            title: '是否保存当前内容',
+            hideCancel: false,
+            onOk: async () => {
+                const {msg} = await Api.merchant.saveNewTask(form);
+                Message.success(msg);
+                next(true);
+            },
+            onCancel() {
+                next(true);
+            }
+        });
+        return;
+    }
+    next(true);
+})
 </script>
 
 <template>
diff --git a/src/pages/merchant/pages/task-center/reward-mission.vue b/src/pages/merchant/pages/task-center/reward-mission.vue
index 1d53cbe..5cde0f6 100644
--- a/src/pages/merchant/pages/task-center/reward-mission.vue
+++ b/src/pages/merchant/pages/task-center/reward-mission.vue
@@ -1,13 +1,14 @@
 <script setup>
-import {computed, reactive} from 'vue';
+import {computed, h, reactive} from 'vue';
 import Filter from "../../../../components/Filter/index.vue";
 import TooltipTag from "../../../../components/TooltipTag/index.vue";
 import useTableQuery from "../../../../hooks/useTableQuery.js";
 import Api from "../../../../api/index.js";
 import {toPath} from "../../../../utils/index.js";
-import {Message} from "@arco-design/web-vue";
+import {Message, Modal} from "@arco-design/web-vue";
 import {usePayTask} from "../../../../hooks/usePayTask.js";
 import SaveTemplate from "./components/SaveTemplate.vue";
+import TaskTemplate from "./components/TaskTemplate.vue";
 
 const columns = [
     {
@@ -115,6 +116,14 @@ const {open: openPayTask} = usePayTask();
 const startTask = async (_value, record) => {
     const {status, id} = record;
 
+    if (status === 2) {
+        Modal.error({
+            title: '无法查看子任务',
+            content: '检测到任务尚未审核通过，请等待任务审核通过后，再点击查看子任务',
+        });
+        return;
+    }
+
     const showMessageAndFetch = async (msg) => {
         Message.success(msg);
         await fetchData();
@@ -136,9 +145,33 @@ const startTask = async (_value, record) => {
 };
 
 const stopTask = async (id) => {
-    const {msg} = await Api.merchant.stopTask(id);
-    Message.success(msg);
-    await fetchData();
+    Modal.error({
+        width: 460,
+        title: '确认终止任务',
+        content: h('div', {}, [
+            h('div', {}, '终止任务后，后续达人将无法接单，但不影响已经接单的达人'),
+            h('div', {class: 'text-[#4E5969] text-[14px] mt-[4px]'}, '*请商家及时处理已经被接单的子任务，处理完毕后，剩余任务金额将返款至您钱包')
+        ]),
+        okText: '确认终止',
+        okButtonProps: {status: "danger"},
+        hideCancel: false,
+        onOk: async () => {
+            const {msg} = await Api.merchant.stopTask(id);
+            Message.success(msg);
+            await fetchData();
+        }
+    })
+}
+
+const viewMiniTask = (record) => {
+    if (record.status === 0 || record.status === 1 || record.status === -1) {
+        Modal.error({
+            title: '无法查看子任务',
+            content: '检测到任务尚未审核通过，请等待任务审核通过后，再点击查看子任务'
+        });
+    } else {
+        toPath('/home/task-center/look-min-task', {id: record.id})
+    }
 }
 </script>
 
@@ -154,12 +187,14 @@ const stopTask = async (id) => {
                 </template>
                 新建任务
             </a-button>
-            <a-button>
-                <template #icon>
-                    <icon-plus/>
-                </template>
-                从模板快速创建
-            </a-button>
+            <task-template @success="initFetchData">
+                <a-button>
+                    <template #icon>
+                        <icon-plus/>
+                    </template>
+                    从模板快速创建
+                </a-button>
+            </task-template>
         </div>
 
         <div class="mt-[20px] flex-grow">
@@ -205,15 +240,14 @@ const stopTask = async (id) => {
                             编辑
                         </a-link>
                         <a-link :hoverable="false"
-                                @click="record.status >= 2 ? toPath('/home/task-center/look-min-task', {id: record.id}) : Message.warning('审核未通过')">
+                                @click="viewMiniTask(record)">
                             查看子任务
                         </a-link>
-                        <a-popconfirm content="确认终止吗?" @ok="stopTask(record.id)">
-                            <a-link :disabled="!(record.status === 4 || record.status === -2)" :hoverable="false"
-                                    status="danger">
-                                终止
-                            </a-link>
-                        </a-popconfirm>
+                        <a-link @click="stopTask(record.id)" :disabled="!(record.status === 4 || record.status === -2)"
+                                :hoverable="false"
+                                status="danger">
+                            终止
+                        </a-link>
                     </div>
                 </template>
                 <template v-slot:exp="{record}">
diff --git a/src/pinia/SystemStore/index.js b/src/pinia/SystemStore/index.js
index d5385be..8b52c8f 100644
--- a/src/pinia/SystemStore/index.js
+++ b/src/pinia/SystemStore/index.js
@@ -71,6 +71,6 @@ export const useSystemStore = defineStore("SystemStore", () => {
         afterHydrate: (val) => {
             val.store.installRoute && val.store.installRoute();
         },
-        pick: ['RoutesTemp', 'NOW_ROUTER', 'NOW_ROUTER_QUERY'],
+        pick: ['RoutesTemp', 'NOW_ROUTER', 'NOW_ROUTER_QUERY', 'isRoot'],
     }
 });
diff --git a/src/utils/index.js b/src/utils/index.js
index 84c6e40..df1c57e 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -2,8 +2,7 @@ import router from "../router/index.js";
 
 export const toPath = (path, query = {}) => {
     router.push({
-        path: path,
-        query: query
+        path: path, query: query
     }).then();
 }
 
@@ -40,3 +39,19 @@ export const determineMediaType = (url) => {
         return 'Unknown';
     }
 }
+
+export const findSwappedIds = (original, swapped) => {
+    let id1, id2;
+
+    original.forEach((item, index) => {
+        if (item.id !== swapped[index].id) {
+            if (!id1) {
+                id1 = item.id; // 记录第一个不同的 id
+            } else {
+                id2 = item.id; // 记录第二个不同的 id
+            }
+        }
+    });
+
+    return [id1, id2];
+};