From 31c4aa36a54a8bfa179e9579d435102728e5fa24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E5=96=B5=E5=92=AA?= <15233722133@163.com>
Date: Thu, 24 Sep 2026 11:20:36 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20ai=E5=BA=97=E9=93=BA=E8=AE=A2=E5=8D=95?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BF=AE=E6=94=B9=E9=85=8D=E9=80=81=E5=8A=9F?=
=?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/card_orderBan/card_orderBan.vue | 69 +-
components/orderItem/AiOrderActionBar.vue | 35 +-
components/orderItem/orderItem.vue | 41 ++
main.js | 1 -
pages.json | 10 +
pages/order/modifyDelivery.vue | 745 +++++++++++++++++++++
pages/user/goods_details_store/index.vue | 48 +-
sheep/api/ai/index.ts | 23 +
sheep/api/trade/order.js | 25 +-
sheep/api/trade/storePickup.js | 20 +
sheep/helper/delivery.js | 43 ++
11 files changed, 1037 insertions(+), 23 deletions(-)
create mode 100644 pages/order/modifyDelivery.vue
create mode 100644 sheep/api/trade/storePickup.js
create mode 100644 sheep/helper/delivery.js
diff --git a/components/card_orderBan/card_orderBan.vue b/components/card_orderBan/card_orderBan.vue
index 88f6c74..c52ed4b 100644
--- a/components/card_orderBan/card_orderBan.vue
+++ b/components/card_orderBan/card_orderBan.vue
@@ -15,14 +15,17 @@
>
催一催
+
+ 修改配送
+
{
+ const d = props.data || {};
+ if (d.thirdPartyOrder === true || d.thirdPartyOrder === 'true' || d.thirdPartyOrder === 1) {
+ return true;
+ }
+ const items = Array.isArray(d.items) ? d.items : [];
+ return items.some(
+ (it) => it.thirdPartyOrder === true || it.thirdPartyOrder === 'true' || it.thirdPartyOrder === 1,
+ );
+ });
+ const showModifyDeliveryBtn = computed(() => {
+ if (!isThirdPartyOrder.value) return false;
+ const d = props.data || {};
+ const canUpdate = d.canUpdateDeliveryType === true || d.canUpdateDeliveryType === 'true' || d.canUpdateDeliveryType === 1;
+ if (!canUpdate) return false;
+ return String(d?.status) === '10';
+ });
+
+ const shouldShowBtn = (item) => {
+ if (item.id !== 3 && item.value.split(',').indexOf(String(props?.data?.status)) === -1) {
+ return false;
+ }
+ if (item.id === 3 && Number(props?.data?.type) === 5) return false;
+ if (item.id === 3 && props?.data?.payChannelCode === 'cash_payment') return false;
+ if (item.id === 3 && isAllRefunded.value) return false;
+ if (Number(props.data?.deliveryType) === 2 && [4, 8, 11].includes(item.id)) {
+ return false;
+ }
+ return true;
+ };
+
let btns = ref([
{
id: 1,
@@ -197,6 +232,9 @@
case 8:
deleteOrder();
break;
+ case 13:
+ goModifyDelivery();
+ break;
}
};
// 取消订单
@@ -310,6 +348,22 @@
const upData = () => {
emit('downData');
};
+ const goModifyDelivery = () => {
+ const id = props.data?.orderId || props.data?.id;
+ if (!id) return;
+ const params = {
+ id,
+ orderTypeId: 1,
+ currentType: 0,
+ };
+ if (props.data?.type !== undefined && props.data?.type !== null) {
+ params.type = props.data.type;
+ }
+ if (props.data?.__source) {
+ params.source = props.data.__source;
+ }
+ sheep.$router.go('/pages/order/modifyDelivery', params);
+ };
diff --git a/components/orderItem/AiOrderActionBar.vue b/components/orderItem/AiOrderActionBar.vue
index 5a9f4a2..4f382a8 100644
--- a/components/orderItem/AiOrderActionBar.vue
+++ b/components/orderItem/AiOrderActionBar.vue
@@ -7,6 +7,13 @@
>
催一催
+
+ 修改配送
+
{
+ const v = props.thirdPartyOrder;
+ if (v === true || v === 'true' || v === 1) return true;
+ return false;
+ });
+ const showModifyDelivery = computed(() => {
+ if (!isThirdPartyOrder.value) return false;
+ const v = props.canUpdateDeliveryType;
+ if (!(v === true || v === 'true' || v === 1)) return false;
+ const s = Number(props.status);
+ return s === 10;
});
// 延迟发货按钮:仅允许【待发货(10/伪50)、部分发货(15)】状态展示
@@ -197,7 +225,7 @@
);
});
- const emit = defineEmits(['delay', 'now', 'view', 'confirm', 'pay', 'cancel', 'express', 'remind']);
+ const emit = defineEmits(['delay', 'now', 'view', 'confirm', 'pay', 'cancel', 'express', 'remind', 'modifyDelivery']);
diff --git a/components/orderItem/orderItem.vue b/components/orderItem/orderItem.vue
index f9c37f9..8af8633 100644
--- a/components/orderItem/orderItem.vue
+++ b/components/orderItem/orderItem.vue
@@ -87,6 +87,8 @@
:logisticsNo="props.data.logisticsNo"
:deliveryTime="props.data.deliveryTime"
:hasLogistics="hasLogistics"
+ :thirdPartyOrder="resolveThirdPartyOrder()"
+ :canUpdateDeliveryType="props.data?.canUpdateDeliveryType"
@delay="onDelayShipment"
@now="onNowShipment"
@view="goAiOrderInfo"
@@ -94,6 +96,7 @@
@pay="goPay"
@cancel="cancelAiOrder"
@express="goExpressLog"
+ @modifyDelivery="goModifyDelivery"
/>
@@ -231,6 +234,44 @@
Number(props.data?.type) === 4 ||
Number(props.data?.type) === 5;
const isAiStoreOrder = computed(() => String(props.data?.__source) === 'aishop');
+ const resolveThirdPartyOrder = () => {
+ const d = props.data || {};
+ if (d.thirdPartyOrder === true || d.thirdPartyOrder === 'true' || d.thirdPartyOrder === 1) {
+ return true;
+ }
+ const items = Array.isArray(d.items) ? d.items : [];
+ return items.some(
+ (it) => it.thirdPartyOrder === true || it.thirdPartyOrder === 'true' || it.thirdPartyOrder === 1,
+ );
+ };
+ const resolveOrderTypeForModify = () => {
+ const t = Number(props.data?.type ?? 0);
+ if (t === 4 || t === 5) return t;
+ // 只要能触发 AiOrderActionBar 的 modifyDelivery 按钮,就是 AI/店铺类订单
+ if (isAiActionOrder) return 4;
+ return 1;
+ };
+ const goModifyDelivery = () => {
+ const id = props.data?.id || props.data?.orderId;
+ if (!id) return;
+ const dataType = Number(props.data?.type ?? 0);
+ let finalType = dataType;
+ if (finalType !== 4 && finalType !== 5) {
+ finalType = isAiActionOrder ? 4 : 1;
+ }
+ const finalSource = props.data?.__source || (isAiActionOrder ? 'aishop' : '');
+ const currentType = isAiStoreOrder.value || isAiActionOrder ? 1 : 0;
+ const params = {
+ id,
+ orderTypeId: resolveOrderTypeForModify(),
+ type: finalType,
+ currentType,
+ };
+ if (finalSource) {
+ params.source = finalSource;
+ }
+ proxy.utils.go('/pages/order/modifyDelivery', params);
+ };
const isPickUpOrder = computed(() => {
if (Number(props.data?.deliveryType) === 2) return true;
return Boolean(
diff --git a/main.js b/main.js
index f60b8c7..d43f2ae 100644
--- a/main.js
+++ b/main.js
@@ -19,7 +19,6 @@ import { gethotupdatelist } from '@/sheep/api/index/index'
// import { setupVConsole } from '@/utils/vconsole.js'
-
export function createApp() {
// setupVConsole();
diff --git a/pages.json b/pages.json
index bade419..bcdfccf 100644
--- a/pages.json
+++ b/pages.json
@@ -297,6 +297,16 @@
"auth": true,
"title": "物流轨迹"
}
+ },
+ {
+ "path": "modifyDelivery",
+ "style": {
+ "navigationBarTitleText": "修改配送"
+ },
+ "meta": {
+ "auth": true,
+ "title": "修改配送"
+ }
}
]
},
diff --git a/pages/order/modifyDelivery.vue b/pages/order/modifyDelivery.vue
new file mode 100644
index 0000000..b1a84e5
--- /dev/null
+++ b/pages/order/modifyDelivery.vue
@@ -0,0 +1,745 @@
+
+
+
+
+
+
+
+ 订单编号
+ {{ orderSn }}
+
+
+
+
+
+
+ 下单时间
+
+ {{ formatTime(orderCreateTime) }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ v.spuName }}
+
+
+ ¥
+ {{ fen2yuan(resolvePrice(v)) }}
+
+
+
+
+ {{ formatSkuProperties(v.properties) }}
+
+
+ {{ `x${resolveCount(v)}` }}
+
+
+
+
+
+ 商品信息加载中…
+
+
+
+
+
+
+
+
+ {{ deliveryInfo.pickUpInfo.name }}
+ {{ deliveryInfo.pickUpInfo.phone || '' }}
+
+
+ {{ formatPickUpAddress(deliveryInfo.pickUpInfo) }}
+
+
+
+ 选择自提门店
+
+
+
+
+
+
+
+ 联系人
+
+
+
+ 联系电话
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/user/goods_details_store/index.vue b/pages/user/goods_details_store/index.vue
index 8870e7c..6fe99a5 100644
--- a/pages/user/goods_details_store/index.vue
+++ b/pages/user/goods_details_store/index.vue
@@ -343,22 +343,40 @@ const checked = (addressInfo) => {
uni.showToast({ title: '当前门店暂不支持自提', icon: 'none' });
return;
}
- uni.$emit('SELECT_PICK_UP_INFO', {
- addressInfo,
- });
- const routerBack = sheep?.$router?.back;
- if (typeof routerBack === 'function') {
- try {
- routerBack.call(sheep.$router);
- return;
- } catch (e) {
- console.error('[checked] sheep.$router.back err', e);
+ const goBackSafe = () => {
+ const fallbackBack = () => {
+ try {
+ uni.navigateBack({
+ fail: () => {
+ try {
+ const go = sheep?.$router?.go;
+ if (typeof go === 'function') {
+ go.call(sheep.$router, '/pages/order/modifyDelivery');
+ return;
+ }
+ } catch (e2) { /* ignore */ }
+ try { uni.redirectTo({ url: '/pages/order/modifyDelivery' }); } catch (e3) { /* ignore */ }
+ },
+ });
+ } catch (e) {}
+ };
+ const routerBack = sheep?.$router?.back;
+ if (typeof routerBack === 'function') {
+ try {
+ routerBack.call(sheep.$router);
+ return;
+ } catch (e) {
+ fallbackBack();
+ return;
+ }
}
- }
- uni.navigateBack();
- } catch (e) {
- console.error('[checked] top exception', e);
- }
+ fallbackBack();
+ };
+ try {
+ uni.$emit('SELECT_PICK_UP_INFO', { addressInfo });
+ } catch (e) {}
+ goBackSafe();
+ } catch (e) {}
};
const onSelect = (item) => {
diff --git a/sheep/api/ai/index.ts b/sheep/api/ai/index.ts
index d3b3717..1f576fa 100644
--- a/sheep/api/ai/index.ts
+++ b/sheep/api/ai/index.ts
@@ -157,6 +157,29 @@ export function getOrderDetail(params: any) {
params,
});
}
+// 修改订单配送方式(待发货第三方订单)- AI 店铺订单专用
+export function updateDeliveryType(data: any) {
+ const payload = { ...(data || {}) };
+ if (Number(payload.deliveryType) === 2) {
+ delete payload.addressId;
+ } else {
+ delete payload.pickUpStoreId;
+ delete payload.receiverName;
+ delete payload.receiverMobile;
+ }
+ if (!['', undefined, null].includes(payload.receiverMobile)) {
+ payload.receiverMobile = String(payload.receiverMobile);
+ }
+ return request({
+ url: `/aishop/order/update-delivery-type`,
+ method: 'PUT',
+ data: payload,
+ custom: {
+ showLoading: true,
+ showError: true,
+ },
+ });
+}
// 获取订单列表 aishop/order/page
export function getOrderPage(params: any) {
return request({
diff --git a/sheep/api/trade/order.js b/sheep/api/trade/order.js
index 4d938ea..8593e0f 100644
--- a/sheep/api/trade/order.js
+++ b/sheep/api/trade/order.js
@@ -168,7 +168,30 @@ const OrderApi = {
return request({
url: `/trade/after-sale/create`,
method: 'POST',
- params: params,
+ params: params
+ });
+ },
+ // 修改订单配送方式(待发货第三方订单)
+ updateDeliveryType: (data) => {
+ const payload = { ...(data || {}) };
+ if (Number(payload.deliveryType) === 2) {
+ delete payload.addressId;
+ } else {
+ delete payload.pickUpStoreId;
+ delete payload.receiverName;
+ delete payload.receiverMobile;
+ }
+ if (!['', undefined, null].includes(payload.receiverMobile)) {
+ payload.receiverMobile = String(payload.receiverMobile);
+ }
+ return request({
+ url: `/trade/order/update-delivery-type`,
+ method: 'PUT',
+ data: payload,
+ custom: {
+ showLoading: true,
+ showError: true,
+ },
});
},
};
diff --git a/sheep/api/trade/storePickup.js b/sheep/api/trade/storePickup.js
new file mode 100644
index 0000000..7bb11fd
--- /dev/null
+++ b/sheep/api/trade/storePickup.js
@@ -0,0 +1,20 @@
+import request from '@/sheep/request';
+
+const StorePickupApi = {
+ getByOrderId: (orderId) =>
+ request({
+ url: '/trade/store-pickup/get',
+ method: 'GET',
+ params: { orderId },
+ custom: { showLoading: false },
+ }),
+ getByOrderIds: (orderIds) =>
+ request({
+ url: '/trade/store-pickup/list-by-order-ids',
+ method: 'GET',
+ params: { orderIds: (orderIds || []).join(',') },
+ custom: { showLoading: false },
+ }),
+};
+
+export default StorePickupApi;
diff --git a/sheep/helper/delivery.js b/sheep/helper/delivery.js
new file mode 100644
index 0000000..eef4d11
--- /dev/null
+++ b/sheep/helper/delivery.js
@@ -0,0 +1,43 @@
+export const createDeliveryInfo = () => ({
+ deliveryType: 1,
+ addressInfo: {},
+ pickUpInfo: {},
+ receiverName: '',
+ receiverMobile: '',
+});
+
+export const buildDeliveryPayload = (deliveryInfo = {}) => {
+ if (Number(deliveryInfo.deliveryType) === 2) {
+ return {
+ deliveryType: 2,
+ pickUpStoreId: deliveryInfo.pickUpInfo?.id,
+ receiverName: String(deliveryInfo.receiverName || '').trim(),
+ receiverMobile: String(deliveryInfo.receiverMobile || '').trim(),
+ };
+ }
+ return {
+ deliveryType: 1,
+ addressId: deliveryInfo.addressInfo?.id,
+ };
+};
+
+export const getDeliveryValidationMessage = (deliveryInfo = {}) => {
+ const payload = buildDeliveryPayload(deliveryInfo);
+ if (payload.deliveryType === 1) return payload.addressId ? '' : '请选择收货地址';
+ if (!(Number(payload.pickUpStoreId) > 0)) return '请选择自提门店';
+ if (!payload.receiverName) return '请输入联系人姓名';
+ if (!/^1\d{10}$/.test(payload.receiverMobile)) return '请输入正确的联系人手机号';
+ return '';
+};
+
+export const normalizeDeliveryFields = (data = {}) => {
+ const normalized = { ...data };
+ if (Number(normalized.deliveryType) === 2) {
+ delete normalized.addressId;
+ } else {
+ delete normalized.pickUpStoreId;
+ delete normalized.receiverName;
+ delete normalized.receiverMobile;
+ }
+ return normalized;
+};