diff --git a/manager/src/api/pages.js b/manager/src/api/pages.js index 1663dd13..ce6b4e10 100644 --- a/manager/src/api/pages.js +++ b/manager/src/api/pages.js @@ -114,5 +114,5 @@ export const getPrivacy = (type) => { } //修改隐私协议数据 export const updatePrivacy = (id,type,params) => { - return putRequest(`/other/article/updateArticle/${type}?id=${id}`, params, {"Content-Type": "application/json"}) + return putRequest(`/other/article/updateArticle/${type}/${id}`, params, {"Content-Type": "application/json"}) } \ No newline at end of file diff --git a/manager/src/views/distribution/distributionOrder.vue b/manager/src/views/distribution/distributionOrder.vue index b1596b5f..41329b4f 100644 --- a/manager/src/views/distribution/distributionOrder.vue +++ b/manager/src/views/distribution/distributionOrder.vue @@ -210,7 +210,7 @@ }, filterStatus (status) { // 过滤订单状态 const arr = [ - {status: 'WAIT_BILL', title: '待结算'}, + {status: 'NO_COMPLETED', title: '未完成'}, {status: 'COMPLETE', title: '完成'}, {status: 'REFUND', title: '退款'}, ] @@ -219,21 +219,20 @@ return arr[i].title; } } + return '未完成'; // 默认返回未完成 }, filterStatusColor (status) { // 状态tag标签颜色 const arr = [ - {status: 'WAIT_BILL', color: 'blue'}, - {status: 'WAIT_CASH', color: 'orange'}, - {status: 'COMPLETE_CASH', color: 'green'}, - {status: 'CANCEL', color: 'red'}, - {status: 'NO_COMPLETED', color: 'red'}, - {status: 'REFUND', color: 'magenta'}, + {status: 'NO_COMPLETED', color: 'orange'}, + {status: 'COMPLETE', color: 'green'}, + {status: 'REFUND', color: 'red'}, ] for (let i=0;i