统一状态码，优化对应逻辑

pages/mall/delivery/test/api-simulator.uvue

@@ -85,15 +85,17 @@
 		infoContent: 'SEND',
 		remark: '快件已到达【XX分拨中心】，准备发往下一站',
 		acceptTime: '',
-		carrier: '圆通速递'
+		carrier: '顺丰速运'
 	})
 
 	const statusOptions = [
-		{ label: '揽收 (GOT)', value: 'GOT' },
+		{ label: '已揽收 (GOT)', value: 'GOT' },
 		{ label: '运输中 (SEND)', value: 'SEND' },
 		{ label: '派送中 (SENT)', value: 'SENT' },
+		{ label: '待取件 (PICKUP)', value: 'PICKUP' },
 		{ label: '已签收 (SIGNED)', value: 'SIGNED' },
-		{ label: '异常 (FAILED)', value: 'FAILED' }
+		{ label: '异常 (FAILED)', value: 'FAILED' },
+		{ label: '退回 (RETURNED)', value: 'RETURNED' }
 	]
 
 	const currentStatusLabel = computed((): string => {

pages/mall/delivery/test/consumer-logistics-detail.uvue

@@ -8,7 +8,7 @@
 					<view class="status-text-wrap">
 						<text class="status-title">{{ getStatusText(order.status) }}</text>
 						<view class="status-desc-row">
-							<text v-for="(seg, i) in splitText(getLatestEventText())" :key="i" class="status-desc-text" :class="{ 'highlight': seg.isPhone }" @click="seg.isPhone ? makeCall(seg.raw as string) : null">{{ seg.text }}</text>
+							<text v-for="(seg, i) in splitText(getLatestEventText(), order.status)" :key="i" class="status-desc-text" :class="{ 'highlight': seg.isPhone }" @click="seg.isPhone ? makeCall(seg.raw as string) : null">{{ seg.text }}</text>
 						</view>
 					</view>
 			</view>
@@ -20,9 +20,10 @@
 				<image class="carrier-logo" src="/static/carrier-default.png" mode="aspectFit" />
 				<view class="carrier-detail">
 					<text class="carrier-name">{{ order.carrier }}快递</text>
-					<text class="waybill-no">运单号: {{ order.tracking_no }}</text>
+					<text v-if="order.tracking_no" class="waybill-no">运单号: {{ order.tracking_no }}</text>
+					<text v-else class="waybill-no">运单号: 暂无</text>
 				</view>
-				<button class="copy-btn" @click="copyTrackingNo">复制</button>
+				<button v-if="order.tracking_no" class="copy-btn" @click="copyTrackingNo">复制</button>
 			</view>
 		</view>
 
@@ -40,13 +41,13 @@
 					<!-- 内容区 -->
 					<view class="content">
 						<view class="event-header">
-								<view class="status-time-row">
-									<text class="status-label" :class="{active: index === 0}">{{ getStatusLabel(event.status_code) }}</text>
-									<text class="event-time" :class="{active: index === 0}">{{ event.event_time }}</text>
-								</view>
-								<view class="event-title-row">
-									<text v-for="(seg, i) in splitText(event.event_text)" :key="i" class="event-title-text" :class="{ 'highlight': seg.isPhone, 'active': index === 0 }" @click="seg.isPhone ? makeCall(seg.raw as string) : null">{{ seg.text }}</text>
-								</view>
+							<view class="status-time-row">
+								<text v-if="index === 0 || event.status_code !== statusHistory[index - 1].status_code" class="status-label" :class="{active: index === 0}">{{ getStatusLabel(event.status_code) }}</text>
+								<text class="event-time" :class="{active: index === 0, 'margin-left': index === 0 || event.status_code !== statusHistory[index - 1].status_code}">{{ event.event_time }}</text>
+							</view>
+							<view class="event-title-row">
+									<text v-for="(seg, i) in splitText(event.event_text, event.status_code)" :key="i" class="event-title-text" :class="{ 'highlight': seg.isPhone, 'active': index === 0 }" @click="seg.isPhone ? makeCall(seg.raw as string) : null">{{ seg.text }}</text>
+							</view>
 						</view>
 						<!-- 证据/签收图片 (POD) -->
 						<view v-if="event.evidence_urls.length > 0" class="evidence-grid">
@@ -84,14 +85,15 @@
 
 		<!-- 底部操作栏 -->
 		<view class="bottom-actions">
-			<button class="action-item" @click="refresh">🔄 刷新物流</button>
-			<button class="action-item" @click="showSupport">💬 物流客服</button>
+			<button v-if="order.status === 'READY_FOR_PICKUP'" class="action-item primary" @click="confirmReceipt">确认取件</button>
+			<button class="action-item" @click="refresh">刷新物流</button>
+			<button class="action-item" @click="showSupport">物流客服</button>
 		</view>
 	</view>
 </template>
 
 <script uts>
-	import { mockService, MockOrder, MockTrackingEvent } from './mock-service.uts'
+	import { mockService, MockOrder, MockTrackingEvent, LogisticsConstants } from './mock-service.uts'
 
 	export default {
 		data() {
@@ -135,19 +137,14 @@
 				this.statusHistory = [...tracking]
 			},
 			getStatusText(status: string): string {
-				const maps = { 
-					'SHIPPED': '已发货', 
-					'IN_TRANSIT': '运输中',
-					'DELIVERED': '已签收', 
-					'OUT_FOR_DELIVERY': '派送中', 
-					'PENDING': '待揽收', 
-					'EXCEPTION': '包裹异常' 
-				}
-				return (maps[status] != null) ? maps[status] : status
+				return mockService.getStatusText(status)
 			},
 			getStatusIcon(status: string): string {
-				const maps = { 'SHIPPED': '🚚', 'DELIVERED': '✅', 'OUT_FOR_DELIVERY': '🛵', 'PENDING': '📦', 'EXCEPTION': '❗' }
-				return (maps[status] != null) ? maps[status] : '📦'
+				return mockService.getStatusIcon(status)
+			},
+			getStatusLabel(status: string): string {
+				const label = LogisticsConstants.STATUS_LABELS_SHORT[status] as string | null
+				return (label != null) ? label : '状态'
 			},
 			getLatestEventText(): string {
 				if (this.statusHistory.length > 0) {
@@ -163,6 +160,10 @@
 				return current != '' && current != prev
 			},
 			copyTrackingNo() {
+				if (!this.order.tracking_no || this.order.tracking_no === '') {
+					uni.showToast({ title: '暂无运单号', icon: 'none' })
+					return
+				}
 				uni.setClipboardData({
 					data: this.order.tracking_no,
 					success: () => uni.showToast({ title: '单号已复制' })
@@ -186,6 +187,25 @@
 					uni.showToast({ title: '暂无更多更新', icon: 'none' })
 				}
 			},
+			async confirmReceipt() {
+				uni.showModal({
+					title: '确认取件',
+					content: '您是否已收到包裹？确认后订单将变更为已签收状态。',
+					success: async (res) => {
+						if (res.confirm) {
+							uni.showLoading({ title: '处理中...' })
+							const ok = await mockService.confirmReceipt(this.orderNo)
+							uni.hideLoading()
+							if (ok) {
+								uni.showToast({ title: '取件成功' })
+								this.loadData()
+							} else {
+								uni.showToast({ title: '操作失败，请重试', icon: 'none' })
+							}
+						}
+					}
+				})
+			},
 			previewImage(url: string, urls: string[]) {
 				uni.previewImage({ current: url, urls: urls })
 			},
@@ -193,26 +213,25 @@
 				uni.showToast({ title: '接入平台客服中...', icon: 'none' })
 			},
 			getStatusLabel(code: string): string {
-				const maps = {
-					'SHIPPED': '已发货',
-					'IN_TRANSIT': '运输中',
-					'ARRIVED_HUB': '中转中',
-					'OUT_FOR_DELIVERY': '派送中',
-					'DELIVERED': '已签收',
-					'EXCEPTION': '异常'
-				}
-				return (maps[code] != null) ? maps[code] : code
+				return mockService.getStatusText(code)
 			},
-			splitText(text: string): UTSJSONObject[] {
+			splitText(text: string, statusCode: string): UTSJSONObject[] {
+				// 1. 先进行描述泛化（运输中脱敏）
+				const processedText = mockService.getDisplayMessage(text, statusCode)
+				
 				const res = [] as UTSJSONObject[]
 				const regex = /(1[3-9]\d{9})/g
-				const parts = text.split(regex)
+				const parts = processedText.split(regex)
 				for (let i = 0; i < parts.length; i++) {
 					const part = parts[i]
 					if (i % 2 === 1) {
-						// 消费者端：脱敏显示，但保持可点击
-						const masked = part.substring(0, 3) + '****' + part.substring(7)
-						res.push({ text: masked, raw: part, isPhone: true } as UTSJSONObject)
+						// 消费者端：仅在派送中环节展示手机号且必须脱敏
+						if (statusCode === 'OUT_FOR_DELIVERY') {
+							const masked = part.substring(0, 3) + '****' + part.substring(7)
+							res.push({ text: masked, raw: part, isPhone: true } as UTSJSONObject)
+						} else {
+							res.push({ text: '[联系方式已隐藏]', raw: '', isPhone: false } as UTSJSONObject)
+						}
 					} else if (part.length > 0) {
 						res.push({ text: part, raw: '', isPhone: false } as UTSJSONObject)
 					}
@@ -231,7 +250,7 @@
 	.container {
 		background-color: #f3f4f6;
 		min-height: 100vh;
-		padding-bottom: 160rpx;
+		padding-bottom: 350rpx;
 	}
 	.status-header {
 		background: linear-gradient(135deg, #007AFF, #0056b3);
@@ -439,6 +458,10 @@
 	.status-label.active {
 		color: #007AFF;
 	}
+	.event-time.margin-left {
+		margin-left: 0;
+	}
+	/* 当状态标签隐藏时，时间不需要左间距，但为了对齐建议保持一定偏离或者在没有标签时直接显示 */
 	.event-title {
 		font-size: 26rpx;
 		color: #666;
@@ -472,16 +495,27 @@
 		position: fixed;
 		bottom: 0; left: 0; right: 0;
 		background-color: #fff;
-		padding: 20rpx 30rpx;
+		padding: 16rpx 30rpx 30rpx;
 		display: flex;
-		justify-content: space-around;
-		box-shadow: 0 -2rpx 10rpx rgba(0,0,0,0.05);
+		flex-direction: column;
+		gap: 12rpx;
+		box-shadow: 0 -4rpx 16rpx rgba(0,0,0,0.08);
+		z-index: 100;
 	}
 	.action-item {
-		font-size: 24rpx;
+		width: 100%;
+		font-size: 26rpx;
 		background-color: #f8fafc;
 		border: 1rpx solid #e2e8f0;
 		margin: 0;
-		padding: 0 30rpx;
+		height: 72rpx;
+		line-height: 72rpx;
+		border-radius: 36rpx;
+	}
+	.action-item.primary {
+		background-color: #409eff;
+		color: #fff;
+		border-color: #409eff;
+		font-weight: 500;
 	}
 </style>

pages/mall/delivery/test/consumer-order-list.uvue

@@ -24,7 +24,7 @@
 				<view class="card-body">
 					<view class="pkg-icon">📦</view>
 					<view class="pkg-info">
-						<text class="latest-msg">{{ order.current_status_text || '包裹准备中' }}</text>
+						<text class="latest-msg">{{ getDisplayMessage(order.current_status_text || '', order.status) }}</text>
 						<text class="order-meta">订单号: {{ order.order_no }}</text>
 					</view>
 					<text class="arrow">></text>
@@ -77,15 +77,10 @@
 				this.orders = [...data]
 			},
 			getStatusText(status: string): string {
-				const maps = { 
-					'SHIPPED': '已发货', 
-					'IN_TRANSIT': '运输中',
-					'DELIVERED': '已签收', 
-					'OUT_FOR_DELIVERY': '派送中', 
-					'PENDING': '待揽收',
-					'EXCEPTION': '包裹异常'
-				}
-				return (maps[status] != null) ? maps[status] : '处理中'
+				return mockService.getStatusText(status)
+			},
+			getDisplayMessage(text: string, status: string): string {
+				return mockService.getDisplayMessage(text, status)
 			},
 			goDetail(orderNo: string) {
 				uni.navigateTo({

pages/mall/delivery/test/merchant-order-detail.uvue

@@ -39,7 +39,7 @@
 					
 					<view class="timeline-content">
 						<view class="event-title-row">
-							<text v-for="(seg, i) in filterPhone(event.event_text)" :key="i" class="event-text" :class="{active: index === 0}">{{ seg }}</text>
+							<text v-for="(seg, i) in getProcessedText(event.event_text, event.status_code)" :key="i" class="event-text" :class="{active: index === 0}">{{ seg }}</text>
 						</view>
 						<text class="event-time">{{ event.event_time }}</text>
 						
@@ -121,15 +121,7 @@
 				this.statusHistory = await mockService.getMockTracking(this.orderNo)
 			},
 			getStatusText(status: string) : string {
-				const maps = { 
-					'PENDING': '待发货', 
-					'SHIPPED': '已发货', 
-					'IN_TRANSIT': '运输中',
-					'DELIVERED': '已签收', 
-					'OUT_FOR_DELIVERY': '派送中',
-					'EXCEPTION': '异常' 
-				}
-				return (maps[status] != null) ? maps[status] : status
+				return mockService.getStatusText(status)
 			},
 			async refreshLogistics() {
 				if (this.order.status === 'DELIVERED') {
@@ -152,8 +144,13 @@
 					urls: urls
 				})
 			},
+			getProcessedText(text: string, status: string): string[] {
+				const displayMsg = mockService.getDisplayMessage(text, status)
+				return this.filterPhone(displayMsg)
+			},
 			filterPhone(text: string): string[] {
-				// 商家端：不展示手机号
+				// 依照需求文档 1. 敏感信息展示差异：商家端不展示手机号
+				// 直接移除所有手机号
 				return [text.replace(/(1[3-9]\d{9})/g, '')]
 			}
 		}

pages/mall/delivery/test/merchant-order-list.uvue

@@ -28,14 +28,14 @@
 						<text class="label">收件人:</text>
 						<text class="value">{{ order.receiver_name }} {{ order.receiver_masked_phone }}</text>
 					</view>
-					<view v-if="order.tracking_no" class="info-row">
+					<view class="info-row">
 						<text class="label">运单号:</text>
-						<text class="value">{{ order.tracking_no }} ({{ order.carrier }})</text>
+						<text class="value">{{ order.tracking_no ? order.tracking_no + ' (' + order.carrier + ')' : '暂无运单号' }}</text>
 					</view>
 				</view>
 
 				<view class="order-footer">
-					<button v-if="order.status === 'PENDING'" class="btn-primary" @click="openShipModal(order)">去发货</button>
+					<button v-if="order.status === 'PENDING' || order.status === 'ORDER_PLACED'" class="btn-primary" @click="openShipModal(order)">去发货</button>
 					<button class="btn-secondary" @click="viewDetail(order)">详情</button>
 				</view>
 			</view>
@@ -49,7 +49,10 @@
 		<view v-if="showShipModal" class="modal-mask">
 			<view class="modal-content">
 				<view class="modal-header">
-					<text class="modal-title">订单发货</text>
+					<view class="title-box">
+						<text class="modal-title">订单发货</text>
+						<text v-if="selectedOrder != null" class="modal-order-no">单号: {{ selectedOrder!.order_no }}</text>
+					</view>
 					<text class="close-btn" @click="showShipModal = false">×</text>
 				</view>
 				<view class="modal-body">
@@ -61,7 +64,12 @@
 					</view>
 					<view class="form-item">
 						<text class="label">运单号</text>
-						<input v-model="trackingNo" placeholder="请输入或扫码录入" class="input" />
+						<view class="input-wrapper">
+							<input v-model="trackingNo" placeholder="请输入或扫码录入" class="input" />
+							<view class="scan-btn" @click="scanCode">
+								<text class="scan-icon">📷</text>
+							</view>
+						</view>
 					</view>
 				</view>
 				<view class="modal-footer">
@@ -75,7 +83,7 @@
 
 <script uts>
 	import supa from '@/components/supadb/aksupainstance.uts'
-	import { mockService, MockOrder } from './mock-service.uts'
+	import { mockService, MockOrder, LogisticsConstants } from './mock-service.uts'
 
 	export default {
 		data() {
@@ -84,14 +92,8 @@
 				orders: [] as MockOrder[],
 				showShipModal: false,
 				selectedOrder: null as MockOrder | null,
-				carriers: [
-					{ label: '韵达快递', value: '韵达快递' },
-					{ label: '圆通速递', value: '圆通速递' },
-					{ label: '中通快递', value: '中通快递' },
-					{ label: '申通快递', value: '申通快递' },
-					{ label: '顺丰速运', value: '顺丰速运' }
-				],
-				currentCarrier: '韵达快递',
+				carriers: LogisticsConstants.CARRIERS,
+				currentCarrier: '顺丰速运',
 				trackingNo: ''
 			}
 		},
@@ -102,12 +104,18 @@
 			filteredOrders() : MockOrder[] {
 				const list = this.orders
 				if (this.currentFilter === 'all') return list
+				
+				// 待发货：包含已下单和待发货状态
 				if (this.currentFilter === 'pending') {
-					return list.filter((o : MockOrder) : boolean => o.status === 'PENDING')
+					return list.filter((o : MockOrder) : boolean => 
+						o.status === 'PENDING' || o.status === 'ORDER_PLACED'
+					)
 				}
+				
+				// 已发货：只要已经有了运单号或状态已转为发货后的
 				if (this.currentFilter === 'shipped') {
-					// 除了待发货，其余所有状态（运输中、派送中、已签收、异常）都属于“已发货”范畴
-					return list.filter((o : MockOrder) : boolean => o.status !== 'PENDING')
+					const shippedStates = ['SHIPPED', 'IN_TRANSIT', 'OUT_FOR_DELIVERY', 'READY_FOR_PICKUP', 'DELIVERED', 'EXCEPTION', 'RETURNED']
+					return list.filter((o : MockOrder) : boolean => shippedStates.includes(o.status))
 				}
 				return []
 			}
@@ -124,25 +132,17 @@
 				this.currentFilter = filter
 			},
 			getStatusText(status: string) : string {
-				const maps = { 
-					'PENDING': '待发货', 
-					'SHIPPED': '已发货', 
-					'IN_TRANSIT': '运输中',
-					'DELIVERED': '已签收',
-					'OUT_FOR_DELIVERY': '派送中',
-					'EXCEPTION': '包裹异常'
-				}
-				return (maps[status] != null) ? maps[status] : status
+				return mockService.getStatusText(status)
 			},
 			openShipModal(order: MockOrder) {
 				this.selectedOrder = order
-				this.currentCarrier = '韵达快递'
+				this.currentCarrier = '顺丰速运'
 				this.trackingNo = ''
 				this.showShipModal = true
 			},
 			onCarrierChange(e: any) {
 				const index = e.detail.value as number
-				this.currentCarrier = this.carriers[index].value
+				this.currentCarrier = this.carriers[index]['value'] as string
 			},
 			async confirmShip() {
 				if (!this.trackingNo) {
@@ -152,14 +152,12 @@
 				
 				uni.showLoading({ title: '提交中...' })
 				
-				// 调用 Mock 入库接口，实现同步修改
-				setTimeout(() => {
-					uni.hideLoading()
-					const orderNo = this.selectedOrder?.order_no
-					if (orderNo != null) {
-						// 1. 同步修改 Mock Service 中的原始数据
-						mockService.bindShipment(orderNo, this.currentCarrier, this.trackingNo)
-						
+				const orderNo = this.selectedOrder?.order_no
+				if (orderNo != null) {
+					// 1. 同步修改 数据库 中的数据
+					const success = await mockService.bindShipment(orderNo, this.currentCarrier, this.trackingNo)
+					
+					if (success) {
 						// 2. 直接修改本地选中的订单对象状态，确保 Vue 响应式立即触发
 						if (this.selectedOrder != null) {
 							const target = this.selectedOrder!
@@ -168,17 +166,35 @@
 							target.tracking_no = this.trackingNo
 						}
 						
-						// 3. 重新加载数据（通过新引用触发 computed）
-						this.loadData()
+						// 3. 重新加载数据（从数据库刷新）
+						await this.loadData()
+						
+						uni.hideLoading()
+						this.showShipModal = false
+						uni.showToast({ title: '发货成功' })
+					} else {
+						uni.hideLoading()
+						uni.showToast({ title: '发货失败，请重试', icon: 'none' })
 					}
-					this.showShipModal = false
-					uni.showToast({ title: '发货成功' })
-				}, 1000)
+				}
 			},
 			viewDetail(order: MockOrder) {
 				uni.navigateTo({
 					url: `/pages/mall/delivery/test/merchant-order-detail?order_no=${order.order_no}`
 				})
+			},
+			scanCode() {
+				uni.scanCode({
+					success: (res) => {
+						this.trackingNo = res.result
+					},
+					fail: (_) => {
+						uni.showToast({
+							title: '该功能尚未完成',
+							icon: 'none'
+						})
+					}
+				})
 			}
 		}
 	}
@@ -307,12 +323,29 @@
 	}
 	.modal-header {
 		display: flex;
+		flex-direction: row;
 		justify-content: space-between;
+		align-items: flex-start;
 		margin-bottom: 30rpx;
 	}
+	.title-box {
+		display: flex;
+		flex-direction: column;
+	}
 	.modal-title {
-		font-size: 32rpx;
+		font-size: 36rpx;
 		font-weight: bold;
+		color: #333;
+	}
+	.modal-order-no {
+		font-size: 24rpx;
+		color: #999;
+		margin-top: 8rpx;
+	}
+	.close-btn {
+		font-size: 40rpx;
+		color: #ccc;
+		padding: 10rpx;
 	}
 	.form-item {
 		margin-bottom: 30rpx;
@@ -323,11 +356,33 @@
 		border-radius: 8rpx;
 		margin-top: 10rpx;
 	}
+	.input-wrapper {
+		position: relative;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		margin-top: 10rpx;
+	}
 	.input {
+		flex: 1;
 		border: 1rpx solid #ddd;
 		padding: 16rpx;
+		padding-right: 80rpx;
 		border-radius: 8rpx;
-		margin-top: 10rpx;
+	}
+	.scan-btn {
+		position: absolute;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		width: 80rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		z-index: 10;
+	}
+	.scan-icon {
+		font-size: 36rpx;
 	}
 	.modal-footer {
 		display: flex;

pages/mall/delivery/test/mock-service.uts

@@ -43,6 +43,58 @@ export interface MockWebhookLog {
   payload: UTSJSONObject
 }
 
+/**
+ * 集中管理物流常量与映射
+ */
+export const LogisticsConstants = {
+  // 8 大标准配送状态映射
+  STATUS_MAP: {
+    'ORDER_PLACED': '已下单',
+    'SHIPPED': '已发货',
+    'PENDING': '待发货',
+    'IN_TRANSIT': '运输中',
+    'OUT_FOR_DELIVERY': '派送中',
+    'READY_FOR_PICKUP': '待取件',
+    'DELIVERED': '已签收',
+    'EXCEPTION': '异常',
+    'RETURNED': '退回/退件'
+  } as UTSJSONObject,
+
+  // 状态对应图标
+  STATUS_ICONS: {
+    'ORDER_PLACED': '📦',
+    'SHIPPED': '🚚',
+    'IN_TRANSIT': '🛤️',
+    'OUT_FOR_DELIVERY': '🛵',
+    'READY_FOR_PICKUP': '🏪',
+    'DELIVERED': '✅',
+    'EXCEPTION': '❗',
+    'RETURNED': '🔄'
+  } as UTSJSONObject,
+
+  // 时间线简短标签
+  STATUS_LABELS_SHORT: {
+    'ORDER_PLACED': '下单',
+    'SHIPPED': '出库',
+    'IN_TRANSIT': '运输',
+    'OUT_FOR_DELIVERY': '派送',
+    'READY_FOR_PICKUP': '待取',
+    'DELIVERED': '完成',
+    'EXCEPTION': '异常',
+    'RETURNED': '退回'
+  } as UTSJSONObject,
+
+  // 常用快递公司列表
+  CARRIERS: [
+    { label: '顺丰速运', value: '顺丰速运' },
+    { label: '圆通速递', value: '圆通速递' },
+    { label: '中通快递', value: '中通快递' },
+    { label: '申通快递', value: '申通快递' },
+    { label: '韵达快递', value: '韵达快递' },
+    { label: '京东快递', value: '京东快递' }
+  ] as UTSJSONObject[]
+}
+
 class MockService {
   // 全局 Mock 配置项
   public isTestMode: boolean = true
@@ -238,32 +290,114 @@ class MockService {
     const { data: orderData } = await supa.from('ml_orders').select('id,order_no').eq('order_no', orderNo).single().execute()
     const orderId = (orderData != null) ? orderData['id'] as string : null
 
-    // 2. 创建运单记录
-    const { data: waybill, error: wError } = await supa.from('platform_express_waybills').insert({
+    // 2. 创建或更新运单记录
+    // 先查询是否存在
+    const { data: existingWaybills } = await supa.from('platform_express_waybills').select('id').eq('order_no', orderNo).execute()
+    let waybillIdForEvent: string | null = null
+    
+    const waybillPayload = {
       order_id: orderId,
       order_no: orderNo,
       carrier: carrier,
       tracking_no: trackingNo,
       current_status_code: 'SHIPPED',
       current_status_text: '商家已发货',
-      last_synced_at: new Date().toISOString()
-    }).select().single().execute()
+      last_synced_at: new Date().toISOString(),
+      source: 'mock'
+    } as UTSJSONObject
 
-    if (wError != null) {
-      console.error('Bind shipment error:', wError)
+    if (existingWaybills != null && (existingWaybills as Array<any>).length > 0) {
+      // 更新
+      const waybillRow = (existingWaybills as Array<UTSJSONObject>)[0]
+      waybillIdForEvent = waybillRow['id'] as string
+      await supa.from('platform_express_waybills').update(waybillPayload).eq('id', waybillIdForEvent).execute()
+    } else {
+      // 插入
+      const { data: newWaybill, error: insError } = await supa.from('platform_express_waybills').insert(waybillPayload).select().single().execute()
+      if (insError != null) {
+        console.error('Insert waybill error:', insError)
+        return false
+      }
+      if (newWaybill != null) {
+        waybillIdForEvent = (newWaybill as UTSJSONObject)['id'] as string
+      }
+    }
+
+    if (waybillIdForEvent == null) {
+      console.error('Bind shipment error: Failed to get waybill ID')
       return false
     }
 
+    // 2.5 更新订单表状态
+    const { error: oError } = await supa.from('ml_orders').update({
+      order_status: 3, // SHIPPED
+      shipping_status: 2, // 已向物流公司提交
+      shipped_at: new Date().toISOString()
+    }).eq('order_no', orderNo).execute()
+    
+    if (oError != null) {
+      console.error('Update ml_orders error:', oError)
+      // 继续执行，因为运单记录已经拉起
+    }
+
     // 3. 产生初始轨迹
     await supa.from('platform_express_tracking_events').insert({
-      waybill_id: waybill!['id'] as string,
+      waybill_id: waybillIdForEvent,
       carrier: carrier,
       tracking_no: trackingNo,
       event_time: new Date().toISOString(),
       event_code: 'CREATED',
       event_text: '商家已发货，等待快递公司揽收',
       status_code: 'SHIPPED',
-      dedupe_key: 'INIT_' + Date.now()
+      dedupe_key: 'INIT_' + orderNo + '_' + Date.now(),
+      evidence_urls: []
+    }).execute()
+
+    return true
+  }
+
+  // 用户确认取件逻辑
+  async confirmReceipt(orderNo: string): Promise<boolean> {
+    // 1. 获取运单信息
+    const { data: waybills } = await supa.from('platform_express_waybills')
+      .select('id,carrier,tracking_no')
+      .eq('order_no', orderNo)
+      .execute()
+    
+    if (waybills == null || (waybills as Array<any>).length === 0) {
+      return false
+    }
+    
+    const waybill = (waybills as Array<UTSJSONObject>)[0]
+    const waybillId = waybill['id'] as string
+    const carrier = waybill['carrier'] as string
+    const trackingNo = waybill['tracking_no'] as string
+    const now = new Date().toISOString()
+
+    // 2. 更新运单主表状态
+    await supa.from('platform_express_waybills').update({
+      current_status_code: 'DELIVERED',
+      current_status_text: '用户已确认取件',
+      last_synced_at: now
+    }).eq('id', waybillId).execute()
+
+    // 3. 更新订单主表状态 (DEVLIVERED = 4)
+    await supa.from('ml_orders').update({
+      order_status: 4,
+      delivered_at: now
+    }).eq('order_no', orderNo).execute()
+
+    // 4. 插入取件轨迹
+    await supa.from('platform_express_tracking_events').insert({
+      waybill_id: waybillId,
+      carrier: carrier,
+      tracking_no: trackingNo,
+      event_time: now,
+      event_code: 'USER_PICKUP',
+      event_text: '用户已确认取件，感谢使用',
+      status_code: 'DELIVERED',
+      dedupe_key: 'CONFIRM_' + orderNo + '_' + Date.now(),
+      evidence_urls: []
     }).execute()
 
     return true
@@ -315,12 +449,27 @@ class MockService {
 
     console.log('Found Waybill ID:', final_id)
 
-    // 状态映射
+    // 状态映射 (根据 状态映射表.md 规范)
     let status_code = 'IN_TRANSIT'
-    if (yto_status === 'GOT' || yto_status === 'SEND') status_code = 'IN_TRANSIT'
-    else if (yto_status === 'SENT') status_code = 'OUT_FOR_DELIVERY'
-    else if (yto_status === 'SIGNED') status_code = 'DELIVERED'
-    else if (yto_status === 'FAILED') status_code = 'EXCEPTION'
+    if (yto_status === 'GOT' || yto_status === 'SEND' || yto_status === 'TRANSIT') {
+      status_code = 'IN_TRANSIT'
+    } else if (yto_status === 'SENT') {
+      status_code = 'OUT_FOR_DELIVERY'
+    } else if (yto_status === 'PICKUP') {
+      status_code = 'READY_FOR_PICKUP'
+    } else if (yto_status === 'SIGNED' || yto_status === 'DELIVERED') {
+      status_code = 'DELIVERED'
+    } else if (yto_status === 'FAILED' || yto_status === 'EXCEPTION') {
+      status_code = 'EXCEPTION'
+    } else if (yto_status === 'RETURNED') {
+      status_code = 'RETURNED'
+    } else {
+      // 容错：如果是已知的 8 大状态之一，直接使用
+      const validStates = ['ORDER_PLACED', 'SHIPPED', 'IN_TRANSIT', 'OUT_FOR_DELIVERY', 'READY_FOR_PICKUP', 'DELIVERED', 'EXCEPTION', 'RETURNED']
+      if (validStates.indexOf(yto_status) > -1) {
+        status_code = yto_status
+      }
+    }
 
     // 3. 执行更新 (确保 ID 不为空)
     const updateRes = await supa.from('platform_express_waybills').update({
@@ -334,11 +483,22 @@ class MockService {
     }
 
     // 4. 插入轨迹 (确保 ID 不为空)
+    const acceptTimeRaw = payload['acceptTime'] as string
+    let eventTimeToStore = new Date().toISOString()
+    if (acceptTimeRaw != null && acceptTimeRaw != '') {
+      const normalized = (acceptTimeRaw.indexOf('T') > -1) ? acceptTimeRaw : acceptTimeRaw.replace(' ', 'T')
+      const parsed = new Date(normalized)
+      const parsedMs = parsed.getTime()
+      if (parsedMs == parsedMs) {
+        eventTimeToStore = parsed.toISOString()
+      }
+    }
+
     const eventRes = await supa.from('platform_express_tracking_events').insert({
       waybill_id: final_id,
       carrier: carrier,
       tracking_no: tracking_no,
-      event_time: payload['acceptTime'] as string || new Date().toISOString(),
+      event_time: eventTimeToStore,
       event_code: yto_status,
       event_text: event_text,
       status_code: status_code,
@@ -398,6 +558,32 @@ class MockService {
     const m = d.getMinutes().toString().padStart(2, '0')
     return `${Y}-${M}-${D} ${h}:${m}`
   }
+
+  /**
+   * 统一的状态文本转换工具
+   */
+  public getStatusText(status: string): string {
+    const text = LogisticsConstants.STATUS_MAP[status] as string | null
+    return (text != null) ? text : status
+  }
+
+  /**
+   * 依照需求文档：展示第三方回传的原始轨迹文案
+   */
+  public getDisplayMessage(text: string, status: string): string {
+    if (!text) return '暂无动态'
+    
+    // 不再进行脱敏/泛化处理，直接返回原始文案
+    return text
+  }
+
+  /**
+   * 统一的状态图标转换工具
+   */
+  public getStatusIcon(status: string): string {
+    const icon = LogisticsConstants.STATUS_ICONS[status] as string | null
+    return (icon != null) ? icon : '📦'
+  }
 }
 
 export const mockService = new MockService()

pages/mall/delivery/test/platform-config-center.uvue

@@ -57,7 +57,7 @@
 </template>
 
 <script uts>
-	import { mockService } from './mock-service.uts'
+	import { mockService, LogisticsConstants } from './mock-service.uts'
 
 	export default {
 		data() {
@@ -68,11 +68,15 @@
 					webhookSecret: '********',
 					autoPush: mockService.autoPush
 				},
-				carriers: [
-					{ name: '韵达快递', code: 'YUNDA', enabled: true, callback_status: true, polling: true },
-					{ name: '圆通速递', code: 'YTO', enabled: true, callback_status: true, polling: false },
-					{ name: '中通快递', code: 'ZTO', enabled: false, callback_status: false, polling: false }
-				]
+				carriers: LogisticsConstants.CARRIERS.map((c : UTSJSONObject) : UTSJSONObject => {
+					return {
+						name: c['label'],
+						code: c['value'],
+						enabled: true,
+						callback_status: true,
+						polling: false
+					} as UTSJSONObject
+				})
 			}
 		},
 		methods: {

pages/mall/delivery/test/platform-tracking-query.uvue

@@ -46,7 +46,9 @@
 						<text class="event-text">{{ event.event_text }}</text>
 						<view class="event-meta">
 							<text class="meta-tag blue">代码: {{ event.event_code }}</text>
-							<text class="meta-tag orange">映射状态: {{ getStatusMapping(event.status_code) }}</text>
+							<text class="meta-tag orange" v-if="index === 0 || event.status_code !== events[index - 1].status_code">
+								映射状态: {{ getStatusMapping(event.status_code) }}
+							</text>
 						</view>
 						<view class="raw-box" v-if="showRaw[index]">
 							<text class="raw-text">{{ JSON.stringify(event.raw_payload, null, 2) }}</text>
@@ -119,26 +121,10 @@
 				this.showRaw[index] = !current
 			},
 			getStatusText(status: string) : string {
-				const maps = { 
-					'PENDING': '待发货', 
-					'SHIPPED': '已发货', 
-					'IN_TRANSIT': '运输中',
-					'DELIVERED': '已签收',
-					'OUT_FOR_DELIVERY': '派送中',
-					'EXCEPTION': '异常'
-				}
-				return (maps[status] != null) ? maps[status] : status
+				return mockService.getStatusText(status)
 			},
 			getStatusMapping(code: string) : string {
-				const maps = {
-					'SHIPPED': '已揽收',
-					'IN_TRANSIT': '运输中',
-					'ARRIVED_HUB': '到达分拨中心',
-					'OUT_FOR_DELIVERY': '正在派送',
-					'DELIVERED': '已签收',
-					'EXCEPTION': '包裹异常'
-				}
-				return (maps[code] != null) ? maps[code] : code
+				return mockService.getStatusText(code)
 			},
 			async runScenario(type: string) {
 				if (this.waybillInfo == null) return

pages/mall/delivery/test/platform-webhook-logs.uvue

@@ -97,15 +97,7 @@
 	}
 
 	function getEventText(code: string) : string {
-		const maps = {
-			'SHIPPED': '发货揽收',
-			'IN_TRANSIT': '运输中',
-			'ARRIVED_HUB': '中转入库',
-			'OUT_FOR_DELIVERY': '派件中',
-			'DELIVERED': '确认签收',
-			'EXCEPTION': '异常上报'
-		}
-		return (maps[code] != null) ? maps[code] : code
+		return mockService.getStatusText(code)
 	}
 
 	function reProcess(log: MockWebhookLog) {