diff --git a/src/api/merchant.js b/src/api/merchant.js index 76976cc..091e5b8 100644 --- a/src/api/merchant.js +++ b/src/api/merchant.js @@ -211,6 +211,27 @@ const merchant = { data: data }); }, + getMaterialList: async (id) => { + return request({ + url: '/index/task/getMaterialList', + method: Method.POST, + data: {id} + }); + }, + addMaterial: async (data) => { + return request({ + url: '/index/task/addMaterial', + method: Method.POST, + data: data + }); + }, + delMaterial: async (id) => { + return request({ + url: '/index/task/delMaterial', + method: Method.POST, + data: {id} + }); + }, } export default merchant; diff --git a/src/assets/images/Combined.png b/src/assets/images/Combined.png new file mode 100644 index 0000000..4f257fa Binary files /dev/null and b/src/assets/images/Combined.png differ diff --git a/src/pages/manage/pages/manage-reward-mission/components/PreviewTaskModal.vue b/src/components/PreviewTaskModal/PreviewTaskModal.vue similarity index 97% rename from src/pages/manage/pages/manage-reward-mission/components/PreviewTaskModal.vue rename to src/components/PreviewTaskModal/PreviewTaskModal.vue index 6e4cb39..26291ef 100644 --- a/src/pages/manage/pages/manage-reward-mission/components/PreviewTaskModal.vue +++ b/src/components/PreviewTaskModal/PreviewTaskModal.vue @@ -1,6 +1,6 @@ + + + + diff --git a/src/components/upload/UploadAvatar.vue b/src/components/upload/UploadAvatar.vue index d9ecd84..2a80fb9 100644 --- a/src/components/upload/UploadAvatar.vue +++ b/src/components/upload/UploadAvatar.vue @@ -1,74 +1,56 @@ diff --git a/src/components/upload/UploadButton.vue b/src/components/upload/UploadButton.vue new file mode 100644 index 0000000..9912751 --- /dev/null +++ b/src/components/upload/UploadButton.vue @@ -0,0 +1,30 @@ + + + + + diff --git a/src/pages/manage/pages/manage-reward-mission/subtask-review.vue b/src/pages/manage/pages/manage-reward-mission/subtask-review.vue index 17a96fa..b1417fb 100644 --- a/src/pages/manage/pages/manage-reward-mission/subtask-review.vue +++ b/src/pages/manage/pages/manage-reward-mission/subtask-review.vue @@ -3,7 +3,7 @@ import {reactive} from "vue"; import Filter from "../../../../components/Filter/index.vue"; import useTableQuery from "../../../../hooks/useTableQuery.js"; import Api from "../../../../api/index.js"; -import PreviewTaskModal from "./components/PreviewTaskModal.vue"; +import PreviewTaskModal from "../../../../components/PreviewTaskModal/PreviewTaskModal.vue"; import openTerminateTask from "../../../../components/TerminateTask/TerminateTask.js"; import {Message} from "@arco-design/web-vue"; import RejectTaskModal from "./components/RejectTaskModal.vue"; diff --git a/src/pages/merchant/components/AddComment.vue b/src/pages/merchant/components/AddComment.vue new file mode 100644 index 0000000..ae0bd79 --- /dev/null +++ b/src/pages/merchant/components/AddComment.vue @@ -0,0 +1,61 @@ + + + + + diff --git a/src/pages/merchant/components/AddMaterial.vue b/src/pages/merchant/components/AddMaterial.vue new file mode 100644 index 0000000..6b5cf15 --- /dev/null +++ b/src/pages/merchant/components/AddMaterial.vue @@ -0,0 +1,91 @@ + + + + + diff --git a/src/pages/merchant/components/MaterialLibrary.vue b/src/pages/merchant/components/MaterialLibrary.vue new file mode 100644 index 0000000..0172bfb --- /dev/null +++ b/src/pages/merchant/components/MaterialLibrary.vue @@ -0,0 +1,92 @@ + + + + + diff --git a/src/pages/merchant/components/MaterialSource.vue b/src/pages/merchant/components/MaterialSource.vue new file mode 100644 index 0000000..0b10e36 --- /dev/null +++ b/src/pages/merchant/components/MaterialSource.vue @@ -0,0 +1,104 @@ + + + + + diff --git a/src/pages/merchant/pages/task-center/look-min-task.vue b/src/pages/merchant/pages/task-center/look-min-task.vue index 8c6ae4f..e270313 100644 --- a/src/pages/merchant/pages/task-center/look-min-task.vue +++ b/src/pages/merchant/pages/task-center/look-min-task.vue @@ -7,11 +7,13 @@ import RefuseModal from "./components/RefuseModal.vue"; import openTerminateTask from "../../../../components/TerminateTask/TerminateTask.js"; import BlackjackExpertModal from "../../components/BlackjackExpertModal.vue"; import {useRoute} from "vue-router"; +import {toPath} from "../../../../utils/index.js"; +import PreviewTaskModal from "../../../../components/PreviewTaskModal/PreviewTaskModal.vue"; const route = useRoute(); const columns = [ { - title: '子任务号', + title: '子任务编号', dataIndex: 'uid', }, { @@ -58,7 +60,7 @@ const columns = [ dataIndex: 'action2', slotName: 'action2', align: 'center', - width: 180, + width: 200, }, ]; const state = reactive({ @@ -95,7 +97,7 @@ const {loading, pagination} = useTableQuery({
- + @@ -157,7 +159,9 @@ const {loading, pagination} = useTableQuery({