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({