feat: 普通商品售后订单隐藏、查看物流展示

This commit is contained in:
2026-08-10 13:37:06 +08:00
parent 50c4a7168f
commit 9c1e42fe48
4 changed files with 24 additions and 6 deletions
@@ -11,6 +11,7 @@
<view v-for="(item, index) in btns" :key="index"> <view v-for="(item, index) in btns" :key="index">
<view <view
v-if=" v-if="
item.id !== 3 &&
item.value.split(',').indexOf(String(props?.data?.status)) !== -1 && item.value.split(',').indexOf(String(props?.data?.status)) !== -1 &&
!(item.id === 3 && Number(props?.data?.type) === 5) && !(item.id === 3 && Number(props?.data?.type) === 5) &&
!(item.id === 3 && props?.data?.payChannelCode === 'cash_payment') && !(item.id === 3 && props?.data?.payChannelCode === 'cash_payment') &&
@@ -114,6 +115,9 @@
uni.showToast({ title: '该订单已全部退款,无需再次申请售后', icon: 'none' }); uni.showToast({ title: '该订单已全部退款,无需再次申请售后', icon: 'none' });
return; return;
} }
if (index === 3) {
return;
}
let id = props.data?.id; let id = props.data?.id;
switch (index) { switch (index) {
case 1: case 1:
+2 -1
View File
@@ -501,7 +501,8 @@
}); });
return; return;
} }
if (isAiStoreOrder.value && !isPickUpOrder.value) { const orderType = Number(props.data?.type ?? 0);
if (orderType !== 0 && isAiStoreOrder.value && !isPickUpOrder.value) {
expressListPopupRef.value?.open?.(); expressListPopupRef.value?.open?.();
return; return;
} }
+7 -4
View File
@@ -76,12 +76,13 @@
<view class="copy" @click.stop="onCopy"> <view class="copy" @click.stop="onCopy">
<image :src="`${$url}goods/copy2.svg`" mode="scaleToFill" /> <image :src="`${$url}goods/copy2.svg`" mode="scaleToFill" />
</view> </view>
<truckLine <!-- 订单编号后不再展示物流 icon -->
<!-- <truckLine
:data="state.orderInfo" :data="state.orderInfo"
:code="Number(isAiStoreOrder ? 2 : 1)" :code="Number(isAiStoreOrder ? 2 : 1)"
v-if="state.orderInfo.deliveryTime" v-if="state.orderInfo.deliveryTime"
@openExpress="handleTruckLineExpress" @openExpress="handleTruckLineExpress"
></truckLine> ></truckLine> -->
</view> </view>
<view class="notice-item flex-row ju-between"> <view class="notice-item flex-row ju-between">
<text class="title c0">下单时间</text> <text class="title c0">下单时间</text>
@@ -564,7 +565,8 @@
}); });
return; 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?.(); expressListPopupRef.value?.open?.();
return; return;
} }
@@ -580,7 +582,8 @@
}); });
return; return;
} }
if (!isPickUpOrder.value) { const orderType = Number(state.orderInfo?.type ?? state.orderType ?? 0);
if (orderType !== 0 && !isPickUpOrder.value) {
expressListPopupRef.value?.open?.(); expressListPopupRef.value?.open?.();
return; return;
} }
+11 -1
View File
@@ -206,8 +206,18 @@
: Array.isArray(pageData) : Array.isArray(pageData)
? pageData ? pageData
: []; : [];
const nextList = const nextListRaw =
state.currentType === 1 ? list.map((o) => ({ ...o, __source: 'aishop' })) : list; 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)); nextList.forEach((order) => handleOrderButtons(order));
if (mescroll.num == 1) state.list[mescroll.dataObj.i] = []; if (mescroll.num == 1) state.list[mescroll.dataObj.i] = [];
state.list[mescroll.dataObj.i] = state.list[mescroll.dataObj.i].concat(nextList); state.list[mescroll.dataObj.i] = state.list[mescroll.dataObj.i].concat(nextList);