feat: 多规格延迟发货
This commit is contained in:
@@ -17,7 +17,7 @@
|
||||
{{ formatAfterSaleStatus(props.data) }}
|
||||
</view>
|
||||
</view>
|
||||
<card_order :data="props.data" v-if="props.index != 5" type="3"></card_order>
|
||||
<card_order :data="props.data" :source="props.data.__source" v-if="props.index != 5" type="3"></card_order>
|
||||
<view v-else class="con_item flex-center ju-between al-flex-start">
|
||||
<view class="order_img shrink">
|
||||
<image :src="`${props.data.picUrl}`" mode="aspectFill" />
|
||||
@@ -99,7 +99,7 @@
|
||||
<view
|
||||
class="delay-popup__item"
|
||||
v-for="(item, index) in delayShipmentItems"
|
||||
:key="item.orderItemId || index"
|
||||
:key="item.itemKey || index"
|
||||
>
|
||||
<image class="delay-popup__item-image" :src="item.picUrl" mode="aspectFill" />
|
||||
<view class="delay-popup__item-main">
|
||||
@@ -238,20 +238,51 @@
|
||||
const resolveAiOrderId = (data) => {
|
||||
return data?.id || data?.orderId;
|
||||
};
|
||||
const resolveDelayOrderItemId = (item) => {
|
||||
return Number(item?.id || item?.orderItemId || item?.itemId || 0);
|
||||
const getDelayFirstValidValue = (...values) =>
|
||||
values.find((value) => value !== undefined && value !== null && String(value).trim() !== '') ?? '';
|
||||
const resolveDelayOrderItemId = (item = {}) => {
|
||||
return getDelayFirstValidValue(
|
||||
item?.id,
|
||||
item?.orderItemId,
|
||||
item?.itemId,
|
||||
item?.orderGoodsId,
|
||||
item?.goodsId,
|
||||
item?.skuId,
|
||||
);
|
||||
};
|
||||
const hasDelayOrderItemId = (value) => value !== undefined && value !== null && String(value).trim() !== '';
|
||||
const resolveDelayMaxCount = (item = {}) => {
|
||||
const candidates = [
|
||||
item?.count,
|
||||
item?.remainingCount,
|
||||
item?.availableCount,
|
||||
item?.canCount,
|
||||
item?.maxCount,
|
||||
];
|
||||
const matched = candidates
|
||||
.map((value) => Number(value))
|
||||
.find((value) => Number.isFinite(value) && value > 0);
|
||||
return matched || 0;
|
||||
};
|
||||
const delayPopupRef = ref();
|
||||
const delayShipmentItems = ref([]);
|
||||
const createDelayShipmentItem = (item, parentItem = {}) => {
|
||||
const maxCount = Number(item?.count || 0);
|
||||
const orderItemId =
|
||||
resolveDelayOrderItemId(item) || resolveDelayOrderItemId(parentItem);
|
||||
const maxCount = resolveDelayMaxCount(item);
|
||||
const orderItemId = resolveDelayOrderItemId(item);
|
||||
const parentOrderItemId = resolveDelayOrderItemId(parentItem);
|
||||
const submitOrderItemId = getDelayFirstValidValue(orderItemId, parentOrderItemId);
|
||||
const skuText = formatSkuProperties(item?.properties || parentItem?.properties);
|
||||
return {
|
||||
itemKey: getDelayFirstValidValue(
|
||||
submitOrderItemId,
|
||||
`${item?.spuName || item?.name || parentItem?.spuName || parentItem?.name || ''}_${skuText}_${maxCount}`,
|
||||
),
|
||||
orderItemId,
|
||||
parentOrderItemId,
|
||||
submitOrderItemId,
|
||||
picUrl: item?.picUrl || parentItem?.picUrl || '',
|
||||
spuName: item?.spuName || item?.name || parentItem?.spuName || parentItem?.name || '',
|
||||
skuText: formatSkuProperties(item?.properties),
|
||||
skuText,
|
||||
maxCount,
|
||||
selectedCount: maxCount,
|
||||
};
|
||||
@@ -262,11 +293,11 @@
|
||||
.flatMap((item) => {
|
||||
const children = Array.isArray(item?.items) ? item.items : [];
|
||||
if (children.length) {
|
||||
return children.map((child) => createDelayShipmentItem(child, item));
|
||||
return children.filter(Boolean).map((child) => createDelayShipmentItem(child, item));
|
||||
}
|
||||
return [createDelayShipmentItem(item)];
|
||||
return [createDelayShipmentItem(item, item)];
|
||||
})
|
||||
.filter((item) => item.orderItemId > 0 && item.maxCount > 0);
|
||||
.filter((item) => item.maxCount > 0);
|
||||
};
|
||||
const closeDelayShipmentPopup = () => {
|
||||
delayPopupRef.value?.close();
|
||||
@@ -274,7 +305,11 @@
|
||||
const onDelayShipmentCountChange = (index, value) => {
|
||||
const current = delayShipmentItems.value[index];
|
||||
if (!current) return;
|
||||
const next = Number(value || 0);
|
||||
const next = Number(value);
|
||||
if (!Number.isFinite(next)) {
|
||||
current.selectedCount = 0;
|
||||
return;
|
||||
}
|
||||
current.selectedCount = Math.min(current.maxCount, Math.max(0, next));
|
||||
};
|
||||
const openDelayShipmentPopup = (data) => {
|
||||
@@ -288,10 +323,6 @@
|
||||
}
|
||||
const nextItems = createDelayShipmentItems(data);
|
||||
if (!nextItems.length) {
|
||||
uni.showToast({
|
||||
title: '未获取到可延迟商品',
|
||||
icon: 'none',
|
||||
});
|
||||
return;
|
||||
}
|
||||
delayShipmentItems.value = nextItems;
|
||||
@@ -306,15 +337,18 @@
|
||||
});
|
||||
return;
|
||||
}
|
||||
const hasSelectedCount = delayShipmentItems.value.some((item) => Number(item.selectedCount) > 0);
|
||||
const items = delayShipmentItems.value
|
||||
.filter((item) => Number(item.selectedCount) > 0)
|
||||
.filter(
|
||||
(item) => Number(item.selectedCount) > 0 && hasDelayOrderItemId(item.submitOrderItemId),
|
||||
)
|
||||
.map((item) => ({
|
||||
orderItemId: item.orderItemId,
|
||||
orderItemId: item.submitOrderItemId,
|
||||
count: Number(item.selectedCount),
|
||||
}));
|
||||
if (!items.length) {
|
||||
uni.showToast({
|
||||
title: '请选择延迟发货数量',
|
||||
title: hasSelectedCount ? '订单商品信息异常' : '请选择延迟发货数量',
|
||||
icon: 'none',
|
||||
});
|
||||
return;
|
||||
|
||||
+53
-18
@@ -125,7 +125,7 @@
|
||||
<view
|
||||
class="delay-popup__item"
|
||||
v-for="(item, index) in delayShipmentItems"
|
||||
:key="item.orderItemId || index"
|
||||
:key="item.itemKey || index"
|
||||
>
|
||||
<image class="delay-popup__item-image" :src="item.picUrl" mode="aspectFill" />
|
||||
<view class="delay-popup__item-main">
|
||||
@@ -255,8 +255,32 @@
|
||||
const resolveAiOrderId = (data) => {
|
||||
return data?.id || data?.orderId;
|
||||
};
|
||||
const resolveDelayOrderItemId = (item) => {
|
||||
return Number(item?.id || item?.orderItemId || item?.itemId || 0);
|
||||
const getDelayFirstValidValue = (...values) =>
|
||||
values.find((value) => value !== undefined && value !== null && String(value).trim() !== '') ?? '';
|
||||
const resolveDelayOrderItemId = (item = {}) => {
|
||||
return getDelayFirstValidValue(
|
||||
item?.id,
|
||||
item?.orderItemId,
|
||||
item?.itemId,
|
||||
item?.orderGoodsId,
|
||||
item?.goodsId,
|
||||
item?.skuId,
|
||||
);
|
||||
};
|
||||
const hasDelayOrderItemId = (value) =>
|
||||
value !== undefined && value !== null && String(value).trim() !== '';
|
||||
const resolveDelayMaxCount = (item = {}) => {
|
||||
const candidates = [
|
||||
item?.count,
|
||||
item?.remainingCount,
|
||||
item?.availableCount,
|
||||
item?.canCount,
|
||||
item?.maxCount,
|
||||
];
|
||||
const matched = candidates
|
||||
.map((value) => Number(value))
|
||||
.find((value) => Number.isFinite(value) && value > 0);
|
||||
return matched || 0;
|
||||
};
|
||||
const formatSkuProperties = (properties) => {
|
||||
const list = Array.isArray(properties) ? properties : [];
|
||||
@@ -271,14 +295,22 @@
|
||||
const delayPopupRef = ref();
|
||||
const delayShipmentItems = ref([]);
|
||||
const createDelayShipmentItem = (item, parentItem = {}) => {
|
||||
const maxCount = Number(item?.count || 0);
|
||||
const orderItemId =
|
||||
resolveDelayOrderItemId(item) || resolveDelayOrderItemId(parentItem);
|
||||
const maxCount = resolveDelayMaxCount(item);
|
||||
const orderItemId = resolveDelayOrderItemId(item);
|
||||
const parentOrderItemId = resolveDelayOrderItemId(parentItem);
|
||||
const submitOrderItemId = getDelayFirstValidValue(orderItemId, parentOrderItemId);
|
||||
const skuText = formatSkuProperties(item?.properties || parentItem?.properties);
|
||||
return {
|
||||
itemKey: getDelayFirstValidValue(
|
||||
submitOrderItemId,
|
||||
`${item?.spuName || item?.name || parentItem?.spuName || parentItem?.name || ''}_${skuText}_${maxCount}`,
|
||||
),
|
||||
orderItemId,
|
||||
parentOrderItemId,
|
||||
submitOrderItemId,
|
||||
picUrl: item?.picUrl || parentItem?.picUrl || '',
|
||||
spuName: item?.spuName || item?.name || parentItem?.spuName || parentItem?.name || '',
|
||||
skuText: formatSkuProperties(item?.properties),
|
||||
skuText,
|
||||
maxCount,
|
||||
selectedCount: maxCount,
|
||||
};
|
||||
@@ -289,11 +321,11 @@
|
||||
.flatMap((item) => {
|
||||
const children = Array.isArray(item?.items) ? item.items : [];
|
||||
if (children.length) {
|
||||
return children.map((child) => createDelayShipmentItem(child, item));
|
||||
return children.filter(Boolean).map((child) => createDelayShipmentItem(child, item));
|
||||
}
|
||||
return [createDelayShipmentItem(item)];
|
||||
return [createDelayShipmentItem(item, item)];
|
||||
})
|
||||
.filter((item) => item.orderItemId > 0 && item.maxCount > 0);
|
||||
.filter((item) => item.maxCount > 0);
|
||||
};
|
||||
const closeDelayShipmentPopup = () => {
|
||||
delayPopupRef.value?.close();
|
||||
@@ -301,7 +333,11 @@
|
||||
const onDelayShipmentCountChange = (index, value) => {
|
||||
const current = delayShipmentItems.value[index];
|
||||
if (!current) return;
|
||||
const next = Number(value || 0);
|
||||
const next = Number(value);
|
||||
if (!Number.isFinite(next)) {
|
||||
current.selectedCount = 0;
|
||||
return;
|
||||
}
|
||||
current.selectedCount = Math.min(current.maxCount, Math.max(0, next));
|
||||
};
|
||||
const openDelayShipmentPopup = () => {
|
||||
@@ -315,10 +351,6 @@
|
||||
}
|
||||
const nextItems = createDelayShipmentItems(state.orderInfo);
|
||||
if (!nextItems.length) {
|
||||
uni.showToast({
|
||||
title: '未获取到可延迟商品',
|
||||
icon: 'none',
|
||||
});
|
||||
return;
|
||||
}
|
||||
delayShipmentItems.value = nextItems;
|
||||
@@ -333,15 +365,18 @@
|
||||
});
|
||||
return;
|
||||
}
|
||||
const hasSelectedCount = delayShipmentItems.value.some((item) => Number(item.selectedCount) > 0);
|
||||
const items = delayShipmentItems.value
|
||||
.filter((item) => Number(item.selectedCount) > 0)
|
||||
.filter(
|
||||
(item) => Number(item.selectedCount) > 0 && hasDelayOrderItemId(item.submitOrderItemId),
|
||||
)
|
||||
.map((item) => ({
|
||||
orderItemId: item.orderItemId,
|
||||
orderItemId: item.submitOrderItemId,
|
||||
count: Number(item.selectedCount),
|
||||
}));
|
||||
if (!items.length) {
|
||||
uni.showToast({
|
||||
title: '请选择延迟发货数量',
|
||||
title: hasSelectedCount ? '订单商品信息异常' : '请选择延迟发货数量',
|
||||
icon: 'none',
|
||||
});
|
||||
return;
|
||||
|
||||
Reference in New Issue
Block a user