Merge branch 'v2.2' into v1.8.1

* v2.2:
  feat:  延迟发货调试
  feat: 多规格延迟发货
  feat: 店铺订单多规格展示
  feat: 延迟发货api
This commit is contained in:
2026-08-06 13:50:31 +08:00
6 changed files with 2092 additions and 447 deletions
+17
View File
@@ -41,6 +41,8 @@
class="order-goods"
v-if="state?.orderInfo?.items?.length > 0"
:data="state.orderInfo"
source="aishop"
:delay-records="state.delayRecords"
type="4"
@getOrderDetail="getOrderDetail"
></card_order>
@@ -151,6 +153,7 @@
orderInfo: {},
merchantTradeNo: '', // 商户订单号
comeinType: '', // 进入订单详情的来源类型
delayRecords: [],
});
let statusObj = ref({
0: {
@@ -229,6 +232,20 @@
if (state.orderInfo.deliveryType === 2 && state.orderInfo.payStatus) {
pickUpVerifyRef.value && pickUpVerifyRef.value.markCode(res.data.pickUpVerifyCode);
}
if (orderId.value) {
try {
const delayRes = await OrderApi.getAiOrderDelayRecords({ orderId: orderId.value });
if (delayRes.code === 0 && Array.isArray(delayRes.data)) {
state.delayRecords = delayRes.data;
} else {
state.delayRecords = [];
}
} catch (e) {
state.delayRecords = [];
}
} else {
state.delayRecords = [];
}
} else {
}
}