From c53a2d5e740c63d3773c8bbd1ae1466bf9ea970c Mon Sep 17 00:00:00 2001 From: aihe <961836564@qq.com> Date: Tue, 7 May 2024 00:38:24 +0800 Subject: [PATCH] uu --- common/api/order.js | 9 + common/api/url.js | 5 +- .../buns-post-edit-templates/bpe-cost-tmp.vue | 18 +- pages/address/edit.vue | 150 ++++---- pages/address/list.vue | 153 ++++---- pages/post/model.js | 2 - pages/post/openorder.vue | 36 +- pages/tabBar/mine/mine.vue | 2 +- pages/tabBar/order/order.vue | 328 ++++++++---------- 9 files changed, 345 insertions(+), 358 deletions(-) diff --git a/common/api/order.js b/common/api/order.js index 7f691b0..158fd6c 100644 --- a/common/api/order.js +++ b/common/api/order.js @@ -65,5 +65,14 @@ export const warehouseInList = (data = {})=> { return coreRequest(url.warehouseInList, data, {}, "GET") } +// 订单列表 +export const getOrderList = (data = {})=> { + return coreRequest(url.getOrderList, data, {}, "GET") +} + +// 订单详情 +export const getOrderDetail = (data = {})=> { + return coreRequest(url.getOrderDetail, data, {}, "GET") +} diff --git a/common/api/url.js b/common/api/url.js index e6aceb2..3d29ae3 100644 --- a/common/api/url.js +++ b/common/api/url.js @@ -28,9 +28,12 @@ export default { getMonthpayAccountList: `/emis/emisMonthpayAccount/listSimple`, // 月结账号列表 getDestPositionList: `/emis/emisDestination/listSimple`, // 目的地 列表 getCaculteDestSite: `/emis/emisDestination/getDestSite`, // 自动计算目的地 - calcWaybillFee: `/emis/emisQuotePrice/calcWaybillFee`, // 计算运费 + calcWaybillFee: `/emis/emisWaybill/calcWaybillFee`, // 计算运费 calcSetteldWeight: `/emis/emisWaybill/calcSetteldWeight`, // 计算结算重量、结算体积 warehouseInList: `/emis/emisWarehouseIn/listSimple`, // 下单-进仓单列表 + getOrderList: `/emis/emisWaybill/listSimple`, // 订单列表 + getOrderDetail: `/emis/emisWaybill/getWaybillDetail`, // 订单详情 + } diff --git a/components/buns-post-edit-templates/bpe-cost-tmp.vue b/components/buns-post-edit-templates/bpe-cost-tmp.vue index 6012774..9711bc2 100644 --- a/components/buns-post-edit-templates/bpe-cost-tmp.vue +++ b/components/buns-post-edit-templates/bpe-cost-tmp.vue @@ -43,6 +43,18 @@ + + + + 总费用 + + + + + + @@ -105,8 +117,10 @@ this.calcWaybillFee({ calcFeeType: val }) }, async calcWaybillFee(params = {}) { - let res = await apiService.calcWaybillFee({ ...this.searchParam, ...params }) - this.modelInfo.feeItems = res.data.feeItems + let res = await apiService.calcWaybillFee({ custNo: this.modelInfo.custNo, ...this.searchParam, ...params }) + this.modelInfo.feeItems = res.data.feeList + this.modelInfo.freight = res.data.totalFee + } } } diff --git a/pages/address/edit.vue b/pages/address/edit.vue index fe8c334..1c98aac 100644 --- a/pages/address/edit.vue +++ b/pages/address/edit.vue @@ -1,82 +1,84 @@