diff --git a/src/api/admin.js b/src/api/admin.js index cb25561..8c98f26 100644 --- a/src/api/admin.js +++ b/src/api/admin.js @@ -798,6 +798,20 @@ const admin = { data: data, }); }, + getInterventionTaskList: async (data) => { + return request({ + url: '/admin/Intervention/getTaskList', + method: Method.POST, + data: data, + }); + }, + interventionJsTask: async (data) => { + return request({ + url: '/admin/Intervention/jsTask', + method: Method.POST, + data: data, + }); + }, } export default admin; diff --git a/src/pages/manage/pages/fund/fund-management-business.vue b/src/pages/manage/pages/fund/fund-management-business.vue index 636c8cf..90d137e 100644 --- a/src/pages/manage/pages/fund/fund-management-business.vue +++ b/src/pages/manage/pages/fund/fund-management-business.vue @@ -48,11 +48,11 @@ const columns = [ }, { title: '关联任务ID', - dataIndex: 'task_id', + dataIndex: 'm_code', }, { title: '子任务ID', - dataIndex: 'task_children_id', + dataIndex: 't_code', }, { title: '达人ID', diff --git a/src/pages/manage/pages/fund/fund-management-expert.vue b/src/pages/manage/pages/fund/fund-management-expert.vue index 23b934c..a71a0a1 100644 --- a/src/pages/manage/pages/fund/fund-management-expert.vue +++ b/src/pages/manage/pages/fund/fund-management-expert.vue @@ -48,11 +48,11 @@ const columns = [ }, { title: '关联任务ID', - dataIndex: 'task_id', + dataIndex: 'mt_code', }, { title: '子任务ID', - dataIndex: 'task_children_id', + dataIndex: 'tc_uid', }, { title: '达人ID', diff --git a/src/pages/manage/pages/message-center/platform-intervention.vue b/src/pages/manage/pages/message-center/platform-intervention.vue index 47deca0..723a5d5 100644 --- a/src/pages/manage/pages/message-center/platform-intervention.vue +++ b/src/pages/manage/pages/message-center/platform-intervention.vue @@ -11,10 +11,6 @@ import XTagSelect from "../../../../components/XSelect/XTagSelect.vue"; import {Message} from "@arco-design/web-vue"; const columns = [ - { - title: '沟通事件ID', - dataIndex: 'code', - }, { title: '商家ID', dataIndex: 'b_uid', @@ -47,15 +43,15 @@ const columns = [ }, { title: '领取时间', - dataIndex: 'receive_time', + dataIndex: 'accept_time', }, { title: '扣除', - dataIndex: 'ratio', + dataIndex: 'coin_ratio', }, { title: '金额', - dataIndex: 'money', + dataIndex: 'coin', }, { title: '原因', @@ -65,7 +61,7 @@ const columns = [ }, { title: '达人到手', - dataIndex: 'key', + dataIndex: 'real_coin', }, { title: '操作', @@ -153,7 +149,7 @@ const vo = reactive({ }); const {loading, pagination, initFetchData, fetchData} = useTableQuery({ parameter: po, - api: Api.admin.getInterventionList, + api: Api.admin.getInterventionTaskList, callback: (data) => { Object.assign(vo, data); } @@ -177,7 +173,7 @@ const getStatus = () => Promise.resolve({ const changeStatus = async (record) => { const {msg} = await Api.admin.editStatus({ id: record.id, - status: record.status, + status: record.is_handle, }); Message.success(msg); await fetchData(); @@ -207,7 +203,7 @@ const changeStatus = async (record) => { - + @@ -221,16 +217,16 @@ const changeStatus = async (record) => { diff --git a/src/pages/merchant/pages/task-center/components/Settlement.vue b/src/pages/merchant/pages/task-center/components/Settlement.vue index 3eec755..c45947c 100644 --- a/src/pages/merchant/pages/task-center/components/Settlement.vue +++ b/src/pages/merchant/pages/task-center/components/Settlement.vue @@ -56,9 +56,7 @@ watch( () => visible.value, (val) => { if (val) { - const api = SystemStore.isRoot ? Api.admin.checkSettlement : Api.merchant.getTaskSettltment; - api({id: task.task_id || task.id}).then(({data}) => { TaskSettltment.length = 0; TaskSettltment.push(...data.map((v, index) => ({ @@ -71,17 +69,21 @@ watch( selectedKeys.value = data.filter(v => v.is_check === 1).map(v => v.id); console.log(selectedKeys.value); } + + sumData(); }); } } ) const sum = ref(0); +const coin = ref(0); const sumData = async () => { - const api = SystemStore.isRoot ? Api.admin.settlement : Api.merchant.jsTask - const {data: {real_coin}} = await api({ + const api = SystemStore.isRoot ? Api.admin.interventionJsTask : Api.merchant.jsTask + const {data: {real_coin, coin: _coin}} = await api({ id: task.id, ids: TaskSettltment.filter(v => selectedKeys.value.includes(v.id)).map(v => v.id) }); + coin.value = _coin; sum.value = real_coin; } @@ -166,11 +168,11 @@ const confirmTask = async () => { 该子任务需结算:
¥ {{ - selectedKeys.length > 0 ? sum : task.coin / 100 + selectedKeys.length > 0 ? sum : coin }}
- ({{ task.coin / 100 }} + ({{ coin }} - {{ TaskSettltment.find(k => k.id === v)?.discount }} = {{ sum