From ca1926a732d1cfa343a885d683c9df60b49ea986 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Tue, 24 Sep 2024 13:00:46 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E3=80=91=E6=94=AF=E4=BB=98=EF=BC=9A=E6=9F=A5=E8=AF=A2=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E8=AE=A2=E5=8D=95=E6=97=B6=EF=BC=8C=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=20sync=20=E4=B8=BB=E5=8A=A8=E8=BD=AE=E8=AF=A2=EF=BC=8C?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=94=AF=E4=BB=98=E5=AE=9D=E3=80=81=E5=BE=AE?= =?UTF-8?q?=E4=BF=A1=E5=AD=98=E5=9C=A8=E5=BB=B6=E8=BF=9F=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/goods/comment/add.vue | 2 +- pages/order/aftersale/apply.vue | 2 +- pages/order/detail.vue | 14 +++++++++----- pages/order/express/log.vue | 16 ++++++++-------- pages/pay/result.vue | 5 ++++- sheep/api/trade/order.js | 5 +++-- 6 files changed, 26 insertions(+), 18 deletions(-) diff --git a/pages/goods/comment/add.vue b/pages/goods/comment/add.vue index bfbc800..e35eca5 100644 --- a/pages/goods/comment/add.vue +++ b/pages/goods/comment/add.vue @@ -121,7 +121,7 @@ } state.id = options.id; - const { code, data } = await OrderApi.getOrder(state.id); + const { code, data } = await OrderApi.getOrderDetail(state.id); if (code !== 0) { sheep.$helper.toast('无待评价订单'); return; diff --git a/pages/order/aftersale/apply.vue b/pages/order/aftersale/apply.vue index 805ea94..bd69a90 100644 --- a/pages/order/aftersale/apply.vue +++ b/pages/order/aftersale/apply.vue @@ -208,7 +208,7 @@ state.itemId = parseInt(options.itemId); // 读取订单信息 - const { code, data } = await OrderApi.getOrder(state.orderId); + const { code, data } = await OrderApi.getOrderDetail(state.orderId); if (code !== 0) { return; } diff --git a/pages/order/detail.vue b/pages/order/detail.vue index ed0119f..b276d35 100644 --- a/pages/order/detail.vue +++ b/pages/order/detail.vue @@ -127,7 +127,11 @@ - + @@ -305,7 +309,7 @@ uni.showModal({ title: '提示', content: '确定要取消订单吗?', - success: async function(res) { + success: async function (res) { if (!res.confirm) { return; } @@ -394,11 +398,11 @@ let res; if (state.comeinType === 'wechat') { // TODO 芋艿：微信场景下 - res = await OrderApi.getOrder(id, { + res = await OrderApi.getOrderDetail(id, { merchant_trade_no: state.merchantTradeNo, }); } else { - res = await OrderApi.getOrder(id); + res = await OrderApi.getOrderDetail(id); } if (res.code === 0) { state.orderInfo = res.data; @@ -451,7 +455,7 @@ color: rgba(#fff, 0.9); width: 100%; background: v-bind(headerBg) no-repeat, - linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient)); + linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient)); background-size: 750rpx 100%; box-sizing: border-box; diff --git a/pages/order/express/log.vue b/pages/order/express/log.vue index eb992a5..c852edc 100644 --- a/pages/order/express/log.vue +++ b/pages/order/express/log.vue @@ -13,10 +13,10 @@ - - - - + + + + 快递单号：{{ state.info.logisticsNo }} 快递公司：{{ state.info.logisticsName }} @@ -35,9 +35,9 @@ - - - + + + {{ item.content }} {{ sheep.$helper.timeFormat(item.time, 'yyyy-mm-dd hh:MM:ss') }} @@ -78,7 +78,7 @@ } async function getOrderDetail(id) { - const { data } = await OrderApi.getOrder(id) + const { data } = await OrderApi.getOrderDetail(id); state.info = data; } diff --git a/pages/pay/result.vue b/pages/pay/result.vue index 53e72b3..3a8a446 100644 --- a/pages/pay/result.vue +++ b/pages/pay/result.vue @@ -126,7 +126,10 @@ // #endif // 特殊：获得商品订单信息 if (state.orderType === 'goods') { - const { data, code } = await OrderApi.getOrder(state.orderInfo.merchantOrderId); + const { data, code } = await OrderApi.getOrderDetail( + state.orderInfo.merchantOrderId, + true, + ); if (code === 0) { state.tradeOrder = data; } diff --git a/sheep/api/trade/order.js b/sheep/api/trade/order.js index 9e5883e..df77aec 100644 --- a/sheep/api/trade/order.js +++ b/sheep/api/trade/order.js @@ -73,13 +73,14 @@ const OrderApi = { data, }); }, - // 获得订单 - getOrder: (id) => { + // 获得订单详细：sync 是可选参数 + getOrderDetail: (id, sync) => { return request({ url: `/trade/order/get-detail`, method: 'GET', params: { id, + sync, }, custom: { showLoading: false,