feat: 普通商品售后订单隐藏、查看物流展示
This commit is contained in:
@@ -76,12 +76,13 @@
|
||||
<view class="copy" @click.stop="onCopy">
|
||||
<image :src="`${$url}goods/copy2.svg`" mode="scaleToFill" />
|
||||
</view>
|
||||
<truckLine
|
||||
<!-- 订单编号后不再展示物流 icon -->
|
||||
<!-- <truckLine
|
||||
:data="state.orderInfo"
|
||||
:code="Number(isAiStoreOrder ? 2 : 1)"
|
||||
v-if="state.orderInfo.deliveryTime"
|
||||
@openExpress="handleTruckLineExpress"
|
||||
></truckLine>
|
||||
></truckLine> -->
|
||||
</view>
|
||||
<view class="notice-item flex-row ju-between">
|
||||
<text class="title c0">下单时间</text>
|
||||
@@ -564,7 +565,8 @@
|
||||
});
|
||||
return;
|
||||
}
|
||||
if (isAiStoreOrder.value && !isPickUpOrder.value) {
|
||||
const orderType = Number(state.orderInfo?.type ?? state.orderType ?? 0);
|
||||
if (orderType !== 0 && isAiStoreOrder.value && !isPickUpOrder.value) {
|
||||
expressListPopupRef.value?.open?.();
|
||||
return;
|
||||
}
|
||||
@@ -580,7 +582,8 @@
|
||||
});
|
||||
return;
|
||||
}
|
||||
if (!isPickUpOrder.value) {
|
||||
const orderType = Number(state.orderInfo?.type ?? state.orderType ?? 0);
|
||||
if (orderType !== 0 && !isPickUpOrder.value) {
|
||||
expressListPopupRef.value?.open?.();
|
||||
return;
|
||||
}
|
||||
|
||||
+11
-1
@@ -206,8 +206,18 @@
|
||||
: Array.isArray(pageData)
|
||||
? pageData
|
||||
: [];
|
||||
const nextList =
|
||||
const nextListRaw =
|
||||
state.currentType === 1 ? list.map((o) => ({ ...o, __source: 'aishop' })) : list;
|
||||
const isMallOrder = state.currentType === 0;
|
||||
let nextList = isMallOrder && !isAfterSaleTab
|
||||
? nextListRaw.map((order) => {
|
||||
const items = Array.isArray(order?.items) ? order.items.filter((item) => Number(item?.afterSaleStatus ?? 0) === 0) : [];
|
||||
return { ...order, items };
|
||||
})
|
||||
: nextListRaw;
|
||||
if (isMallOrder && !isAfterSaleTab) {
|
||||
nextList = nextList.filter((order) => Array.isArray(order?.items) && order.items.length > 0);
|
||||
}
|
||||
nextList.forEach((order) => handleOrderButtons(order));
|
||||
if (mescroll.num == 1) state.list[mescroll.dataObj.i] = [];
|
||||
state.list[mescroll.dataObj.i] = state.list[mescroll.dataObj.i].concat(nextList);
|
||||
|
||||
Reference in New Issue
Block a user