feat: 延迟发货api

This commit is contained in:
2026-08-05 11:10:52 +08:00
parent 1daec0121b
commit e8a4108b42
3 changed files with 546 additions and 27 deletions
+265 -25
View File
@@ -69,7 +69,7 @@
<view class="flex-center ju-flex-end m-t-12" v-if="props.index != 5 && isAiActionOrder"> <view class="flex-center ju-flex-end m-t-12" v-if="props.index != 5 && isAiActionOrder">
<AiOrderActionBar <AiOrderActionBar
:status="currentStatus" :status="currentStatus"
:disableDelayShipment="isPickUpOrder" :disableDelayShipment="isPickUpOrder || !isAiStoreOrder"
:showView="true" :showView="true"
@delay="onDelayShipment" @delay="onDelayShipment"
@now="onNowShipment" @now="onNowShipment"
@@ -82,6 +82,54 @@
<card_orderBan :data="props.data" @downData="downData"></card_orderBan> <card_orderBan :data="props.data" @downData="downData"></card_orderBan>
</view> </view>
</view> </view>
<uni-popup ref="delayPopupRef" type="bottom" background-color="#fff">
<view class="delay-popup" @tap.stop>
<view class="delay-popup__header">
<view>
<view class="delay-popup__title">延迟发货</view>
<view class="delay-popup__order-no">订单号:{{ props.data.no || '-' }}</view>
<view class="delay-popup__order-time">
下单时间:{{ formatCreateTime(props.data.createTime) || '-' }}
</view>
</view>
<view class="delay-popup__close" @tap.stop="closeDelayShipmentPopup">×</view>
</view>
<view class="delay-popup__desc">请选择当前商品及延迟发货数量</view>
<scroll-view scroll-y class="delay-popup__content">
<view
class="delay-popup__item"
v-for="(item, index) in delayShipmentItems"
:key="item.orderItemId || index"
>
<image class="delay-popup__item-image" :src="item.picUrl" mode="aspectFill" />
<view class="delay-popup__item-main">
<view class="delay-popup__item-name lineTwo">{{ item.spuName }}</view>
<view class="delay-popup__item-sku">{{ item.skuText || '-' }}</view>
<view class="delay-popup__item-footer flex-center ju-between">
<view class="delay-popup__item-count">最多可选 x{{ item.maxCount }}</view>
<su-number-box
v-model="item.selectedCount"
:min="0"
:max="item.maxCount"
:step="1"
background="#F6F7FB"
color="#333333"
@change="onDelayShipmentCountChange(index, $event)"
/>
</view>
</view>
</view>
</scroll-view>
<view class="delay-popup__actions">
<view class="delay-popup__btn delay-popup__btn--ghost" @tap.stop="closeDelayShipmentPopup">
取消
</view>
<view class="delay-popup__btn delay-popup__btn--primary" @tap.stop="submitDelayShipment">
确认延迟发货
</view>
</view>
</view>
</uni-popup>
</template> </template>
<script setup> <script setup>
import { import {
@@ -130,6 +178,13 @@
const onCopy = (no) => { const onCopy = (no) => {
proxy.$sheep.$helper.copyText(no); proxy.$sheep.$helper.copyText(no);
}; };
const formatSkuProperties = (properties) => {
const list = Array.isArray(properties) ? properties : [];
return list
.map((property) => property?.valueName)
.filter(Boolean)
.join(' ');
};
const formatCreateTime = (value) => { const formatCreateTime = (value) => {
if (!value) return ''; if (!value) return '';
const s = sheep?.$helper?.timeFormat const s = sheep?.$helper?.timeFormat
@@ -159,6 +214,7 @@
const isAiActionOrder = const isAiActionOrder =
String(props.data?.__source) === 'aishop' || Number(props.data?.type) === 5; String(props.data?.__source) === 'aishop' || Number(props.data?.type) === 5;
const isAiStoreOrder = computed(() => String(props.data?.__source) === 'aishop');
const isPickUpOrder = computed(() => { const isPickUpOrder = computed(() => {
if (Number(props.data?.deliveryType) === 2) return true; if (Number(props.data?.deliveryType) === 2) return true;
return Boolean( return Boolean(
@@ -182,6 +238,88 @@
const resolveAiOrderId = (data) => { const resolveAiOrderId = (data) => {
return data?.id || data?.orderId; return data?.id || data?.orderId;
}; };
const resolveDelayOrderItemId = (item) => {
return Number(item?.id || item?.orderItemId || item?.itemId || 0);
};
const delayPopupRef = ref();
const delayShipmentItems = ref([]);
const createDelayShipmentItems = (data) => {
const sourceItems = Array.isArray(data?.items) ? data.items : [];
return sourceItems
.map((item) => {
const maxCount = Number(item?.count || 0);
return {
orderItemId: resolveDelayOrderItemId(item),
picUrl: item?.picUrl || '',
spuName: item?.spuName || item?.name || '',
skuText: formatSkuProperties(item?.properties),
maxCount,
selectedCount: maxCount,
};
})
.filter((item) => item.orderItemId > 0 && item.maxCount > 0);
};
const closeDelayShipmentPopup = () => {
delayPopupRef.value?.close();
};
const onDelayShipmentCountChange = (index, value) => {
const current = delayShipmentItems.value[index];
if (!current) return;
const next = Number(value || 0);
current.selectedCount = Math.min(current.maxCount, Math.max(0, next));
};
const openDelayShipmentPopup = (data) => {
const id = resolveAiOrderId(data);
if (!id) {
uni.showToast({
title: '订单信息异常',
icon: 'none',
});
return;
}
const nextItems = createDelayShipmentItems(data);
if (!nextItems.length) {
uni.showToast({
title: '未获取到可延迟商品',
icon: 'none',
});
return;
}
delayShipmentItems.value = nextItems;
delayPopupRef.value?.open();
};
const submitDelayShipment = async () => {
const orderId = resolveAiOrderId(props.data);
if (!orderId) {
uni.showToast({
title: '订单信息异常',
icon: 'none',
});
return;
}
const items = delayShipmentItems.value
.filter((item) => Number(item.selectedCount) > 0)
.map((item) => ({
orderItemId: item.orderItemId,
count: Number(item.selectedCount),
}));
if (!items.length) {
uni.showToast({
title: '请选择延迟发货数量',
icon: 'none',
});
return;
}
const { code } = await aiDelayedShipment({
orderId,
items,
});
if (code === 0) {
closeDelayShipmentPopup();
currentStatus.value = 50;
emit('downData');
}
};
const onDelayShipment = () => { const onDelayShipment = () => {
delayShipment(props.data); delayShipment(props.data);
@@ -193,30 +331,7 @@
function delayShipment(data) { function delayShipment(data) {
if (isPickUpOrder.value) return; if (isPickUpOrder.value) return;
const id = resolveAiOrderId(data); openDelayShipmentPopup(data);
if (!id) {
uni.showToast({
title: '订单信息异常',
icon: 'none',
});
return;
}
uni.showModal({
title: '延迟发货',
content: '请您确认是否暂时不需要发货,确认后该产品将为您安排延迟发货',
confirmColor: '#FA7E31',
success: async function (res) {
if (!res.confirm) return;
const { code } = await aiDelayedShipment({
id,
status: 50,
});
if (code === 0) {
currentStatus.value = 50;
emit('downData');
}
},
});
} }
function nowShipment(data) { function nowShipment(data) {
@@ -331,6 +446,131 @@
line-height: 36rpx; line-height: 36rpx;
} }
.delay-popup {
background: #ffffff;
border-radius: 24rpx 24rpx 0 0;
padding: 32rpx 24rpx calc(24rpx + env(safe-area-inset-bottom));
box-sizing: border-box;
}
.delay-popup__header {
display: flex;
align-items: center;
justify-content: space-between;
margin-bottom: 12rpx;
}
.delay-popup__title {
font-size: 34rpx;
font-weight: 600;
color: #333333;
}
.delay-popup__order-no {
margin-top: 8rpx;
font-size: 22rpx;
line-height: 32rpx;
color: #999999;
word-break: break-all;
}
.delay-popup__order-time {
margin-top: 4rpx;
font-size: 22rpx;
line-height: 32rpx;
color: #999999;
}
.delay-popup__close {
width: 56rpx;
height: 56rpx;
border-radius: 50%;
background: #f3f4f6;
line-height: 56rpx;
text-align: center;
font-size: 36rpx;
color: #666666;
}
.delay-popup__desc {
font-size: 24rpx;
color: #999999;
margin-bottom: 24rpx;
}
.delay-popup__content {
max-height: 720rpx;
}
.delay-popup__item {
display: flex;
padding: 20rpx 0;
border-bottom: 1rpx solid #f2f2f2;
}
.delay-popup__item-image {
width: 144rpx;
height: 144rpx;
border-radius: 12rpx;
flex-shrink: 0;
margin-right: 20rpx;
background: #f5f5f5;
}
.delay-popup__item-main {
flex: 1;
min-width: 0;
}
.delay-popup__item-name {
font-size: 28rpx;
line-height: 40rpx;
color: #333333;
}
.delay-popup__item-sku {
margin-top: 10rpx;
font-size: 24rpx;
line-height: 34rpx;
color: #999999;
}
.delay-popup__item-footer {
margin-top: 20rpx;
}
.delay-popup__item-count {
font-size: 24rpx;
color: #666666;
}
.delay-popup__actions {
display: flex;
align-items: center;
gap: 20rpx;
margin-top: 32rpx;
}
.delay-popup__btn {
flex: 1;
height: 84rpx;
line-height: 84rpx;
text-align: center;
border-radius: 42rpx;
font-size: 28rpx;
font-weight: 500;
}
.delay-popup__btn--ghost {
background: #f2f3f5;
color: #333333;
}
.delay-popup__btn--primary {
background: linear-gradient(135deg, #fa8735 0%, #fe3b48 100%);
color: #ffffff;
}
.price { .price {
color: #ee0a24; color: #ee0a24;
font-size: 24rpx; font-size: 24rpx;
+280 -1
View File
@@ -98,7 +98,7 @@
<AiOrderActionBar <AiOrderActionBar
v-if="isAiActionOrder" v-if="isAiActionOrder"
:status="Number(state.orderInfo.status)" :status="Number(state.orderInfo.status)"
:disableDelayShipment="isPickUpOrder" :disableDelayShipment="isPickUpOrder || !isAiStoreOrder"
@delay="delayShipment" @delay="delayShipment"
@now="nowShipment" @now="nowShipment"
@confirm="confirmReceiveOrder" @confirm="confirmReceiveOrder"
@@ -107,6 +107,54 @@
<card_orderBan v-else :data="state.orderInfo" @downData="getOrderDetail" type="2"></card_orderBan> <card_orderBan v-else :data="state.orderInfo" @downData="getOrderDetail" type="2"></card_orderBan>
</view> </view>
</su-fixed> </su-fixed>
<uni-popup ref="delayPopupRef" type="center" background-color="transparent">
<view class="delay-popup" @tap.stop>
<view class="delay-popup__header">
<view>
<view class="delay-popup__title">延迟发货</view>
<view class="delay-popup__order-no">订单号:{{ state.orderInfo.no || '-' }}</view>
<view class="delay-popup__order-time">
下单时间:{{ formatCreateTime(state.orderInfo.createTime) || '-' }}
</view>
</view>
<view class="delay-popup__close" @tap.stop="closeDelayShipmentPopup">×</view>
</view>
<view class="delay-popup__desc">请选择当前商品及延迟发货数量</view>
<scroll-view scroll-y class="delay-popup__content">
<view
class="delay-popup__item"
v-for="(item, index) in delayShipmentItems"
:key="item.orderItemId || index"
>
<image class="delay-popup__item-image" :src="item.picUrl" mode="aspectFill" />
<view class="delay-popup__item-main">
<view class="delay-popup__item-name lineTwo">{{ item.spuName }}</view>
<view class="delay-popup__item-sku">{{ item.skuText || '-' }}</view>
<view class="delay-popup__item-footer flex-center ju-between">
<view class="delay-popup__item-count">最多可选 x{{ item.maxCount }}</view>
<su-number-box
v-model="item.selectedCount"
:min="0"
:max="item.maxCount"
:step="1"
background="#F6F7FB"
color="#333333"
@change="onDelayShipmentCountChange(index, $event)"
/>
</view>
</view>
</view>
</scroll-view>
<view class="delay-popup__actions">
<view class="delay-popup__btn delay-popup__btn--ghost" @tap.stop="closeDelayShipmentPopup">
取消
</view>
<view class="delay-popup__btn delay-popup__btn--primary" @tap.stop="submitDelayShipment">
确认延迟发货
</view>
</view>
</view>
</uni-popup>
</s-pages> </s-pages>
</template> </template>
@@ -151,6 +199,13 @@
const onCopy = () => { const onCopy = () => {
sheep.$helper.copyText(state.orderInfo.no); sheep.$helper.copyText(state.orderInfo.no);
}; };
const formatCreateTime = (value) => {
if (!value) return '';
const s = sheep?.$helper?.timeFormat
? sheep.$helper.timeFormat(value, 'yyyy-mm-dd hh:MM:ss')
: String(value);
return s || '';
};
const pickUpVerifyRef = ref(); const pickUpVerifyRef = ref();
@@ -177,6 +232,7 @@
if (!isAiActionOrder.value) return true; if (!isAiActionOrder.value) return true;
const status = Number(state.orderInfo?.status); const status = Number(state.orderInfo?.status);
if ([0, 20].includes(status)) return true; if ([0, 20].includes(status)) return true;
if (!isAiStoreOrder.value) return false;
if (isPickUpOrder.value) return false; if (isPickUpOrder.value) return false;
return [10, 50].includes(status); return [10, 50].includes(status);
}); });
@@ -198,9 +254,104 @@
const resolveAiOrderId = (data) => { const resolveAiOrderId = (data) => {
return data?.id || data?.orderId; return data?.id || data?.orderId;
}; };
const resolveDelayOrderItemId = (item) => {
return Number(item?.id || item?.orderItemId || item?.itemId || 0);
};
const formatSkuProperties = (properties) => {
const list = Array.isArray(properties) ? properties : [];
return list
.map((property) => property?.valueName)
.filter(Boolean)
.join(' ');
};
const isAiStoreOrder = computed(() => {
return String(state.source) === 'aishop' || String(state.orderInfo?.__source) === 'aishop';
});
const delayPopupRef = ref();
const delayShipmentItems = ref([]);
const createDelayShipmentItems = (data) => {
const sourceItems = Array.isArray(data?.items) ? data.items : [];
return sourceItems
.map((item) => {
const maxCount = Number(item?.count || 0);
return {
orderItemId: resolveDelayOrderItemId(item),
picUrl: item?.picUrl || '',
spuName: item?.spuName || item?.name || '',
skuText: formatSkuProperties(item?.properties),
maxCount,
selectedCount: maxCount,
};
})
.filter((item) => item.orderItemId > 0 && item.maxCount > 0);
};
const closeDelayShipmentPopup = () => {
delayPopupRef.value?.close();
};
const onDelayShipmentCountChange = (index, value) => {
const current = delayShipmentItems.value[index];
if (!current) return;
const next = Number(value || 0);
current.selectedCount = Math.min(current.maxCount, Math.max(0, next));
};
const openDelayShipmentPopup = () => {
const id = resolveAiOrderId(state.orderInfo);
if (!id) {
uni.showToast({
title: '订单信息异常',
icon: 'none',
});
return;
}
const nextItems = createDelayShipmentItems(state.orderInfo);
if (!nextItems.length) {
uni.showToast({
title: '未获取到可延迟商品',
icon: 'none',
});
return;
}
delayShipmentItems.value = nextItems;
delayPopupRef.value?.open();
};
const submitDelayShipment = async () => {
const orderId = resolveAiOrderId(state.orderInfo);
if (!orderId) {
uni.showToast({
title: '订单信息异常',
icon: 'none',
});
return;
}
const items = delayShipmentItems.value
.filter((item) => Number(item.selectedCount) > 0)
.map((item) => ({
orderItemId: item.orderItemId,
count: Number(item.selectedCount),
}));
if (!items.length) {
uni.showToast({
title: '请选择延迟发货数量',
icon: 'none',
});
return;
}
const { code } = await aiDelayedShipment({
orderId,
items,
});
if (code === 0) {
closeDelayShipmentPopup();
getOrderDetail();
}
};
function delayShipment() { function delayShipment() {
if (isPickUpOrder.value) return; if (isPickUpOrder.value) return;
if (isAiStoreOrder.value) {
openDelayShipmentPopup();
return;
}
const id = resolveAiOrderId(state.orderInfo); const id = resolveAiOrderId(state.orderInfo);
if (!id) { if (!id) {
uni.showToast({ uni.showToast({
@@ -631,4 +782,132 @@
box-sizing: border-box; box-sizing: border-box;
box-shadow: 0px -4px 30px 0px rgba(0, 0, 0, 0.1); box-shadow: 0px -4px 30px 0px rgba(0, 0, 0, 0.1);
} }
.delay-popup {
width: 680rpx;
max-height: 78vh;
background: #ffffff;
border-radius: 24rpx;
padding: 32rpx 24rpx;
box-sizing: border-box;
overflow: hidden;
}
.delay-popup__header {
display: flex;
align-items: center;
justify-content: space-between;
margin-bottom: 12rpx;
}
.delay-popup__title {
font-size: 34rpx;
font-weight: 600;
color: #333333;
}
.delay-popup__order-no {
margin-top: 8rpx;
font-size: 22rpx;
line-height: 32rpx;
color: #999999;
word-break: break-all;
}
.delay-popup__order-time {
margin-top: 4rpx;
font-size: 22rpx;
line-height: 32rpx;
color: #999999;
}
.delay-popup__close {
width: 56rpx;
height: 56rpx;
border-radius: 50%;
background: #f3f4f6;
line-height: 56rpx;
text-align: center;
font-size: 36rpx;
color: #666666;
}
.delay-popup__desc {
font-size: 24rpx;
color: #999999;
margin-bottom: 24rpx;
}
.delay-popup__content {
max-height: 760rpx;
}
.delay-popup__item {
display: flex;
padding: 20rpx 0;
border-bottom: 1rpx solid #f2f2f2;
}
.delay-popup__item-image {
width: 144rpx;
height: 144rpx;
border-radius: 12rpx;
flex-shrink: 0;
margin-right: 20rpx;
background: #f5f5f5;
}
.delay-popup__item-main {
flex: 1;
min-width: 0;
}
.delay-popup__item-name {
font-size: 28rpx;
line-height: 40rpx;
color: #333333;
}
.delay-popup__item-sku {
margin-top: 10rpx;
font-size: 24rpx;
line-height: 34rpx;
color: #999999;
}
.delay-popup__item-footer {
margin-top: 20rpx;
}
.delay-popup__item-count {
font-size: 24rpx;
color: #666666;
}
.delay-popup__actions {
display: flex;
align-items: center;
gap: 20rpx;
margin-top: 32rpx;
}
.delay-popup__btn {
flex: 1;
height: 84rpx;
line-height: 84rpx;
text-align: center;
border-radius: 42rpx;
font-size: 28rpx;
font-weight: 500;
}
.delay-popup__btn--ghost {
background: #f2f3f5;
color: #333333;
}
.delay-popup__btn--primary {
background: linear-gradient(135deg, #fa8735 0%, #fe3b48 100%);
color: #ffffff;
}
</style> </style>
+1 -1
View File
@@ -322,7 +322,7 @@ export function aiDelayedShipment(params : any) {
return request({ return request({
url: '/aishop/order/update/delayedShipment', url: '/aishop/order/update/delayedShipment',
method: 'post', method: 'post',
params, data: params,
}) })
} }