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 @@ + + + + 立即充值 + + + + 平台提示:支付后未出现成功提示,点击【我已支付】刷新充值状态 + + + + 支付金额: 200元 + + 打开支付宝扫描下方二维码支付 + + + + + + + 点击刷新 + + 我已支付 + + + + 支付遇到问题? + 1、请先确认第三方支付网站是否交易完成。 + 2、第三方支付网站显示交易成功,但账户中没有充值流水,请私聊客服 + + + + + + + + + 支付宝付款¥200.00 + + + + 确定 + + + + + + + + + + + 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 @@ + + + + + + + + 1天 + 3天 + 7天 + 30天 + 永久 + 自定义 + + + + 天 + + + + + + + + + + + + + + + + + + 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 @@ + + + + 查看回填 + + + + + https://baidu.com + + + + + 通过 + + + + + + + + 已通过 + 在此之前完成审核 + 等待回填 + / + + + + + + + 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({ - + - - - - - - - + + + + + + + pagination.current = e" :pagination="pagination" :loading="loading" @@ -134,7 +136,7 @@ const {loading, pagination, initFetchData} = useTableQuery({ - 查看回填 + diff --git a/src/pages/merchant/pages/expert-management/blackout-management.vue b/src/pages/merchant/pages/expert-management/blackout-management.vue index 933b135..b93e56e 100644 --- a/src/pages/merchant/pages/expert-management/blackout-management.vue +++ b/src/pages/merchant/pages/expert-management/blackout-management.vue @@ -1,11 +1,106 @@ + + + + + + + 拉黑管理 + + + pagination.current = e" + :pagination="pagination" + :loading="loading" + :columns="columns"> + + 取消拉黑 + + + + - diff --git a/src/pages/merchant/pages/expert-management/effect-management.vue b/src/pages/merchant/pages/expert-management/effect-management.vue index 80c552c..a59c669 100644 --- a/src/pages/merchant/pages/expert-management/effect-management.vue +++ b/src/pages/merchant/pages/expert-management/effect-management.vue @@ -1,11 +1,111 @@ + + + + + + + 效果管理 + + + pagination.current = e" + :pagination="pagination" + :loading="loading" + :columns="columns"> + + 已生效 + 审核中 + 达人申诉成功 + 已拒绝 + + + + 撤销 + + + + - diff --git a/src/pages/merchant/pages/expert-management/index.vue b/src/pages/merchant/pages/expert-management/index.vue index ba6a978..7894268 100644 --- a/src/pages/merchant/pages/expert-management/index.vue +++ b/src/pages/merchant/pages/expert-management/index.vue @@ -1,11 +1,25 @@ + + + + + - diff --git a/src/pages/merchant/pages/my-wallet/components/Recharge.vue b/src/pages/merchant/pages/my-wallet/components/Recharge.vue new file mode 100644 index 0000000..0440ab1 --- /dev/null +++ b/src/pages/merchant/pages/my-wallet/components/Recharge.vue @@ -0,0 +1,41 @@ + + + + + + 1.该金额将会充值到钱包,创建任务时,将优先使用钱包内的余额。 + 2.若遇到充值未到账,请联系客服 + + + + + + + + + + + + + + diff --git a/src/pages/merchant/pages/my-wallet/components/Reflect.vue b/src/pages/merchant/pages/my-wallet/components/Reflect.vue new file mode 100644 index 0000000..74be1ef --- /dev/null +++ b/src/pages/merchant/pages/my-wallet/components/Reflect.vue @@ -0,0 +1,32 @@ + + + + + + 1.打款时间:工作日11:00-19:00。双休日和法定节假日期间,需要等正常上班之后处理。 + 2.提现门槛:余额满1元即可提现 + 3.提现账户:最多可设置6个提现账户,超出请删除再进行添加 + 4.提示:如果填写的提现账户信息不正确,提现将无法成功 + + + + diff --git a/src/pages/merchant/pages/my-wallet/index.vue b/src/pages/merchant/pages/my-wallet/index.vue index 6de5ffd..230c663 100644 --- a/src/pages/merchant/pages/my-wallet/index.vue +++ b/src/pages/merchant/pages/my-wallet/index.vue @@ -4,8 +4,23 @@ + + + + + - diff --git a/src/pages/merchant/pages/my-wallet/moving-account-details.vue b/src/pages/merchant/pages/my-wallet/moving-account-details.vue index e736374..97555d1 100644 --- a/src/pages/merchant/pages/my-wallet/moving-account-details.vue +++ b/src/pages/merchant/pages/my-wallet/moving-account-details.vue @@ -4,6 +4,15 @@ + + + + + + + + diff --git a/src/pages/merchant/pages/my-wallet/reflect.vue b/src/pages/merchant/pages/my-wallet/reflect.vue deleted file mode 100644 index 395edb6..0000000 --- a/src/pages/merchant/pages/my-wallet/reflect.vue +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/src/pages/merchant/pages/my-wallet/wallet-overview.vue b/src/pages/merchant/pages/my-wallet/wallet-overview.vue new file mode 100644 index 0000000..d648a86 --- /dev/null +++ b/src/pages/merchant/pages/my-wallet/wallet-overview.vue @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 充值记录 + pagination.current = e" + :pagination="pagination" + :data="vo.rows" + :loading="loading" + :columns="columns"> + + + + + + diff --git a/src/pages/merchant/pages/task-center/components/RefuseModal.vue b/src/pages/merchant/pages/task-center/components/RefuseModal.vue new file mode 100644 index 0000000..0f152c9 --- /dev/null +++ b/src/pages/merchant/pages/task-center/components/RefuseModal.vue @@ -0,0 +1,58 @@ + + + + 拒绝 + + + 平台提示:所有沟通内容均由人工审核,请勿脱离平台交易,请勿发送违规内容,违者... + + + + + + + + + + 下一步 + + + + + + + + diff --git a/src/pages/merchant/pages/task-center/components/refuse-modal-form1.vue b/src/pages/merchant/pages/task-center/components/refuse-modal-form1.vue new file mode 100644 index 0000000..e27e792 --- /dev/null +++ b/src/pages/merchant/pages/task-center/components/refuse-modal-form1.vue @@ -0,0 +1,52 @@ + + + + + + + + 标题错误 + 评论区未见评论 + 素材发布错误 + 访问链接看不到作品 + 话题携带错误 + + + + + + + 少结算或者不结算理由 + 当天发布任意广告 + 当天发布竞品广告 + + + + + + + + + + + + + + + diff --git a/src/pages/merchant/pages/task-center/components/refuse-modal-form2.vue b/src/pages/merchant/pages/task-center/components/refuse-modal-form2.vue new file mode 100644 index 0000000..12ce7dd --- /dev/null +++ b/src/pages/merchant/pages/task-center/components/refuse-modal-form2.vue @@ -0,0 +1,85 @@ + + + + + + + 是 + 否(拒绝达人本次回填,也无需达人进行后续的回填) + + + + + + + + 请截图账号主页截图,证明发布了该素材 + 请删除后,按要求重新发布素材 + 请删除现有评论,按要求重新发布评论 + 其他 + + + + + + + + + + + + + + + 是 请最晚于 + + + 之前,完成重新回填 + + 如果给达人提供的修改建议导致回填数据有变动,请点击此项 + + + 否 请最晚于 + + + 之前,在我的回填中回复 + + + + + + + + + + diff --git a/src/pages/merchant/pages/task-center/index.vue b/src/pages/merchant/pages/task-center/index.vue index 3a2052a..aec8323 100644 --- a/src/pages/merchant/pages/task-center/index.vue +++ b/src/pages/merchant/pages/task-center/index.vue @@ -1,12 +1,4 @@ @@ -21,11 +13,13 @@ onMounted(() => { diff --git a/src/pages/merchant/pages/task-center/look-min-task.vue b/src/pages/merchant/pages/task-center/look-min-task.vue new file mode 100644 index 0000000..67a1127 --- /dev/null +++ b/src/pages/merchant/pages/task-center/look-min-task.vue @@ -0,0 +1,178 @@ + + + + + + + + + + + + + + + + 批量管理素材 + + + pagination.current = e" + :pagination="pagination" + :span-method="spanMethod" + :loading="loading" + :columns="columns" + class="w-full mt-[20px]"> + + 已领取 + 请重新上传素材 + 素材审核中 + 待领取 + 已终止 + + + + + + 通过 + + + + + + + + + + + 已通过 + 在此之前完成审核 + 等待回填 + / + + + + + + + + 确认结算 + + + + + + 确认结算 + + + + + + 查看素材 + + + 更多 + + + + 效果管理 + 终止子任务 + 拉黑达人 + + + + + + + + + + + + diff --git a/src/pages/merchant/pages/task-center/new-task.vue b/src/pages/merchant/pages/task-center/new-task.vue index 1d30ddd..f66ccc9 100644 --- a/src/pages/merchant/pages/task-center/new-task.vue +++ b/src/pages/merchant/pages/task-center/new-task.vue @@ -7,7 +7,9 @@ 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"; +const routes = useRoute(); const step = ref(1); const form = reactive({}); @@ -22,14 +24,11 @@ const success = async (po) => { - - 任务中心 - 悬赏任务 - 新建任务 + - + 任务简介 发布管理 diff --git a/src/pages/merchant/pages/task-center/reward-mission.vue b/src/pages/merchant/pages/task-center/reward-mission.vue index 67cebbf..98d2b1a 100644 --- a/src/pages/merchant/pages/task-center/reward-mission.vue +++ b/src/pages/merchant/pages/task-center/reward-mission.vue @@ -138,24 +138,24 @@ const {loading, pagination, initFetchData} = useTableQuery({ - - - - - - - 新建子任务 - - - - - - 从模板快速创建 - - + + + + + + 新建子任务 + + + + + + 从模板快速创建 + + + 编辑 - 查看子任务 + 查看子任务 + 终止 diff --git a/src/pinia/SystemStore/mock.js b/src/pinia/SystemStore/mock.js index 3455427..b59e1ad 100644 --- a/src/pinia/SystemStore/mock.js +++ b/src/pinia/SystemStore/mock.js @@ -25,7 +25,8 @@ const mockRoutes = [ title: '任务指派', icon: '', meta: { - name: '任务指派' + name: '任务指派', + hidden: true, }, component: 'appointed-task', }, @@ -39,6 +40,17 @@ const mockRoutes = [ hidden: true, }, component: 'new-task', + }, + { + path: 'look-min-task', + name: 'look-min-task', + title: '查看子任务', + icon: '', + meta: { + name: '查看子任务', + hidden: true, + }, + component: 'look-min-task', } ] }, @@ -51,7 +63,81 @@ const mockRoutes = [ name: '沟通中心' }, component: 'communication-center', - } + }, + { + path: 'expert-management', + name: 'expert-management', + title: '达人管理', + icon: '', + meta: { + name: '达人管理' + }, + component: 'expert-management', + children: [ + { + path: 'blackout-management', + name: 'blackout-management', + title: '拉黑管理', + icon: '', + meta: { + name: '拉黑管理' + }, + component: 'blackout-management', + }, + { + path: 'effect-management', + name: 'effect-management', + title: '效果管理', + icon: '', + meta: { + name: '效果管理' + }, + component: 'effect-management', + }, + ] + }, + { + path: 'data-board', + name: 'data-board', + title: '数据看板', + icon: '', + meta: { + name: '数据看板' + }, + component: 'data-board', + }, + { + path: 'my-wallet', + name: 'my-wallet', + title: '我的钱包', + icon: '', + meta: { + name: '我的钱包' + }, + component: 'my-wallet', + children: [ + { + path: 'wallet-overview', + name: 'wallet-overview', + title: '概览', + icon: '', + meta: { + name: '概览' + }, + component: 'wallet-overview', + }, + { + path: 'moving-account-details', + name: 'moving-account-details', + title: '动账明细', + icon: '', + meta: { + name: '动账明细' + }, + component: 'moving-account-details', + }, + ] + }, ]; export default mockRoutes; diff --git a/src/router/routes-map.js b/src/router/routes-map.js index 5c8f51a..13191f6 100644 --- a/src/router/routes-map.js +++ b/src/router/routes-map.js @@ -3,8 +3,17 @@ const routesMap = { 'reward-mission': () => import('../pages/merchant/pages/task-center/reward-mission.vue'), 'appointed-task': () => import('../pages/merchant/pages/task-center/appointed-task.vue'), 'new-task': () => import('../pages/merchant/pages/task-center/new-task.vue'), + 'look-min-task': () => import('../pages/merchant/pages/task-center/look-min-task.vue'), 'communication-center': () => import('../pages/merchant/pages/communication-center/index.vue'), + + 'expert-management': () => import('../pages/merchant/pages/expert-management/index.vue'), + 'blackout-management': () => import('../pages/merchant/pages/expert-management/blackout-management.vue'), + 'effect-management': () => import('../pages/merchant/pages/expert-management/effect-management.vue'), + + 'my-wallet': () => import('../pages/merchant/pages/my-wallet/index.vue'), + 'wallet-overview': () => import('../pages/merchant/pages/my-wallet/wallet-overview.vue'), + 'moving-account-details': () => import('../pages/merchant/pages/my-wallet/moving-account-details.vue'), }; export default routesMap; diff --git a/src/scss/global.scss b/src/scss/global.scss index dac93f3..13852d6 100644 --- a/src/scss/global.scss +++ b/src/scss/global.scss @@ -1,27 +1,33 @@ :root { --main-bg-color: rgb(247, 248, 250); } + * { margin: 0; padding: 0; font-family: "PingFang SC", serif; } + body { background-color: var(--main-bg-color); } + .test { border: 1px solid red; } + .demo-basic { // 默认下拉框样式 - padding: 5px; - width: auto; - background-color: var(--color-bg-popup); - border-radius: 4px; - box-shadow: 0 2px 8px 0 rgba(0, 0, 0, 0.15); + padding: 5px; + width: auto; + background-color: var(--color-bg-popup); + border-radius: 4px; + box-shadow: 0 2px 8px 0 rgba(0, 0, 0, 0.15); } + .arco-btn-text { color: var(--color-text-2) !important; } + #Item-View { @apply flex flex-col p-[20px] min-h-full overflow-auto; .arco-card { @@ -29,7 +35,7 @@ body { .arco-card-body { @apply min-h-full flex flex-col p-[20px] flex-grow; .arco-table-container { - @apply min-h-full; + @apply h-full; .arco-table-element { @apply min-h-full; } @@ -37,3 +43,9 @@ body { } } } +.mock-card { + @apply p-[20px] bg-[#fff]; + border: 1px solid var(--color-neutral-3); + border-radius: var(--border-radius-small); + box-shadow: box-shadow .2s cubic-bezier(0, 0, 1, 1); +}