From 68d25085170bb8488284668f4be37a650a266420 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E5=95=A6C=E6=A2=A6?= <15709267061@163.com> Date: Sat, 15 Mar 2025 17:49:02 +0800 Subject: [PATCH] update --- src/components/OriginTag/index.vue | 31 +++ src/pages/layout/index.vue | 2 + src/pages/merchant/components/Alipay.vue | 77 ++++++++ .../components/BlackjackExpertModal.vue | 66 +++++++ .../merchant/components/TerminateTask.js | 62 ++++++ .../components/look-backfill-modal.vue | 63 +++++++ .../pages/communication-center/index.vue | 20 +- .../expert-management/blackout-management.vue | 99 +++++++++- .../expert-management/effect-management.vue | 104 +++++++++- .../pages/expert-management/index.vue | 18 +- .../pages/my-wallet/components/Recharge.vue | 41 ++++ .../pages/my-wallet/components/Reflect.vue | 32 ++++ src/pages/merchant/pages/my-wallet/index.vue | 17 +- .../my-wallet/moving-account-details.vue | 9 + .../merchant/pages/my-wallet/recharge.vue | 11 -- .../merchant/pages/my-wallet/reflect.vue | 11 -- .../pages/my-wallet/wallet-overview.vue | 129 +++++++++++++ .../task-center/components/RefuseModal.vue | 58 ++++++ .../components/refuse-modal-form1.vue | 52 +++++ .../components/refuse-modal-form2.vue | 85 +++++++++ .../merchant/pages/task-center/index.vue | 14 +- .../pages/task-center/look-min-task.vue | 178 ++++++++++++++++++ .../merchant/pages/task-center/new-task.vue | 9 +- .../pages/task-center/reward-mission.vue | 35 ++-- src/pinia/SystemStore/mock.js | 90 ++++++++- src/router/routes-map.js | 9 + src/scss/global.scss | 24 ++- 27 files changed, 1268 insertions(+), 78 deletions(-) create mode 100644 src/components/OriginTag/index.vue create mode 100644 src/pages/merchant/components/Alipay.vue create mode 100644 src/pages/merchant/components/BlackjackExpertModal.vue create mode 100644 src/pages/merchant/components/TerminateTask.js create mode 100644 src/pages/merchant/pages/communication-center/components/look-backfill-modal.vue create mode 100644 src/pages/merchant/pages/my-wallet/components/Recharge.vue create mode 100644 src/pages/merchant/pages/my-wallet/components/Reflect.vue delete mode 100644 src/pages/merchant/pages/my-wallet/recharge.vue delete mode 100644 src/pages/merchant/pages/my-wallet/reflect.vue create mode 100644 src/pages/merchant/pages/my-wallet/wallet-overview.vue create mode 100644 src/pages/merchant/pages/task-center/components/RefuseModal.vue create mode 100644 src/pages/merchant/pages/task-center/components/refuse-modal-form1.vue create mode 100644 src/pages/merchant/pages/task-center/components/refuse-modal-form2.vue create mode 100644 src/pages/merchant/pages/task-center/look-min-task.vue diff --git a/src/components/OriginTag/index.vue b/src/components/OriginTag/index.vue new file mode 100644 index 0000000..e7aed50 --- /dev/null +++ b/src/components/OriginTag/index.vue @@ -0,0 +1,31 @@ + + + + + diff --git a/src/pages/layout/index.vue b/src/pages/layout/index.vue index 8e3d454..18083aa 100644 --- a/src/pages/layout/index.vue +++ b/src/pages/layout/index.vue @@ -29,10 +29,12 @@ import LayoutSider from '../../components/LayoutSider/index.vue'; .fade-enter-active, .fade-leave-active { transition: opacity 0.5s; + position: relative; } .fade-enter-from, .fade-leave-to { opacity: 0; + position: absolute; } diff --git a/src/pages/merchant/components/Alipay.vue b/src/pages/merchant/components/Alipay.vue new file mode 100644 index 0000000..05f2554 --- /dev/null +++ b/src/pages/merchant/components/Alipay.vue @@ -0,0 +1,77 @@ + + + + + + + diff --git a/src/pages/merchant/components/BlackjackExpertModal.vue b/src/pages/merchant/components/BlackjackExpertModal.vue new file mode 100644 index 0000000..77e70de --- /dev/null +++ b/src/pages/merchant/components/BlackjackExpertModal.vue @@ -0,0 +1,66 @@ + + + + + diff --git a/src/pages/merchant/components/TerminateTask.js b/src/pages/merchant/components/TerminateTask.js new file mode 100644 index 0000000..a70f494 --- /dev/null +++ b/src/pages/merchant/components/TerminateTask.js @@ -0,0 +1,62 @@ +import {Modal, Tag} from "@arco-design/web-vue"; +import {h} from 'vue'; + +const ModalContent = { + props: { + status: { + type: String, + default: 'success', + }, + status_text: { + type: String, + default: null, + } + }, + setup(props) { + switch (props.status) { + case 'success': + return () => h('div', {}, [ + h('div', {class: 'flex items-center gap-[8px]'}, [ + h('div', {}, '该子任务状态为:'), + h(Tag, {color: 'orangered'}, props.status_text) + ]), + h('div', {class: 'text-[14px] text-[rgb(78, 89, 105)]'}, '点击终止子任务后,达人将无法再领取子任务') + ]); + case 'warning': + return () => h('div', {}, [ + h('div', {class: 'flex items-center gap-[8px]'}, [ + h('div', {}, '该子任务状态为:'), + h(Tag, {color: 'orangered'}, props.status_text) + ]), + h('div', {class: 'text-[14px] text-[rgb(78, 89, 105)]'}, '无法终止') + ]); + } + } +} + +const openTerminateTask = (type, status_text = '待上传素材') => { + const status = 'success'; + + Modal.warning({ + title: '确认终止子任务', + draggable: true, + hideCancel: false, + content: () => + h( + ModalContent, + { + status: 'success', + status_text: status_text + } + ), + okButtonProps: { + status: 'danger', + }, + okText: status === 'success' ? '确认终止' : '确认', + onOk: () => { + + } + }); +} + +export default openTerminateTask; diff --git a/src/pages/merchant/pages/communication-center/components/look-backfill-modal.vue b/src/pages/merchant/pages/communication-center/components/look-backfill-modal.vue new file mode 100644 index 0000000..fa41c6b --- /dev/null +++ b/src/pages/merchant/pages/communication-center/components/look-backfill-modal.vue @@ -0,0 +1,63 @@ + + + + + diff --git a/src/pages/merchant/pages/communication-center/index.vue b/src/pages/merchant/pages/communication-center/index.vue index b10d373..217cad4 100644 --- a/src/pages/merchant/pages/communication-center/index.vue +++ b/src/pages/merchant/pages/communication-center/index.vue @@ -3,6 +3,7 @@ import Filter from "../../../../components/Filter/index.vue"; import {reactive, computed} from "vue"; import useTableQuery from "../../../../hooks/useTableQuery.js"; import Api from "../../../../api/index.js"; +import LookBackfillModal from "./components/look-backfill-modal.vue"; const columns = [ { @@ -109,19 +110,20 @@ const {loading, pagination, initFetchData} = useTableQuery({