diff --git a/package.json b/package.json index c07fe02..46c1d78 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "version": "0.0.1", "type": "module", "scripts": { - "dev": "vite", + "dev": "vite --mode=production", "build": "vite build --mode=production", "preview": "vite preview", "commit": "git add . && git commit -m 'update' && git push" diff --git a/src/pages/merchant/pages/task-center/components/Backfill.vue b/src/pages/merchant/pages/task-center/components/Backfill.vue index 8aebbd1..1d91042 100644 --- a/src/pages/merchant/pages/task-center/components/Backfill.vue +++ b/src/pages/merchant/pages/task-center/components/Backfill.vue @@ -2,11 +2,16 @@ import Api from "../../../../../api/index.js"; import XSelect from "../../../../../components/XSelect/index.vue"; import XTimePicker from "../../../../../components/XTimePicker/XTimePicker.vue"; +import {dayjs} from "@arco-design/web-vue/es/_utils/date.js"; -const {form} = defineProps({ +const {form, index} = defineProps({ form: { type: Object, default: {} + }, + index: { + type: Number, + default: null } }); const po = defineModel('po'); @@ -17,7 +22,11 @@ const po = defineModel('po'); - + +
之间
一键快速设置
@@ -26,6 +35,7 @@ const po = defineModel('po'); 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 8c3be92..e38ba73 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 @@ -1,13 +1,50 @@ @@ -17,40 +54,41 @@ const success = () => { - + - + - + - + - + - + - + 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 8c311eb..249af34 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,12 +3,37 @@ import Api from "../../../../../api/index.js"; import XSelect from "../../../../../components/XSelect/index.vue"; import FormTitle from "../../../../../components/FormTitle/index.vue"; import UploadOne from "../../../../../components/upload/UploadOne.vue"; +import {useTemplateRef} from "vue"; +import {Message} from "@arco-design/web-vue"; const emits = defineEmits(['success', 'prev']); const form = defineModel('form'); +const formRef = useTemplateRef('formRef'); +const rules = { + fb_num: [{ + required: true, + message: '发布次数不能为空', + }], + is_identical: [{ + required: true, + message: '请选择每次素材是否相同', + }], + duration: [], + special_text: [], + special_images: [], + choose_area: [], + machine: [], +} -const success = () => { - emits('success', form.value); +const success = async () => { + formRef.value.validate().then((res) => { + if (res) { + const firstKey = Object.keys(res)[0]; + Message.warning(res[firstKey].message); + } else { + emits('success', form.value); + } + }); } @@ -18,10 +43,12 @@ const success = () => { - + { - + 相同 不同 - + { - + - + {{ form.special_images }} - + { - + 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 3f3e146..195114f 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,11 +1,51 @@ @@ -15,7 +55,9 @@ const success = () => { { + for (const v of value) { + if (!v.end_time || !v.start_time || !v.content_id) { + callback('回填内容不完整'); + } + } + } + }], +} -form.value.backfill.push({ +if (form.value.backfill.length === 0) form.value.backfill.push({ id: v4(), start_time: null, end_time: null, content_id: null }); +if (form.value.is_comment === 1) { + Api.merchant.getChooseContent({ + id: form.value.platform_id, + }).then(({data}) => { + const k = data.find(v => v.is_comment === 1); + form.value.backfill[0].content_id = k.id; + }) +} + const addHT = () => { form.value.backfill.push({ id: v4(), @@ -24,8 +58,15 @@ const addHT = () => { }); } -const success = () => { - emits('success', form.value); +const success = async () => { + formRef.value.validate().then((res) => { + if (res) { + const firstKey = Object.keys(res)[0]; + Message.warning(res[firstKey].message); + } else { + emits('success', form.value); + } + }); } @@ -35,11 +76,13 @@ const success = () => { - + @@ -59,10 +102,11 @@ const success = () => {
- +
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 83b23b2..b47fcac 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 @@ -2,12 +2,45 @@ import FormTitle from "../../../../../components/FormTitle/index.vue"; import Api from "../../../../../api/index.js"; import XSelect from "../../../../../components/XSelect/index.vue"; +import {useTemplateRef} from "vue"; +import {Message} from "@arco-design/web-vue"; const emits = defineEmits(['success', 'prev']); const form = defineModel('form'); +const formRef = useTemplateRef('formRef'); +const rules = { + retention_time: [{ + required: true, + message: '保留时间不能为空', + }], + retention_type: [], + check_time: [{ + required: true, + message: '审核时间不能为空', + }], + check_type: [], + back_id: [{ + required: true, + message: '结算条件不能为空', + }], + back_time: [{ + required: true, + message: '结算时间不能为空', + }], + back_type: [], +} -const success = () => { - emits('success', form.value); +if (form.value.backfill[0].content_id) form.value.back_id = form.value.backfill[0].content_id; + +const success = async () => { + formRef.value.validate().then((res) => { + if (res) { + const firstKey = Object.keys(res)[0]; + Message.warning(res[firstKey].message); + } else { + emits('success', form.value); + } + }); } @@ -17,11 +50,13 @@ const success = () => { - + @@ -30,7 +65,7 @@ const success = () => { - + @@ -39,31 +74,28 @@ const success = () => { - +
- - - 达人回传 - - - 且审核通过 - - - - - 分钟 - 小时 - - - + + 达人回传 + + + 且审核通过 + + + + + 分钟 + 小时 + +
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 b568bc1..2b3c5a5 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,13 +1,27 @@