From ff17e84aed3b5fdcd646e6c32a727e99ef23351c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9A=E5=95=A6C=E6=A2=A6?= <15709267061@163.com>
Date: Tue, 29 Apr 2025 19:43:06 +0800
Subject: [PATCH] update

---
 src/api/index.ts                              |   2 +
 src/api/merchant.js                           | 157 ++++++++++++++++++
 src/api/system.js                             |  15 +-
 src/assets/images/yhk.png                     | Bin 0 -> 1783 bytes
 src/assets/images/zfb.png                     | Bin 0 -> 818 bytes
 src/components/VerificationCode/index.vue     |   8 +-
 src/components/XSelect/index.vue              |  17 +-
 src/components/XTimePicker/XTimePicker.vue    |  26 +++
 src/components/upload/UploadOne.vue           |   8 +-
 src/pages/login/Register.vue                  |  32 ++--
 .../AddWithdrawalInformationModal.vue         |  38 +++--
 .../pages/my-wallet/components/Reflect.vue    |  49 +++---
 .../pages/task-center/components/Backfill.vue |  17 +-
 .../task-center/components/new-task-1.vue     |  34 ++--
 .../task-center/components/new-task-2.vue     |  56 +++----
 .../task-center/components/new-task-3.vue     |  15 +-
 .../task-center/components/new-task-4.vue     |  59 ++++---
 .../task-center/components/new-task-5.vue     |  53 +++---
 .../task-center/components/new-task-6.vue     |  55 +++---
 .../task-center/components/new-task-7.vue     |  11 +-
 .../merchant/pages/task-center/new-task.vue   |  31 +++-
 .../pages/task-center/reward-mission.vue      |  81 ++++-----
 src/pinia/SystemStore/index.js                |  11 +-
 src/pinia/SystemStore/mock.js                 |   1 -
 src/pinia/UserStore/index.js                  |   8 +-
 src/utils/index.js                            |   6 +
 26 files changed, 530 insertions(+), 260 deletions(-)
 create mode 100644 src/api/merchant.js
 create mode 100644 src/assets/images/yhk.png
 create mode 100644 src/assets/images/zfb.png
 create mode 100644 src/components/XTimePicker/XTimePicker.vue

diff --git a/src/api/index.ts b/src/api/index.ts
index 9a31fbb..9dbe7c5 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -1,7 +1,9 @@
+import merchant from './merchant.js';
 import system from './system.js';
 import admin from './admin.js';
 
 const Api = {
+    merchant: {...merchant},
     system: {...system},
     admin: {...admin},
 }
diff --git a/src/api/merchant.js b/src/api/merchant.js
new file mode 100644
index 0000000..2334119
--- /dev/null
+++ b/src/api/merchant.js
@@ -0,0 +1,157 @@
+import request from "../utils/request.js";
+import Method from "./Method.js";
+
+const merchant = {
+    sendSms: async (mobile) => {
+        return request({
+            url: '/index/login/sendSms',
+            method: Method.POST,
+            data: {mobile},
+        });
+    },
+    register: async (data) => {
+        return request({
+            url: '/index/login/register',
+            method: Method.POST,
+            data: data,
+        });
+    },
+    login: async (data) => {
+        return request({
+            url: '/index/login/login',
+            method: Method.POST,
+            data: data,
+        });
+    },
+    getMenu: async (data) => {
+        return request({
+            url: '/index/business/getMenu',
+            method: Method.POST,
+            data: data,
+        });
+    },
+    getPlatformList: async () => {
+        return request({
+            url: '/index/task/getPlatformList',
+            method: Method.POST,
+        });
+    },
+    getMaterialType: async (data) => {
+        return request({
+            url: '/index/task/getMaterialType',
+            method: Method.POST,
+            data: data,
+        });
+    },
+    getProvince: async () => {
+        return request({
+            url: '/index/task/getProvince',
+            method: Method.POST,
+        });
+    },
+    getSettlementAfter: async () => {
+        return request({
+            url: '/index/task/getSettlementAfter',
+            method: Method.POST,
+        });
+    },
+    getChooseContent: async (data) => {
+        return request({
+            url: '/index/task/getChooseContent',
+            method: Method.POST,
+            data: data
+        });
+    },
+    getNumberOfReleases: async () => {
+        return Promise.resolve({
+            data: [
+                {
+                    id: 1,
+                    name: '一次'
+                },
+                {
+                    id: 2,
+                    name: '两次'
+                },
+                {
+                    id: 3,
+                    name: '三次'
+                },
+                {
+                    id: 4,
+                    name: '四次'
+                },
+                {
+                    id: 5,
+                    name: '五次'
+                },
+            ]
+        })
+    },
+    getPublicationDuration: async () => {
+        return Promise.resolve({
+            data: [
+                {
+                    id: 5,
+                    name: '5分钟'
+                },
+                {
+                    id: 10,
+                    name: '10分钟'
+                },
+                {
+                    id: 20,
+                    name: '20分钟'
+                },
+                {
+                    id: 30,
+                    name: '30分钟'
+                },
+            ]
+        })
+    },
+    createTask: async (data) => {
+        return request({
+            url: '/index/task/createTask',
+            method: Method.POST,
+            data: data,
+        });
+    },
+    getTaskPlatformList: async (data) => {
+        return request({
+            url: '/index/task/getPlatformList',
+            method: Method.POST,
+            data: data
+        });
+    },
+    getTaskStatusList: async (data) => {
+        return request({
+            url: '/index/task/getStatusList',
+            method: Method.POST,
+            data: data
+        });
+    },
+    getTaskList: async (data) => {
+        return request({
+            url: '/index/task/getTaskList',
+            method: Method.POST,
+            data: data
+        });
+    },
+    addWithdrawal: async (data) => {
+        return request({
+            url: '/index/business/addWithdrawal',
+            method: Method.POST,
+            data: data
+        });
+    },
+    getWithdrawalList: async (data) => {
+        return request({
+            url: '/index/business/getWithdrawalList',
+            method: Method.POST,
+            data: data
+        });
+    },
+}
+
+export default merchant;
diff --git a/src/api/system.js b/src/api/system.js
index edcd52a..23b5a6d 100644
--- a/src/api/system.js
+++ b/src/api/system.js
@@ -43,7 +43,20 @@ const system = {
                 'Content-Type': 'multipart/form-data; boundary=--------------------------611824495457697861278283'
             }
         });
-    }
+    },
+    uploadFile2: async (file) => {
+        const formData = new FormData();
+        formData.append('file', file);
+        return request({
+            UN_AES: true,
+            url: '/index/upload/upload',
+            method: Method.POST,
+            data: formData,
+            headers: {
+                'Content-Type': 'multipart/form-data; boundary=--------------------------611824495457697861278283'
+            }
+        });
+    },
 }
 
 export default system;
