统一状态码,优化对应逻辑
This commit is contained in:
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user