diff --git a/config/env.js b/config/env.js index 2010f0f..32e742a 100644 --- a/config/env.js +++ b/config/env.js @@ -2,7 +2,7 @@ // ============ 环境切换开关(修改这里即可切换环境)============ // 可选值: 'development' | 'test' | 'production' -const CURRENT_ENV = 'production' +const CURRENT_ENV = 'development' // =========================================================== export const ENV_CONFIG = { diff --git a/src/api/glt/gltTicketOrder/model/index.ts b/src/api/glt/gltTicketOrder/model/index.ts index e474dfa..36f1722 100644 --- a/src/api/glt/gltTicketOrder/model/index.ts +++ b/src/api/glt/gltTicketOrder/model/index.ts @@ -62,6 +62,10 @@ export interface GltTicketOrder { avatar?: string; // 手机号码 phone?: string; + // 收货人姓名 + receiverName?: string; + // 收货人手机号码 + receiverPhone?: string; // 排序(数字越小越靠前) sortNumber?: number; // 备注 diff --git a/src/rider/orders/index.tsx b/src/rider/orders/index.tsx index 39f565a..1e95a6b 100644 --- a/src/rider/orders/index.tsx +++ b/src/rider/orders/index.tsx @@ -410,7 +410,7 @@ export default function RiderOrders() { 客户: - {o.nickname || '-'} {o.phone ? `(${o.phone})` : ''} + {o.receiverName || o.nickname} {o.receiverPhone ? `(${o.receiverPhone})` : o.phone} 收货地址: diff --git a/src/user/ticket/use.tsx b/src/user/ticket/use.tsx index 1e741ed..8cd75ec 100644 --- a/src/user/ticket/use.tsx +++ b/src/user/ticket/use.tsx @@ -834,21 +834,30 @@ const OrderConfirm = () => { } } - const addrId = Number(editingOrderRes.addressId) - const addrIdSafe = Number.isFinite(addrId) && addrId > 0 ? addrId : undefined - if (addrIdSafe) { - const hit = addressRes?.find(a => Number(a?.id) === addrIdSafe) - if (hit?.id) { - setAddress(hit) - } else { - try { - const addr = await getShopUserAddress(addrIdSafe) - if (addr?.id) setAddress(addr) - } catch (e) { - console.error('加载订单收货地址失败:', e) + // 编辑模式下优先使用默认地址(用户刚从地址列表选择的) + // 新下单模式使用订单关联的地址 + let targetAddr: ShopUserAddress | undefined = undefined + if (isEditMode) { + // 编辑模式:优先使用默认地址 + targetAddr = addressRes?.find(a => a.isDefault) || addressRes?.[0] + } else { + // 新下单模式:使用订单关联的地址 + const addrId = Number(editingOrderRes?.addressId) + const addrIdSafe = Number.isFinite(addrId) && addrId > 0 ? addrId : undefined + if (addrIdSafe) { + targetAddr = addressRes?.find(a => Number(a?.id) === addrIdSafe) + if (!targetAddr?.id) { + try { + targetAddr = await getShopUserAddress(addrIdSafe) + } catch (e) { + console.error('加载订单收货地址失败:', e) + } } } } + if (targetAddr?.id) { + setAddress(targetAddr) + } } // Tickets are non-blocking for first paint; load in background. loadUserTickets()