diff --git a/src/assets/images/yhk.png b/src/assets/images/yhk.png
new file mode 100644
index 0000000000000000000000000000000000000000..aada49d98a18047721f2f2d2318c137516ff2f6d
GIT binary patch
literal 1783
zcmV<T1_=3yP)<h;3K|Lk000e1NJLTq002b*002A)1^@s6FrarJ00004b3#c}2nYxW
zd<bNS000KANkl<Zc%1E;+iw(A9LGOrw#)WH3k4OtC1i;~c~Oi66T4_^D<u0L7~-2L
z(2y8IER9A=qNyalsG)`zU(^>Ld?PWTprrL0!3RS$k}U#;R48qM-uH5RICFN-%+BnE
z?j66$c4y8x)BT;#{4O(RMvzbavKs)w4w7`{9bc;oFoWbb08WTAxrPego<lN3f<3^l
zk{VYFvN(&yIG>1RuWoNBhh-ZJ96;8wXXKM$2EkcQhzstnCeH)r*o$ajAOMn1B%8dt
ztgM!P*^S^?ck@s*`(UrOI#U<><)iM#Y$!QoLU02aio$nq!o%zD&AO^7zz%m)cKApl
z?xvwA9CbnP+wXe;hEA=*$VyA{9Q|_9tVm8zIV3xf1S@V>HRUm1r>Dee_NqtbnRk1E
zxxf1f_;hSlCRRsDem8f$tB;S|a2z?No<b&%3Qn|MlWrssrV8<tM$9qsT%FlagroXA
zPvb(lh-3;u2+2ogrxQwmH@r%611bnSlP)R&4g+uL&P=U2C`W<rikeniIs=R_BED9M
zwqFi#e**#NMz9?~a8M2bN2_a34JkycZ}sWf2K#nFJPDuu06$)aLodRf?eNzP_~I8>
zio>fr;pxZV+$H#Mw361BNz1&}1l~&ohkIeqQ)+v0MM2rW8@6wTDDcx|m|cXo_o^|w
zwloM7!All`eO`T*ak(F`^mu2#ImUkpukQ3pfSp6fy?SoUsYzeB2A}^7S7#s?P=LO<
z2;W|U=>?cyhWQov@>lpiR%!doq87nHDXVQot*NL*ru#+zL-9~iO9!>AjcxG2T9xpH
zP@kze)pz4AZ0>-`JB9tPx`eX61=hE!iEnI$jcZj=h}{GP{5hF@Orb!aPN1|m!@6cz
zXT#8!1D1d*(=f9Dv8mGiUd=*T8&aP~*4Y3o^(`ex;O}V#q#UX#D6MOtZ4GQ{2caQg
ze<WO+RUz}wOnL372`C%dRHD=&kpe840doD0N}$(oSH_;IL1}J+<{)&osp|r1K*0W<
zysJFp-y)J^DO7PN?ak_}uWK=Kgni?rp-j!GF*oNbZJkoZpsWo+dnj`a0k&62r*}-v
z!>##BS>>&=L($1oh|J_o5ZLXr3#zo%g31P^B?v8RR2WF?Z%smEyhNbZWo8%4Wl8ZW
zIh0V7nrJ9!Ll7XeXV_t*_wO#louyJ+uzHmg%9<t{io-oJiB!jo6fn1>pwyyD0woww
zKr{;z2qqArcBkiIC0UAJE{|3P#S&^IE*K!=5k5eKP>bNVYbba4>7Jo9S<n<v+h*?Y
z^N@uVSj_nZw{}!C6k&Tuz`pR(*BoG!S+hZ?M<Gjf0tAYLqQk}E3`W?P308a0avYWu
zr8c{~Dj16SNJC<mRb683G13ShVTVjIRZ4R!qr7Xh0^2(@5M5T&e=;|7S`t`E)F%+g
z14ZAbI6#mMKyT=Ek9e}SOKv{-hEL8XemZZE9Y*mKBnkjB*sC({@aZ6tu=fFD6RN!V
z^?Qx=`i=3J<=O8i|D58YqAQJgA0rGf2n8ciK*$XC#u@BU26u&1j89k$_QbOwbPTjQ
z#tx6Fm#Xx>sg8kG$9^Q7%p6CMuB{ovhEL~yIm;7@t|}N1zyplYmq-<#Lxx9#jK?gF
z^s4eSK4GON<Q@l^GoEi!fCEBTIJ2#PBbPj(n3K&Zdtgcy4`gg2pu8kzr6G*Rtn_5G
z*O*=rjfK)7;g(+*j!gvk;B;}9W4@zzZXuIAfeTk5{2)x+R7;2f)B|=Y3kw;yBH?6K
zoS*8;+#%{S8a)|uv}<Wt=A@7GCbGap!bu{1&Ng?bx#bJx@eOKibn-TIKMCir!pqxK
zsok<st(A=ap}eFRnXw)TC!v@0<aArdK&$UrADalMz8=*UJsC>(o7<=QmWhOu>Cl7x
zxkSr1z*gd!5Ypu}Wq3q9VPBsV2}Mr~?3`l6xZb{Vd?6i1?r<{Oa><0+6;3hO6ECQW
zfr8@s6s4^hb(1I5syk$E05z;)y+q3|*^S3kyH_&xI;M~^J07zf;Z=ZUEZ}3Wo~ySY
zk$}!tIDbX8oxcJPwW}9(7FG)R|K92fr_za5D-ur9wKbIv55Kc&hMyl?^H}Yf(UYM<
z6Yf_9za1&kf0Rn~s*hK~b@ywf^NF!v2K5*9%BTj@;O{=QTa1Vy;GIH7>wB99)-guJ
zoC?Yj@jh^_y7p9E>G?Y^To1@&2;Qx@In~!OJ7NH@t9g}U05$=yqb^<>O-bOr^qv6(
Z;6H~EZNR+klYIaH002ovPDHLkV1ldiKj;7e

literal 0
HcmV?d00001

diff --git a/src/assets/images/zfb.png b/src/assets/images/zfb.png
new file mode 100644
index 0000000000000000000000000000000000000000..675a56b1be3f6e32d44e4235497aeca6ac4a5434
GIT binary patch
literal 818
zcmV-21I_%2P)<h;3K|Lk000e1NJLTq001}u0024&1^@s6<xZLv00004b3#c}2nYxW
zd<bNS0008%Nkl<ZXo2mTO}3*T6ofx~y@mE<H!-_%rq0~eGrQ@NUPGh@LXJP6fD)tq
zYLuu66hHUYEfkE9=CYJ<6_AbZ9RSs%7G?i}&>t?j%$`sjl-K|X-2T*}QJ*`s@O=hy
z&~drsG6O|0&1Jb~hhpFf1%OcGiha8i2MOGg<;RYTClrZ<>)suSiR3JS#RLJ_uh@-9
zXuhBtUvImCjlTDz6a0co=cGO^xuksq!BYnr_#t?F{17}kM4C(K`fy*R?}bY)vlhNx
zpFjN!dgZ|uvQ(8Ju1KJ<&3Z@`^X!UoXZR-iki^`WE~=&G{eM2>;6GTRrzaSsMI|%>
z?k>+RMBRx9pJ_A52=hu4JxtuI*a+-r@C;rrp3&3=TSi-rAc6w2Hcp}J8zdL;NkL|A
zKL*#0pG44zwU*|`5R4VHy!N0}s>I~6z{_U|3F%RmCpZ$+#*srMF}dGcV%Cn@W^W6}
zeU_jHF)MnVFO~kx7?O=PdoV*#Li4v4x3vxQp$4j9NY;q0&P%LH=2445PSPDRIpJEi
z&6P&J2vsg)*k<sxZ1lOI9&Jk|&H!2{(p<i@YG`CsgSiQeGuWTK-??0SZdj@REPa3I
z5}=k~BKQ*05sub^MSAGb`h=i1mVC_}AFMU6d}emC2X(`d#5Al-J1|T=OJt)TzKpPW
z9l1nyvP5-&iLgYi<a&F3vjNa#-?ax_$T>ali%B)1_nz7(&YsB(tesV^fNAd(X)fg!
zYGy*PuT)gWf=Ehe61dHgb66p(i5e6AIE?$`Ll=R*V)<9Ta?q+pO}R>sWIy5R8d1RA
zrSXl#gR?rCwGGFDdo4DQeJ0EXBo|+Fbwqp9i+;v_x*EUUf_cZc7Y9T`ob3v_+HZWL
zUoU>Z3r5wW7G<b)e;9m>Z5RuQv>Z^L0ZMF~7Xt2y&BQ$m1Vl@~d!u^PqD;VU#UB|u
w7beh^MhR?c^6mv)#pv%7t$Ea!)NNkuKL)3NzLQu66951J07*qoM6N<$f|MM3ZU6uP

literal 0
HcmV?d00001

diff --git a/src/components/VerificationCode/index.vue b/src/components/VerificationCode/index.vue
index 6aa0b1b..1ccaca4 100644
--- a/src/components/VerificationCode/index.vue
+++ b/src/components/VerificationCode/index.vue
@@ -4,10 +4,14 @@ import {Message, Notification} from "@arco-design/web-vue";
 import Api from "../../api/index.js";
 
 const verificationCode = defineModel('verificationCode', {type: String});
