@@ -72,7 +77,14 @@ const success = async () => {
title="添加素材">
已添加{{ targetList.length }}个素材(长摁图片可拖动排序)
-
+
{
const unit = form.type === 0 ? 'minute' : 'hour';
form.startTime = dayjs(startTime).add(form.diff, unit).format('YYYY-MM-DD HH:mm');
- form.endTime = dayjs(endTime).add(form.diff, unit).format('YYYY-MM-DD HH:mm');
+ form.endTime = dayjs(startTime).add((form.diff * 2), unit).format('YYYY-MM-DD HH:mm');
}
const open = () => {
@@ -55,7 +55,8 @@ const success = () => {
v-model:visible="visible">
-
+
@@ -68,8 +69,9 @@ const success = () => {
-
-
+
+
diff --git a/src/pages/merchant/pages/task-center/components/Settlement.vue b/src/pages/merchant/pages/task-center/components/Settlement.vue
index f929d6b..4628ca9 100644
--- a/src/pages/merchant/pages/task-center/components/Settlement.vue
+++ b/src/pages/merchant/pages/task-center/components/Settlement.vue
@@ -104,7 +104,7 @@ const confirmTask = async () => {
images: v.images,
})),
});
-
+ visible.value = false;
Message.success(msg);
emits('success');
}
@@ -121,7 +121,6 @@ const confirmTask = async () => {
@@ -177,6 +176,12 @@ const confirmTask = async () => {
}})
+
+
+
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 37ac045..10f715d 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
@@ -3,9 +3,10 @@ import FormTitle from "../../../../../components/FormTitle/index.vue";
import Backfill from "./Backfill.vue";
import {v4} from "uuid";
import XTimePicker from "../../../../../components/XTimePicker/XTimePicker.vue";
-import {useTemplateRef} from "vue";
+import {onMounted, reactive, useTemplateRef} from "vue";
import {Message} from "@arco-design/web-vue";
import Api from "../../../../../api/index.js";
+import Preview from "../../../../../components/XImage/Preview.vue";
const INDEX = ['一', '二', '三'];
const emits = defineEmits(['success', 'prev']);
@@ -68,6 +69,16 @@ const success = async () => {
}
});
}
+
+const SelectList = reactive([]);
+const getSelectList = async () => {
+ const {data} = await Api.merchant.getChooseContent({id: form.value.platform_id});
+ SelectList.length = 0;
+ SelectList.push(...data);
+}
+onMounted(() => {
+ getSelectList();
+})
@@ -109,12 +120,16 @@ const success = async () => {
-
-
-
-
- 查看指引
-
+
+
+
+
+
+ 查看指引
+
+
{
-
+
@@ -232,7 +232,7 @@ const passTask = async (id, task_backfill_id) => {
-
+
diff --git a/src/pinia/SystemStore/index.js b/src/pinia/SystemStore/index.js
index 2d572c1..ce08ebd 100644
--- a/src/pinia/SystemStore/index.js
+++ b/src/pinia/SystemStore/index.js
@@ -20,12 +20,16 @@ export const useSystemStore = defineStore("SystemStore", () => {
redirect: `/home/${routes[0].path}`,
children: routes
});
+ router.addRoute({
+ path: '/manage-materials',
+ name: 'manage-materials',
+ component: () => import('../../pages/manage-materials/manage-materials.vue'),
+ });
await router.replace(router.currentRoute.value.fullPath);
}
const setRouter = async (_isRoot) => {
isRoot.value = _isRoot;
- console.log('我看看啥权限', _isRoot);
RoutesTemp.value.length = 0;
@@ -52,6 +56,11 @@ export const useSystemStore = defineStore("SystemStore", () => {
redirect: `/home/${routes[0].path}`,
children: []
});
+ router.addRoute({
+ path: '/manage-materials',
+ name: 'manage-materials',
+ component: () => import('../../pages/manage-materials/manage-materials.vue'),
+ });
isRoot.value = false;
await router.replace(router.currentRoute.value.fullPath);
}
diff --git a/src/utils/index.js b/src/utils/index.js
index ae985ed..ca3b4cf 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -1,16 +1,22 @@
import router from "../router/index.js";
import {useSystemStore} from "../pinia/SystemStore/index.js";
-export const toPath = (path, query = {}) => {
+export const toPath = (path, query = {}, flag = false) => {
router.push({
path: path, query: query
}).then(() => {
const SystemStore = useSystemStore();
- SystemStore.NOW_ROUTER = path;
- Object.assign(SystemStore.NOW_ROUTER_QUERY, query);
+ if (!flag) {
+ SystemStore.NOW_ROUTER = path;
+ Object.assign(SystemStore.NOW_ROUTER_QUERY, query);
+ }
});
}
+export const openPage = (path, query = {}) => {
+ window.open('http://localhost:9050/#/manage-materials', '_blank');
+}
+
export const VITE_TINYMCE_KEY = () => {
return import.meta.env.VITE_TINYMCE_KEY;
}