diff --git a/src/api/merchant.js b/src/api/merchant.js index 7203e1b..758f0e1 100644 --- a/src/api/merchant.js +++ b/src/api/merchant.js @@ -456,6 +456,34 @@ const merchant = { data: data }); }, + getTaskBlock: async (data) => { + return request({ + url: '/index/task/getTaskBlock', + method: Method.POST, + data: data + }); + }, + cancelTaskBlock: async (data) => { + return request({ + url: '/index/task/cancelTaskBlock', + method: Method.POST, + data: data + }); + }, + getTaskEffect: async (data) => { + return request({ + url: '/index/task/getTaskEffect', + method: Method.POST, + data: data + }); + }, + cancelTaskEffect: async (data) => { + return request({ + url: '/index/task/cancelTaskEffect', + method: Method.POST, + data: data + }); + }, } export default merchant; diff --git a/src/components/Talk/index.vue b/src/components/Talk/index.vue index 95077b1..f1e4d3a 100644 --- a/src/components/Talk/index.vue +++ b/src/components/Talk/index.vue @@ -7,6 +7,10 @@ const input = ref(''); const changeInput = (e) => { if (e.match(/#(\S+?)(?=\s)/g)) { + if (modelValue.value === void 0) { + console.log('进来了') + } + console.log(modelValue.value) modelValue.value.push(...e.match(/#(\S+?)(?=\s)/g).map(tag => tag.slice(1))); input.value = null; nextTick(() => { diff --git a/src/components/XSelect/index.vue b/src/components/XSelect/index.vue index 9ee2c23..d1e6e8b 100644 --- a/src/components/XSelect/index.vue +++ b/src/components/XSelect/index.vue @@ -1,6 +1,7 @@ diff --git a/src/pages/merchant/pages/expert-management/blackout-management.vue b/src/pages/merchant/pages/expert-management/blackout-management.vue index b93e56e..f33b73e 100644 --- a/src/pages/merchant/pages/expert-management/blackout-management.vue +++ b/src/pages/merchant/pages/expert-management/blackout-management.vue @@ -2,43 +2,44 @@ import useTableQuery from "../../../../hooks/useTableQuery.js"; import Api from "../../../../api/index.js"; import {reactive} from "vue"; +import {Message} from "@arco-design/web-vue"; const columns = [ { title: 'ID', - dataIndex: 'key', + dataIndex: 'id', }, { title: '渠道', - dataIndex: 'key', + dataIndex: 'platform', }, { title: '已拉黑达人', - dataIndex: 'key', + dataIndex: 'uid', }, { title: '拉黑原因', - dataIndex: 'key', + dataIndex: 'remark', }, { title: '拉黑效果', - dataIndex: 'key', + dataIndex: 'type_text', }, { title: '拉黑开始日期', - dataIndex: 'key', + dataIndex: 'createtime', }, { title: '拉黑结束日期', - dataIndex: 'key', + dataIndex: 'endtime', }, { title: '关联任务ID', - dataIndex: 'key', + dataIndex: 'task_id', }, { title: '关联子任务ID', - dataIndex: 'key', + dataIndex: 'task_children_id', }, { title: '操作', @@ -57,14 +58,20 @@ const po = reactive({ wd: null, }); -const {loading, pagination, initFetchData} = useTableQuery({ +const {loading, pagination, initFetchData, fetchData} = useTableQuery({ parameter: po, - api: Api.system.getData, + api: Api.merchant.getTaskBlock, callback: (data) => { Object.assign(vo, data); console.log(vo); } }); + +const cancelTaskBlock = async (id) => { + const {msg} = await Api.merchant.cancelTaskBlock({id: id}); + Message.success(msg); + await fetchData(); +}