-const {mobile} = defineProps({
+const {mobile, api} = defineProps({
     mobile: {
         type: String,
         default: null,
+    },
+    api: {
+        type: Function,
+        default: Api.admin.sendSms
     }
 });
 
@@ -17,7 +21,7 @@ let timer = null;
 const verifyPhone = async () => {
     if (/^1[3-9]\d{9}$/.test(mobile)) {
         if (timer === null) {
-            const {msg, code} = await Api.admin.sendSms(mobile);
+            const {msg, code} = await api(mobile);
             if (code === 1) Message.success(msg);
             time.value = 10;
             timer = setInterval(() => {
diff --git a/src/components/XSelect/index.vue b/src/components/XSelect/index.vue
index 6983e86..79e61d3 100644
--- a/src/components/XSelect/index.vue
+++ b/src/components/XSelect/index.vue
@@ -1,5 +1,5 @@
 <script setup>
-import {onMounted, reactive} from "vue";
+import {reactive} from "vue";
 
 const {api, fieldName, apiPo} = defineProps({
     api: {
@@ -19,12 +19,14 @@ const {api, fieldName, apiPo} = defineProps({
 });
 const list = reactive([]);
 
-onMounted(() => {
-    api && api(apiPo).then(({data}) => {
-        list.length = 0;
-        list.push(...data);
-    });
-});
+const popupChange = async (visible) => {
+    if (visible) {
+        api && api(apiPo).then(({data}) => {
+            list.length = 0;
+            list.push(...data);
+        });
+    }
+}
 </script>
 
 <template>
@@ -32,6 +34,7 @@ onMounted(() => {
         v-bind="$attrs"
         :options="list"
         :field-names="fieldName"
+        @popup-visible-change="popupChange"
         placeholder="请选择">
     </a-select>
 </template>
diff --git a/src/components/XTimePicker/XTimePicker.vue b/src/components/XTimePicker/XTimePicker.vue
new file mode 100644
index 0000000..b8cd6b7
--- /dev/null
+++ b/src/components/XTimePicker/XTimePicker.vue
@@ -0,0 +1,26 @@
+<script setup>
+import {computed} from 'vue';
+
+const start = defineModel('start');
+const end = defineModel('end');
+
+const value = computed({
+    get: () => [start.value, end.value],
+    set: (val) => {
+        start.value = val[0];
+        end.value = val[1];
+    }
+});
+</script>
+
+<template>
+    <a-time-picker
+        v-model:model-value="value"
+        v-bind="$attrs"
+        type="time-range">
+    </a-time-picker>
+</template>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/src/components/upload/UploadOne.vue b/src/components/upload/UploadOne.vue
index 2f5dc7a..c58f9d8 100644
--- a/src/components/upload/UploadOne.vue
+++ b/src/components/upload/UploadOne.vue
@@ -1,17 +1,21 @@
 <script setup>
 import Api from "../../api/index.js";
 
-const {size} = defineProps({
+const {size, api} = defineProps({
     size: {
         type: String,
         default: '100%'
+    },
+    api: {
+        type: Function,
+        default: Api.system.uploadFile,
     }
 });
 const emits = defineEmits(['success']);
 const files = defineModel('file');
 
 const beforeUpload = (file) => {
-    Api.system.uploadFile(file).then(({data}) => {
+    api(file).then(({data}) => {
         files.value = data;
         emits('success', file);
     });
diff --git a/src/pages/login/Register.vue b/src/pages/login/Register.vue
index 17244f1..c757977 100644
--- a/src/pages/login/Register.vue
+++ b/src/pages/login/Register.vue
@@ -1,11 +1,21 @@
 <script setup>
-import {ref, reactive} from 'vue';
+import {reactive} from 'vue';
 import VerificationCode from "../../components/VerificationCode/index.vue";
+import Api from "../../api/index.js";
+import {Message} from "@arco-design/web-vue";
 
 const from = reactive({
-    phone: null,
-    verificationCode: null,
+    wechat: null,
+    mobile: null,
+    password: null,
+    captcha: null,
+    invite: null,
 });
+
+const register = async () => {
+    const {msg} = await Api.merchant.register(from);
+    Message.success(msg);
+}
 </script>
 
 <template>
@@ -14,27 +24,28 @@ const from = reactive({
         <div class="mt-[30px] flex flex-col gap-[20px]">
             <a-form layout="vertical">
                 <a-form-item label="微信号">
-                    <a-input placeholder="请输入微信号"></a-input>
+                    <a-input v-model:model-value="from.wechat" placeholder="请输入微信号"></a-input>
                 </a-form-item>
                 <a-form-item label="手机号">
-                    <a-input v-model:model-value="from.phone" placeholder="请输入手机号"></a-input>
+                    <a-input v-model:model-value="from.mobile" placeholder="请输入手机号"></a-input>
                 </a-form-item>
                 <a-form-item label="验证码">
                     <VerificationCode
-                        :phone="from.phone"
-                        v-model:verification-code="from.verificationCode">
+                        :api="Api.merchant.sendSms"
+                        :mobile="from.mobile"
+                        v-model:verification-code="from.captcha">
                     </VerificationCode>
                 </a-form-item>
                 <a-form-item label="登陆密码">
-                    <a-input placeholder="请输入登陆密码"></a-input>
+                    <a-input v-model:model-value="from.password" placeholder="请输入登陆密码"></a-input>
                 </a-form-item>
                 <a-form-item label="邀请码（选填）">
-                    <a-input placeholder="请输入邀请码"></a-input>
+                    <a-input v-model:model-value="from.invite" placeholder="请输入邀请码"></a-input>
                 </a-form-item>
             </a-form>
         </div>
         <div class="flex flex-col mt-[30px] gap-[32px]">
-            <a-button type="primary">确认注册</a-button>
+            <a-button type="primary" @click="register">确认注册</a-button>
         </div>
     </div>
 </template>
@@ -42,6 +53,7 @@ const from = reactive({
 <style scoped>
 .card {
     box-shadow: 0 8px 20px 0 rgba(0, 0, 0, 0.1);
+
     :deep(.arco-form-item-label-col) {
         line-height: 20px;
     }
diff --git a/src/pages/merchant/components/AddWithdrawalInformationModal.vue b/src/pages/merchant/components/AddWithdrawalInformationModal.vue
index fb1ede5..eb0d420 100644
--- a/src/pages/merchant/components/AddWithdrawalInformationModal.vue
+++ b/src/pages/merchant/components/AddWithdrawalInformationModal.vue
@@ -1,5 +1,8 @@
 <script setup>
-import {ref, reactive} from 'vue';
+import {reactive, ref} from 'vue';
+import Api from "../../../api/index.js";
+import VerificationCode from "../../../components/VerificationCode/index.vue";
+import {Message} from "@arco-design/web-vue";
 
 const visible = ref(false);
 const state = reactive({
@@ -7,7 +10,12 @@ const state = reactive({
     sendTimeout: 0,
 });
 const form = reactive({
-    name: null
+    type: null,
+    mobile: null,
+    captcha: null,
+    realname: null,
+    id_card: null,
+    account: null,
 });
 
 const sendMessage = () => {
@@ -20,6 +28,11 @@ const sendMessage = () => {
         }
     }, 1000);
 }
+
+const success = async () => {
+    const {msg} = await Api.merchant.addWithdrawal(form);
+    Message.success(msg);
+}
 </script>
 
 <template>
@@ -31,30 +44,29 @@ const sendMessage = () => {
     <a-modal
         title-align="start"
         title="添加提现信息"
+        @ok="success"
         v-model:visible="visible">
         <a-form>
             <a-tabs type="rounded">
                 <a-tab-pane title="添加支付宝" key="1">
                     <a-form-item label="收款姓名">
-                        <a-input v-model:model-value="form.name" placeholder="请输入收款人的姓名"></a-input>
+                        <a-input v-model:model-value="form.realname" placeholder="请输入收款人的姓名"></a-input>
                     </a-form-item>
                     <a-form-item label="支付宝账号">
-                        <a-input v-model:model-value="form.name" placeholder="请输入支付宝账号"></a-input>
+                        <a-input v-model:model-value="form.account" placeholder="请输入支付宝账号"></a-input>
                     </a-form-item>
                     <a-form-item label="身份证号">
-                        <a-input v-model:model-value="form.name" placeholder="请输入身份证号"></a-input>
+                        <a-input v-model:model-value="form.id_card" placeholder="请输入身份证号"></a-input>
                     </a-form-item>
                     <a-form-item label="手机号">
-                        <a-input v-model:model-value="form.name" placeholder="请输入手机号"></a-input>
+                        <a-input v-model:model-value="form.mobile" placeholder="请输入手机号"></a-input>
                     </a-form-item>
                     <a-form-item label="验证码">
-                        <a-input v-model:model-value="form.name" placeholder="请输入验证码"></a-input>
-                        <a-link
-                            @click="sendMessage"
-                            class="whitespace-nowrap ml-[16px]"
-                            :hoverable="false">
-                            {{ state.sendTimeout === 0 ? '获取验证码' : `请${state.sendTimeout}s后重试` }}
-                        </a-link>
+                        <VerificationCode
+                            :api="Api.merchant.sendSms"
+                            :mobile="form.mobile"
+                            v-model:verification-code="form.captcha">
+                        </VerificationCode>
                     </a-form-item>
                 </a-tab-pane>
                 <a-tab-pane title="添加银行卡" key="2">
diff --git a/src/pages/merchant/pages/my-wallet/components/Reflect.vue b/src/pages/merchant/pages/my-wallet/components/Reflect.vue
index 12cafa6..309f8fa 100644
--- a/src/pages/merchant/pages/my-wallet/components/Reflect.vue
+++ b/src/pages/merchant/pages/my-wallet/components/Reflect.vue
@@ -1,8 +1,22 @@
 <script setup>
-
+import ZFBICON from "../../../../../assets/images/zfb.png";
+import YHKICON from "../../../../../assets/images/yhk.png";
+import {onMounted, reactive} from "vue";
 import AddWithdrawalInformationModal from "../../../components/AddWithdrawalInformationModal.vue";
 import openWithdrawalStatus from "./openWithdrawalStatus.js";
 import LookWithdrawalInformationModal from "../../../components/LookWithdrawalInformationModal.vue";
+import Api from "../../../../../api/index.js";
+
+const withdrawalList = reactive([]);
+const getData = async () => {
+    const {data} = await Api.merchant.getWithdrawalList();
+    withdrawalList.length = 0;
+    withdrawalList.push(...data);
+}
+
+onMounted(() => {
+    getData();
+});
 </script>
 
 <template>
@@ -20,36 +34,13 @@ import LookWithdrawalInformationModal from "../../../components/LookWithdrawalIn
         <a-form-item label="提现账户">
             <a-radio-group>
                 <div class="grid grid-cols-2 gap-[18px]">
-                    <a-radio value="1">
+                    <a-radio value="1" v-for="v in withdrawalList">
                         <div class="flex items-center">
                             <div class="input-card flex w-[306px] items-center">
-                                <img class="w-[15px] h-[15px] object-cover test" :src="'123'" alt=""/>
-                                <div class="ml-[14px]">支付宝</div>
-                                <div class="ml-[12px]">157****7061</div>
-
-                                <icon-edit class="ml-auto cursor-pointer"/>
-                            </div>
-                            <icon-delete class="ml-[8px]"/>
-                        </div>
-                    </a-radio>
-                    <a-radio value="2">
-                        <div class="flex items-center">
-                            <div class="input-card flex w-[306px] items-center">
-                                <img class="w-[15px] h-[15px] object-cover test" :src="'123'" alt=""/>
-                                <div class="ml-[14px]">支付宝</div>
-                                <div class="ml-[12px]">157****7061</div>
-
-                                <icon-edit class="ml-auto cursor-pointer"/>
-                            </div>
-                            <icon-delete class="ml-[8px]"/>
-                        </div>
-                    </a-radio>
-                    <a-radio value="3">
-                        <div class="flex items-center">
-                            <div class="input-card flex w-[306px] items-center">
-                                <img class="w-[15px] h-[15px] object-cover test" :src="'123'" alt=""/>
-                                <div class="ml-[14px]">支付宝</div>
-                                <div class="ml-[12px]">157****7061</div>
+                                <img class="w-[15px] h-[15px] object-cover" :src="v.type === 1 ? ZFBICON : YHKICON"
+                                     alt=""/>
+                                <div class="ml-[14px]">{{ v.type_text }}</div>
+                                <div class="ml-[12px]">{{ v.mobile }}</div>
 
                                 <icon-edit class="ml-auto cursor-pointer"/>
                             </div>
diff --git a/src/pages/merchant/pages/task-center/components/Backfill.vue b/src/pages/merchant/pages/task-center/components/Backfill.vue
index 49ec635..c25a764 100644
--- a/src/pages/merchant/pages/task-center/components/Backfill.vue
+++ b/src/pages/merchant/pages/task-center/components/Backfill.vue
@@ -1,11 +1,15 @@
 <script setup>
-import {reactive} from 'vue';
 import Api from "../../../../../api/index.js";
 import XSelect from "../../../../../components/XSelect/index.vue";
+import XTimePicker from "../../../../../components/XTimePicker/XTimePicker.vue";
 
-const po = reactive({
-    name: null,
+const {form} = defineProps({
+    form: {
+        type: Object,
+        default: {}
+    }
 });
+const po = defineModel('po');
 </script>
 
 <template>
@@ -13,7 +17,7 @@ const po = reactive({
         <a-form
             :auto-label-width="true">
             <a-form-item label="回填时间">
-                <a-time-picker type="time-range"></a-time-picker>
+                <x-time-picker v-model:start="po.start_time" v-model:end="po.end_time"></x-time-picker>
                 <div class="ml-[6px]">之间</div>
                 <a-button type="primary" class="ml-[38px]">一键快速设置</a-button>
             </a-form-item>
@@ -21,8 +25,9 @@ const po = reactive({
             <a-form-item label="回填内容">
                 <XSelect
                     class="w-auto"
-                    v-model:model-value="po.name"
-                    :api="Api.system.getSelect">
+                    :api-po="{id: form.platform_id}"
+                    v-model:model-value="po.content_id"
+                    :api="Api.merchant.getChooseContent">
                 </XSelect>
             </a-form-item>
         </a-form>
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 346d5bc..89a7c92 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
@@ -6,7 +6,12 @@ import {reactive} from "vue";
 
 const emits = defineEmits(['success']);
 const po = reactive({
-    name: null,
+    platform_id: null,
+    material_id: null,
+    goods_name: '玉桂狗',
+    goods_intro: '可爱捏',
+    children_num: 10,
+    children_price: 10,
 });
 
 const success = () => {
@@ -25,39 +30,40 @@ const success = () => {
             :wrapper-col-props="{span: 12, offset: 1}">
             <a-form-item label="投放渠道">
                 <XSelect
-                    v-model:model-value="po.name"
-                    :api="Api.system.getSelect">
+                    v-model:model-value="po.platform_id"
+                    :api="Api.merchant.getPlatformList">
                 </XSelect>
             </a-form-item>
             <a-form-item label="素材类型">
                 <XSelect
-                    v-model:model-value="po.name"
-                    :api="Api.system.getSelect">
+                    :api-po="{id: po.platform_id}"
+                    v-model:model-value="po.material_id"
+                    :api="Api.merchant.getMaterialType">
                 </XSelect>
             </a-form-item>
             <a-form-item label="产品名称">
-                <a-input v-model:model-value="po.name" placeholder="请输入产品名称，如：花露水"></a-input>
+                <a-input v-model:model-value="po.goods_name" placeholder="请输入产品名称，如：花露水"></a-input>
             </a-form-item>
             <a-form-item label="产品功效">
-                <a-input v-model:model-value="po.name" placeholder="请输入产品功效，如：驱蚊"></a-input>
+                <a-input v-model:model-value="po.goods_intro" placeholder="请输入产品功效，如：驱蚊"></a-input>
             </a-form-item>
             <a-form-item label="包含子任务数量">
-                <a-input v-model:model-value="po.name"
+                <a-input v-model:model-value="po.children_num"
                          placeholder="请输入代发的账号数量，最多一个任务可包含50个子任务"></a-input>
             </a-form-item>
             <a-form-item label="单个子任务价格">
-                <a-input v-model:model-value="po.name" placeholder="请输入单个子任务价格"></a-input>
+                <a-input v-model:model-value="po.children_price" placeholder="请输入单个子任务价格"></a-input>
             </a-form-item>
 
             <a-form-item label="案例链接">
-                <a-input v-model:model-value="po.name" placeholder="请输入案例链接">
+                <a-input disabled placeholder="请输入案例链接">
                     <template #prepend>http://</template>
                 </a-input>
             </a-form-item>
 
             <a-form-item label="素材案例">
                 <div class="flex flex-col gap-[5px]">
-                    <a-upload :disabled="true" action="/">
+                    <a-upload disabled action="/">
                         <template #upload-button>
                             <div class="arco-upload-picture-card">
                                 <div class="arco-upload-picture-card-text">
@@ -73,7 +79,7 @@ const success = () => {
             <a-form-item label="任务安全等级">
                 <div class="flex flex-col gap-[5px]">
                     <div class="flex items-center gap-[36px]">
-                        <a-rate allow-half/>
+                        <a-rate allow-half disabled/>
                         <a-link class="rate-text" :hoverable="false">待评估</a-link>
                     </div>
                     <div>
@@ -85,7 +91,7 @@ const success = () => {
             <a-form-item label="任务耗时等级">
                 <div class="flex flex-col gap-[5px]">
                     <div class="flex items-center gap-[36px]">
-                        <a-rate allow-half/>
+                        <a-rate allow-half disabled/>
                         <a-link class="rate-text" :hoverable="false">待评估</a-link>
                     </div>
                     <div>
@@ -101,6 +107,6 @@ const success = () => {
     </FormTitle>
 </template>
 
-<style scoped>
+<style lang="scss" scoped>
 
 </style>
diff --git a/src/pages/merchant/pages/task-center/components/new-task-2.vue b/src/pages/merchant/pages/task-center/components/new-task-2.vue
index 05e6b3f..9125b69 100644
--- a/src/pages/merchant/pages/task-center/components/new-task-2.vue
+++ b/src/pages/merchant/pages/task-center/components/new-task-2.vue
@@ -3,10 +3,17 @@ import Api from "../../../../../api/index.js";
 import XSelect from "../../../../../components/XSelect/index.vue";
 import FormTitle from "../../../../../components/FormTitle/index.vue";
 import {reactive} from "vue";
+import UploadOne from "../../../../../components/upload/UploadOne.vue";
 
-const emits = defineEmits(['success']);
+const emits = defineEmits(['success', 'prev']);
 const po = reactive({
-    name: null,
+    fb_num: null,
+    is_identical: 1,
+    duration: null,
+    special_text: null,
+    special_images: null,
+    choose_area: null,
+    machine: 0,
 });
 
 const success = () => {
@@ -21,62 +28,55 @@ const success = () => {
         <a-form
             class="mt-[30px]"
             :model="po"
-            :label-col-props="{span: 3}"
+            :label-col-props="{span: 4}"
             :wrapper-col-props="{span: 12, offset: 1}">
             <a-form-item label="发布次数">
                 <XSelect
-                    v-model:model-value="po.name"
-                    :api="Api.system.getSelect">
+                    v-model:model-value="po.fb_num"
+                    :api="Api.merchant.getNumberOfReleases">
                 </XSelect>
             </a-form-item>
 
             <a-form-item label="每次素材是否相同">
-                <a-radio-group>
-                    <a-radio>相同</a-radio>
-                    <a-radio>不同</a-radio>
+                <a-radio-group v-model:model-value="po.is_identical">
+                    <a-radio :value="1">相同</a-radio>
+                    <a-radio :value="0">不同</a-radio>
                 </a-radio-group>
             </a-form-item>
 
-            <a-form-item label="发布次数">
+            <a-form-item label="每次发布间隔时长">
                 <XSelect
-                    v-model:model-value="po.name"
-                    :api="Api.system.getSelect">
+                    v-model:model-value="po.duration"
+                    placeholder="无要求"
+                    :api="Api.merchant.getPublicationDuration">
                 </XSelect>
             </a-form-item>
 
             <a-form-item label="特殊要求">
-                <a-input v-model:model-value="po.name"
+                <a-input v-model:model-value="po.special_text"
                          placeholder="请输入特殊要求，如：请勿截图，必须下载原图再上传到抖音"></a-input>
             </a-form-item>
 
             <a-form-item label="">
-                <a-upload action="/">
-                    <template #upload-button>
-                        <div class="arco-upload-picture-card">
-                            <div class="arco-upload-picture-card-text">
-                                <IconPlus/>
-                                <div style="margin-top: 10px; font-weight: 600">添加图片</div>
-                            </div>
-                        </div>
-                    </template>
-                </a-upload>
+                {{ po.special_images }}
+                <upload-one :file="po.special_images" size="100px" :api="Api.system.uploadFile2"></upload-one>
             </a-form-item>
 
             <a-form-item label="选择限制 IP">
                 <XSelect
-                    v-model:model-value="po.name"
-                    :api="Api.system.getSelect">
+                    multiple
+                    :max-tag-count="4"
+                    v-model:model-value="po.choose_area"
+                    :api="Api.merchant.getProvince">
                 </XSelect>
             </a-form-item>
 
             <a-form-item label="每个设备可参加几次">
-                <XSelect
-                    v-model:model-value="po.name"
-                    :api="Api.system.getSelect">
-                </XSelect>
+                <a-input-number placeholder="敬请期待" disabled></a-input-number>
             </a-form-item>
 
             <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-form-item>
         </a-form>
diff --git a/src/pages/merchant/pages/task-center/components/new-task-3.vue b/src/pages/merchant/pages/task-center/components/new-task-3.vue
index 12a22b5..a2123e8 100644
--- a/src/pages/merchant/pages/task-center/components/new-task-3.vue
+++ b/src/pages/merchant/pages/task-center/components/new-task-3.vue
@@ -1,12 +1,11 @@
 <script setup>
-import Api from "../../../../../api/index.js";
-import XSelect from "../../../../../components/XSelect/index.vue";
 import FormTitle from "../../../../../components/FormTitle/index.vue";
 import {reactive} from "vue";
 
-const emits = defineEmits(['success']);
+const emits = defineEmits(['success', 'prev']);
 const po = reactive({
-    name: null,
+    is_comment: 0,
+    is_top: 0,
 });
 
 const success = () => {
@@ -25,7 +24,7 @@ const success = () => {
             :wrapper-col-props="{span: 12, offset: 1}">
             <a-form-item label="是否需要评论"
                          extra="若您的评论内容有营销属性，有概率不可见。达人可多次尝试，但不可作为扣款理由">
-                <a-radio-group v-model:model-value="po.name">
+                <a-radio-group v-model:model-value="po.is_comment">
                     <a-radio :value="0">否</a-radio>
                     <a-radio :value="1">是</a-radio>
                 </a-radio-group>
@@ -33,7 +32,7 @@ const success = () => {
 
             <a-form-item label="评论是否需要置顶"
                          extra="若您的评论内容有营销属性，不建议置顶。各个平台置顶评论都由人工审核，有概率置顶不成功且影响流量">
-                <a-radio-group v-model:model-value="po.name">
+                <a-radio-group v-model:model-value="po.is_top">
                     <a-radio :value="0">否</a-radio>
                     <a-radio :value="1">是</a-radio>
                 </a-radio-group>
@@ -46,7 +45,8 @@ const success = () => {
                     placeholder=""></a-input>
             </a-form-item>
 
-            <a-form-item label="" extra="无需上传，将从商家上传的评论图片中，取第一组素材为案例展示。不允许用户复制或者截图使用，仅作为参考使用">
+            <a-form-item label=""
+                         extra="无需上传，将从商家上传的评论图片中，取第一组素材为案例展示。不允许用户复制或者截图使用，仅作为参考使用">
                 <a-upload :disabled="true" action="/">
                     <template #upload-button>
                         <div class="arco-upload-picture-card">
@@ -59,6 +59,7 @@ const success = () => {
             </a-form-item>
 
             <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-form-item>
         </a-form>
diff --git a/src/pages/merchant/pages/task-center/components/new-task-4.vue b/src/pages/merchant/pages/task-center/components/new-task-4.vue
index 5a3749a..5173628 100644
--- a/src/pages/merchant/pages/task-center/components/new-task-4.vue
+++ b/src/pages/merchant/pages/task-center/components/new-task-4.vue
@@ -1,28 +1,38 @@
 <script setup>
-import Api from "../../../../../api/index.js";
-import XSelect from "../../../../../components/XSelect/index.vue";
 import FormTitle from "../../../../../components/FormTitle/index.vue";
 import {reactive} from "vue";
 import Backfill from "./Backfill.vue";
 import {v4} from "uuid";
+import XTimePicker from "../../../../../components/XTimePicker/XTimePicker.vue";
 
-const INDEX = ['一', '二', '三'];
-const htList = reactive([]);
-htList.push({
-    id: v4(),
-    time: null,
-    content: null,
+const {form} = defineProps({
+    form: {
+        type: Object,
+        default: {}
+    }
 });
-const emits = defineEmits(['success']);
+const INDEX = ['一', '二', '三'];
+const emits = defineEmits(['success', 'prev']);
 const po = reactive({
-    name: null,
+    start_time: null,
+    end_time: null,
+    is_other: 0,
+    backfill: []
+});
+
+po.backfill.push({
+    id: v4(),
+    start_time: null,
+    end_time: null,
+    content_id: null
 });
 
 const addHT = () => {
-    htList.push({
+    po.backfill.push({
         id: v4(),
-        time: null,
-        content: null,
+        start_time: null,
+        end_time: null,
+        content_id: null
     });
 }
 
@@ -39,10 +49,10 @@ const success = () => {
             class="mt-[30px]"
             :model="po"
             label-align="right"
-            :label-col-props="{span: 3}"
+            :label-col-props="{span: 4}"
             :wrapper-col-props="{span: 12, offset: 1}">
             <a-form-item label="任务可接时间段" extra="达人可在此时段内接受任务，超出将无法领取任务">
-                <a-time-picker type="time-range"></a-time-picker>
+                <x-time-picker v-model:start="po.start_time" v-model:end="po.end_time"></x-time-picker>
             </a-form-item>
 
             <a-form-item extra="*达人未回传，但不能确定素材是否被发布">
@@ -53,18 +63,18 @@ const success = () => {
                     </div>
                 </template>
 
-                <a-radio-group v-model:model-value="po.name" direction="vertical">
-                    <a-radio value="0">该子任务不可被其他达人可领取</a-radio>
-                    <a-radio value="1">该子任务可被其他达人可领取</a-radio>
+                <a-radio-group v-model:model-value="po.is_other" direction="vertical">
+                    <a-radio :value="0">该子任务不可被其他达人可领取</a-radio>
+                    <a-radio :value="1">该子任务可被其他达人可领取</a-radio>
                 </a-radio-group>
             </a-form-item>
-
+            
             <a-form-item
-                v-for="(item, index) in htList"
+                v-for="(item, index) in po.backfill"
                 :key="item.id"
                 :label="`第${INDEX[index]}次回填`">
                 <div class="flex flex-col gap-[20px]">
-                    <Backfill></Backfill>
+                    <Backfill :form="form" v-model:po="po.backfill[index]"></Backfill>
 
                     <div class="flex gap-[8px]">
                         <a-button type="outline">
@@ -74,8 +84,8 @@ const success = () => {
                             查看指引
                         </a-button>
                         <a-button
-                            v-if="htList.length > 1"
-                            @click="htList.splice(index, 1)"
+                            v-if="po.backfill.length > 1"
+                            @click="po.backfill.splice(index, 1)"
                             type="outline"
                             status="danger">
                             <template #icon>
@@ -84,7 +94,7 @@ const success = () => {
                             删除
                         </a-button>
                         <a-button
-                            v-if="htList.length < 3 && htList.length === index + 1"
+                            v-if="po.backfill.length < 3 && po.backfill.length === index + 1"
                             @click="addHT"
                             type="outline">
                             <template #icon>
@@ -97,6 +107,7 @@ const success = () => {
             </a-form-item>
 
             <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-form-item>
         </a-form>
diff --git a/src/pages/merchant/pages/task-center/components/new-task-5.vue b/src/pages/merchant/pages/task-center/components/new-task-5.vue
index 58e182f..37bfb16 100644
--- a/src/pages/merchant/pages/task-center/components/new-task-5.vue
+++ b/src/pages/merchant/pages/task-center/components/new-task-5.vue
@@ -1,13 +1,24 @@
 <script setup>
 import FormTitle from "../../../../../components/FormTitle/index.vue";
 import {reactive} from "vue";
-import MinutesHoursRadio from "../../../../../components/MinutesHoursRadio/index.vue";
 import Api from "../../../../../api/index.js";
 import XSelect from "../../../../../components/XSelect/index.vue";
 
-const emits = defineEmits(['success']);
+const emits = defineEmits(['success', 'prev']);
+const {form} = defineProps({
+    form: {
+        type: Object,
+        default: {}
+    }
+});
 const po = reactive({
-    name: null,
+    retention_time: null,
+    retention_type: 0,
+    check_time: null,
+    check_type: 0,
+    back_id: null,
+    back_time: null,
+    back_type: 0,
 });
 
 const success = () => {
@@ -26,18 +37,20 @@ const success = () => {
             :label-col-props="{span: 3}"
             :wrapper-col-props="{span: 12, offset: 1}">
             <a-form-item label="保留时间" extra="达人发布成功后，该内容需要保留多久才可删除">
-                <a-input placeholder="请输入保留时间"></a-input>
-                <a-radio-group type="button" class="ml-[10px] flex-shrink-0">
-                    <a-radio value="0">分钟</a-radio>
-                    <a-radio value="1">小时</a-radio>
+                <a-input-number v-model:model-value="po.retention_time" placeholder="请输入保留时间" :min="1"
+                                :max="60"></a-input-number>
+                <a-radio-group v-model:model-value="po.retention_type" type="button" class="ml-[10px] flex-shrink-0">
+                    <a-radio :value="0">分钟</a-radio>
+                    <a-radio :value="1">小时</a-radio>
                 </a-radio-group>
             </a-form-item>
 
             <a-form-item label="审核时间" extra="商家收到每次回填后，多长时间内审核">
-                <a-input placeholder="请输入保留时间"></a-input>
-                <a-radio-group type="button" class="ml-[10px] flex-shrink-0">
-                    <a-radio value="0">分钟</a-radio>
-                    <a-radio value="1">小时</a-radio>
+                <a-input-number v-model:model-value="po.check_time" placeholder="请输入保留时间" :min="1"
+                                :max="60"></a-input-number>
+                <a-radio-group v-model:model-value="po.check_type" type="button" class="ml-[10px] flex-shrink-0">
+                    <a-radio :value="0">分钟</a-radio>
+                    <a-radio :value="1">小时</a-radio>
                 </a-radio-group>
             </a-form-item>
 
@@ -48,24 +61,26 @@ const success = () => {
                             达人回传
                             <XSelect
                                 class="mx-[6px]"
-                                v-model:model-value="po.name"
-                                :api="Api.system.getSelect">
+                                :api-po="{id: form.platform_id}"
+                                v-model:model-value="po.back_id"
+                                :api="Api.merchant.getChooseContent">
                             </XSelect>
                             且审核通过
                         </a-form-item>
                         <a-form-item label="结算时间">
-                            <a-input placeholder="请说入时间"></a-input>
-                            <MinutesHoursRadio class="ml-[10px]"></MinutesHoursRadio>
+                            <a-input v-model:model-value="po.back_time" placeholder="请说入时间"></a-input>
+                            <a-radio-group v-model:model-value="po.back_type" type="button"
+                                           class="ml-[10px] flex-shrink-0">
+                                <a-radio :value="0">分钟</a-radio>
+                                <a-radio :value="1">小时</a-radio>
+                            </a-radio-group>
                         </a-form-item>
                     </a-form>
                 </div>
-                <a-radio-group type="button" class="ml-[10px] flex-shrink-0" style="visibility: hidden">
-                    <a-radio value="0">分钟</a-radio>
-                    <a-radio value="1">小时</a-radio>
-                </a-radio-group>
             </a-form-item>
 
             <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-form-item>
         </a-form>
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 e2154e1..5abbc06 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
@@ -1,27 +1,37 @@
 <script setup>
-import Api from "../../../../../api/index.js";
-import XSelect from "../../../../../components/XSelect/index.vue";
 import FormTitle from "../../../../../components/FormTitle/index.vue";
-import {reactive} from "vue";
+import {onMounted, reactive} from "vue";
 import {v4} from "uuid";
+import Api from "../../../../../api/index.js";
 
-const htList = reactive([]);
-const emits = defineEmits(['success']);
+const settltment_after_list = reactive([]);
+const emits = defineEmits(['success', 'prev']);
 const po = reactive({
-    name: null,
+    settltment_before: [{
+        id: v4(),
+        intro: null,
+        ratio: null,
+    }],
 });
 
 const addHT = () => {
-    htList.push({
+    po.settltment_before.push({
         id: v4(),
-        select: null,
-        money: null,
+        intro: null,
+        ratio: null,
     });
 }
 
 const success = () => {
     emits('success', po);
 }
+
+onMounted(() => {
+    Api.merchant.getSettlementAfter().then(({data}) => {
+        settltment_after_list.length = 0;
+        settltment_after_list.push(...data);
+    });
+})
 </script>
 
 <template>
@@ -37,33 +47,30 @@ const success = () => {
 
             <a-form-item label="结算前">
                 <div class="w-full flex justify-between">
-                    <div class="max-w-[500px] info" v-if="!htList.length>0">
+                    <div class="max-w-[500px] info" v-if="!po.settltment_before.length>0">
                         *哪种情况少结算，及对应的扣除比例（当天发其他广告、未按照要求评论、未按照要求回填）建议最少设置一个未按要求发布作品，扣款100%的要求
                     </div>
 
-                    <template v-if="htList.length>0">
+                    <template v-if="po.settltment_before.length>0">
                         <div class="flex flex-col gap-[20px] w-full">
-                            <div v-for="(item, index) in htList" :key="item.id"
+                            <div v-for="(item, index) in po.settltment_before" :key="item.id"
                                  class="flex items-center whitespace-nowrap gap-[5px] w-full justify-between">
                                 当
-                                <XSelect
-                                    class="w-auto"
-                                    v-model:model-value="po.name"
-                                    :api="Api.system.getSelect">
-                                </XSelect>
+                                <a-auto-complete v-model:model-value="item.intro"></a-auto-complete>
                                 时，扣除
-                                <a-input-number class="w-[150px]"></a-input-number>
+                                <a-input-number class="w-[150px]" v-model:model-value="item.ratio"></a-input-number>
                                 %金额
 
                                 <div class="ml-auto flex gap-[8px]">
-                                    <a-button @click="htList.splice(index, 1)" type="outline" status="danger">
+                                    <a-button @click="po.settltment_before.splice(index, 1)" type="outline"
+                                              status="danger">
                                         <template #icon>
                                             <icon-minus/>
                                         </template>
                                         删除
                                     </a-button>
                                     <a-button
-                                        :style="{visibility: htList.length === index+1 ? 'visible' : 'hidden'}"
+                                        :style="{visibility: po.settltment_before.length === index+1 && po.settltment_before.length < 4 ? 'visible' : 'hidden'}"
                                         @click="addHT"
                                         type="outline">
                                         <template #icon>
@@ -77,22 +84,20 @@ const success = () => {
                     </template>
 
 
-                    <a-button v-if="!htList.length>0" @click="addHT" type="outline">添加</a-button>
+                    <a-button v-if="!po.settltment_before.length>0" @click="addHT" type="outline">添加</a-button>
                 </div>
             </a-form-item>
 
             <a-form-item label="结算后" extra="*如有其他要求，可联系管理员添加">
                 <div class="max-w-[618px]">
                     <a-checkbox-group>
-                        <a-checkbox value="1">未到约定期限，达人提前删除视频处罚 ，扣除1点达人信用分</a-checkbox>
-                        <a-checkbox value="0">
-                            约定期限内，达人不配合删除或者维护评论区，扣除1点达人信用分（需支付额外费用，只保证达人愿意配合）
-                        </a-checkbox>
+                        <a-checkbox v-for="v in settltment_after_list" :value="v.id">{{ v.name }}</a-checkbox>
                     </a-checkbox-group>
                 </div>
             </a-form-item>
 
             <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-form-item>
         </a-form>
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 ae6ca14..ff8f9e2 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,11 +1,8 @@
 <script setup>
-import Api from "../../../../../api/index.js";
-import XSelect from "../../../../../components/XSelect/index.vue";
 import FormTitle from "../../../../../components/FormTitle/index.vue";
-import {reactive} from "vue";
-import {v4} from "uuid";
+import {toPath} from "../../../../../utils/index.js";
 
-const emits = defineEmits(['success']);
+const emits = defineEmits(['success', 'init']);
 
 const success = () => {
     emits('success', po);
@@ -19,8 +16,8 @@ const success = () => {
         <a-result title="创建成功" subtitle="任务创建成功" status="success">
             <template #extra>
                 <a-space>
-                    <a-button type="secondary">查看任务</a-button>
-                    <a-button type="primary">再次创建</a-button>
+                    <a-button type="secondary" @click="toPath('/home/task-center/reward-mission')">查看任务</a-button>
+                    <a-button type="primary" @click="emits('init')">再次创建</a-button>
                 </a-space>
             </template>
         </a-result>
diff --git a/src/pages/merchant/pages/task-center/new-task.vue b/src/pages/merchant/pages/task-center/new-task.vue
index f66ccc9..edf5e57 100644
--- a/src/pages/merchant/pages/task-center/new-task.vue
+++ b/src/pages/merchant/pages/task-center/new-task.vue
@@ -1,5 +1,5 @@
 <script setup>
-import {ref, reactive} from 'vue';
+import {reactive, ref} from 'vue';
 import NewTask1 from "./components/new-task-1.vue";
 import NewTask2 from "./components/new-task-2.vue";
 import NewTask3 from "./components/new-task-3.vue";
@@ -8,14 +8,25 @@ 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 Api from "../../../../api/index.js";
+import {deleteObjectFields} from "../../../../utils/index.js";
 
 const routes = useRoute();
-const step = ref(1);
+const step = ref(7);
 const form = reactive({});
 
+const init = () => {
+    step.value = 1;
+    deleteObjectFields(form);
+}
+
 const success = async (po) => {
     Object.assign(form, po);
 
+    if (step.value === 6) {
+        const {data} = await Api.merchant.createTask(form);
+    }
+
     if (step.value < 8) {
         step.value++;
     }
@@ -24,11 +35,13 @@ const success = async (po) => {
 
 <template>
     <div class="mb-[20px]">
-        <a-breadcrumb :routes="[{path: '/', label: '任务中心'}, {path: '/', label: '悬赏任务'}, {path: '/', label: '新建任务'}]">
+        <a-breadcrumb
+            :routes="[{path: '/', label: '任务中心'}, {path: '/', label: '悬赏任务'}, {path: '/', label: '新建任务'}]">
         </a-breadcrumb>
     </div>
 
     <div class="mock-card mb-[20px]">
+        {{ form }}
         <a-steps :current="step">
             <a-step>任务简介</a-step>
             <a-step>发布管理</a-step>
@@ -42,12 +55,12 @@ const success = async (po) => {
 
     <a-card class="flex-grow text-[14px]">
         <new-task1 v-if="step === 1" @success="success"></new-task1>
-        <new-task2 v-if="step === 2" @success="success"></new-task2>
-        <new-task3 v-if="step === 3" @success="success"></new-task3>
-        <new-task4 v-if="step === 4" @success="success"></new-task4>
-        <new-task5 v-if="step === 5" @success="success"></new-task5>
-        <new-task6 v-if="step === 6" @success="success"></new-task6>
-        <new-task7 v-if="step === 7" @success="success"></new-task7>
+        <new-task2 v-if="step === 2" @success="success" @prev="step--"></new-task2>
+        <new-task3 v-if="step === 3" @success="success" @prev="step--"></new-task3>
+        <new-task4 v-if="step === 4" @success="success" @prev="step--" :form="form"></new-task4>
+        <new-task5 v-if="step === 5" @success="success" @prev="step--" :form="form"></new-task5>
+        <new-task6 v-if="step === 6" @success="success" @prev="step--"></new-task6>
+        <new-task7 v-if="step === 7" @success="success" @init="init"></new-task7>
     </a-card>
 </template>
 
diff --git a/src/pages/merchant/pages/task-center/reward-mission.vue b/src/pages/merchant/pages/task-center/reward-mission.vue
index 0417db5..9fe9348 100644
--- a/src/pages/merchant/pages/task-center/reward-mission.vue
+++ b/src/pages/merchant/pages/task-center/reward-mission.vue
@@ -1,5 +1,5 @@
 <script setup>
-import {reactive, computed} from 'vue';
+import {computed, reactive} from 'vue';
 import Filter from "../../../../components/Filter/index.vue";
 import TooltipTag from "../../../../components/TooltipTag/index.vue";
 import useTableQuery from "../../../../hooks/useTableQuery.js";
@@ -9,11 +9,11 @@ import {toPath} from "../../../../utils/index.js";
 const columns = [
     {
         title: '任务编号',
-        dataIndex: 'name',
+        dataIndex: 'code',
     },
     {
         title: '任务名称',
-        dataIndex: 'name',
+        dataIndex: 'goods_name',
     },
     {
         title: '发布渠道',
@@ -21,7 +21,7 @@ const columns = [
     },
     {
         title: '创建时间',
-        dataIndex: 'name',
+        dataIndex: 'createtime',
     },
     {
         title: '当前状态',
@@ -30,7 +30,7 @@ const columns = [
     },
     {
         title: '子任务进度',
-        dataIndex: 'name',
+        dataIndex: 'end_ratio',
     },
     {
         title: '消耗金额',
@@ -56,63 +56,35 @@ const columns = [
 ];
 const FilterConfig = computed(() => [
     {
-        key: 'wd',
+        key: 'code',
         type: 'input',
         label: '任务编号',
         placeholder: '请输入集合编号'
     },
     {
-        key: 'wd',
+        key: 'name',
         type: 'input',
         label: '任务名称',
         placeholder: '请输入集合名称'
     },
     {
-        key: 'wd',
+        key: 'platform',
         type: 'select',
         label: '任务渠道',
         placeholder: '全部',
-        api: async () => ({
-            data: [
-                {
-                    name: '选项一',
-                    id: 1,
-                },
-                {
-                    name: '选项二',
-                    id: 2,
-                },
-                {
-                    name: '选项三',
-                    id: 3,
-                },
-            ]
-        })
+        api: async () => Api.merchant.getTaskPlatformList(),
     },
     {
-        key: 'wd',
+        key: 'status',
         type: 'select',
         label: '任务状态',
         placeholder: '全部',
-        api: async () => ({
-            data: [
-                {
-                    name: '选项一',
-                    id: 1,
-                },
-                {
-                    name: '选项二',
-                    id: 2,
-                },
-                {
-                    name: '选项三',
-                    id: 3,
-                },
-            ]
-        })
+        api: async () => Api.merchant.getTaskStatusList(),
     },
     {
-        key: 'wd',
+        key: 'datetime',
+        start: 'start_time',
+        end: 'end_time',
         type: 'datetime',
         label: '创建时间',
         placeholder: '全部',
@@ -129,10 +101,9 @@ const po = reactive({
 
 const {loading, pagination, initFetchData} = useTableQuery({
     parameter: po,
-    api: Api.system.getData,
+    api: Api.merchant.getTaskList,
     callback: (data) => {
         Object.assign(vo, data);
-        console.log(vo);
     }
 });
 </script>
@@ -147,7 +118,7 @@ const {loading, pagination, initFetchData} = useTableQuery({
                 <template #icon>
                     <icon-plus/>
                 </template>
-                新建子任务
+                新建任务
             </a-button>
             <a-button>
                 <template #icon>
@@ -167,22 +138,26 @@ const {loading, pagination, initFetchData} = useTableQuery({
                 :pagination="pagination">
                 <template v-slot:status="{record}">
                     <TooltipTag v-if="record.status === 0" color="cyan">待完善</TooltipTag>
-                    <TooltipTag v-if="record.status === 1" color="red">未通过</TooltipTag>
+                    <TooltipTag v-if="record.status === 1" color="red">审核中</TooltipTag>
+                    <TooltipTag v-if="record.status === -1" color="red">未通过</TooltipTag>
                     <TooltipTag v-if="record.status === 2" color="magenta">请完善子任务</TooltipTag>
                     <TooltipTag v-if="record.status === 3" color="magenta">待付款</TooltipTag>
                     <TooltipTag v-if="record.status === 4" color="blue">投放中</TooltipTag>
-                    <TooltipTag v-if="record.status === 5" color="orangered">暂停中</TooltipTag>
-                    <TooltipTag v-if="record.status === 6" color="purple">终止</TooltipTag>
-                    <TooltipTag v-if="record.status === 7" color="green">已完成</TooltipTag>
+                    <TooltipTag v-if="record.status === -2" color="orangered">暂停中</TooltipTag>
+                    <TooltipTag v-if="record.status === -3" color="purple">终止</TooltipTag>
+                    <TooltipTag v-if="record.status === 5" color="green">已完成</TooltipTag>
                 </template>
                 <template v-slot:start="{record}">
-                    <a-switch></a-switch>
+                    <a-switch
+                        :disabled="record.status !== -2 || record.status !== 3"
+                        :model-value="record.status === 4">
+                    </a-switch>
                 </template>
-                <template v-slot:money>
+                <template v-slot:money="{record}">
                     <div class="flex flex-col gap-[8px]">
-                        <div>120.00 / 600.00（元）</div>
+                        <div>{{ record.end_money.toFixed(2) }} / {{ record.total.toFixed(2) }}（元）</div>
                         <a-progress
-                            :percent="200/600"
+                            :percent="record.end_money/record.total"
                             :show-text="false">
                         </a-progress>
                     </div>
diff --git a/src/pinia/SystemStore/index.js b/src/pinia/SystemStore/index.js
index 5b8521f..7204dbe 100644
--- a/src/pinia/SystemStore/index.js
+++ b/src/pinia/SystemStore/index.js
@@ -25,9 +25,16 @@ export const useSystemStore = defineStore("SystemStore", () => {
         isRoot.value = _isRoot;
 
         RoutesTemp.value.length = 0;
+
         // 请求资源 mockRoutes
-        const {data} = await Api.admin.getMenu();
-        RoutesTemp.value.push(...data);
+        if (isRoot.value) { // root
+            const {data} = await Api.admin.getMenu();
+            RoutesTemp.value.push(...data);
+        } else {
+            const {data} = await Api.merchant.getMenu();
+            RoutesTemp.value.push(...data);
+        }
+
         await installRoute();
     }
 
diff --git a/src/pinia/SystemStore/mock.js b/src/pinia/SystemStore/mock.js
index 61d5a63..eb67bd8 100644
--- a/src/pinia/SystemStore/mock.js
+++ b/src/pinia/SystemStore/mock.js
@@ -26,7 +26,6 @@ const mockRoutes1 = [
                 icon: '',
                 meta: {
                     name: '任务指派',
-                    hidden: true,
                 },
                 component: 'appointed-task',
             },
diff --git a/src/pinia/UserStore/index.js b/src/pinia/UserStore/index.js
index 2e8481f..e4e6c6b 100644
--- a/src/pinia/UserStore/index.js
+++ b/src/pinia/UserStore/index.js
@@ -21,7 +21,13 @@ export const useUserStore = defineStore("UserStore", () => {
                 Object.assign(data, _data);
             }
         } else { // 商户
-
+            if (form.code) {
+                // const {data: _data} = await Api.admin.phoneLogin(form);
+                // Object.assign(data, _data);
+            } else {
+                const {data: _data} = await Api.merchant.login(form);
+                Object.assign(data, _data);
+            }
         }
         // 修改状态
         isLogin.value = true;
diff --git a/src/utils/index.js b/src/utils/index.js
index 24ca6b9..32ec61f 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -7,3 +7,9 @@ export const toPath = (path) => {
 export const VITE_TINYMCE_KEY = () => {
     return import.meta.env.VITE_TINYMCE_KEY;
 }
+
+export const deleteObjectFields = (obj) => {
+    Object.keys(obj).forEach(key => {
+        delete obj[key];
+    });
+}