feat(mini-user): v3.5.10 同城配送提示可配置并支持换行
承运商 HTML 按收货市下发;textarea 回车在 C 端转成换行。含门店去掉分享按钮与小程序企微客服。 Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -10,6 +10,8 @@ import ContactCsButton from '../../components/ContactCsButton';
|
||||
import LogisticsRichText from '../../components/LogisticsRichText';
|
||||
import { request, toast } from '../../lib/api';
|
||||
import { buildPayUrl } from '../../lib/checkout-nav';
|
||||
import DeliveryHintHtml from '../../components/DeliveryHintHtml';
|
||||
import { loadLocalDeliveries, matchLocalDelivery, resolveLocalDeliveryHintHtml } from '../../lib/local-delivery';
|
||||
import {
|
||||
formatEstimatedArrival,
|
||||
isLogisticsNotArrived,
|
||||
@@ -83,6 +85,22 @@ const STATUS_LABELS: Record<string, string> = {
|
||||
REFUNDED: '已退款',
|
||||
};
|
||||
|
||||
function applyLocalDeliveryHint(
|
||||
data: OrderDetail,
|
||||
setLocalHintHtml: (html: string) => void,
|
||||
) {
|
||||
if (data.deliveryType !== 'LOCAL') {
|
||||
setLocalHintHtml('');
|
||||
return;
|
||||
}
|
||||
void loadLocalDeliveries().then((list) => {
|
||||
const row = data.receiverCity
|
||||
? matchLocalDelivery(list, { cityName: data.receiverCity })
|
||||
: null;
|
||||
setLocalHintHtml(resolveLocalDeliveryHintHtml(row));
|
||||
});
|
||||
}
|
||||
|
||||
function fullReceiverAddress(order: OrderDetail) {
|
||||
const detail = (order.receiverAddress || '').trim();
|
||||
const region = [order.receiverProvince, order.receiverCity, order.receiverDistrict]
|
||||
@@ -102,6 +120,7 @@ export default function OrderDetailPage() {
|
||||
const [latestTrack, setLatestTrack] = useState<OrderTrackNode | null>(null);
|
||||
const [estimatedArrival, setEstimatedArrival] = useState<OrderTrackEstimatedArrival | null>(null);
|
||||
const [trackLoading, setTrackLoading] = useState(false);
|
||||
const [localHintHtml, setLocalHintHtml] = useState('');
|
||||
|
||||
async function loadOrderTrack(delivery: OrderDetail['delivery'], orderStatus?: string) {
|
||||
if (!orderId || !shouldLoadOrderTrack(delivery)) {
|
||||
@@ -133,6 +152,7 @@ export default function OrderDetailPage() {
|
||||
.then((data) => {
|
||||
setOrder(data);
|
||||
void loadOrderTrack(data.delivery, data.status);
|
||||
applyLocalDeliveryHint(data, setLocalHintHtml);
|
||||
})
|
||||
.catch((e) => toast(e instanceof Error ? e.message : '加载失败'));
|
||||
}, [orderId]);
|
||||
@@ -144,6 +164,7 @@ export default function OrderDetailPage() {
|
||||
.then((data) => {
|
||||
setOrder(data);
|
||||
void loadOrderTrack(data.delivery, data.status);
|
||||
applyLocalDeliveryHint(data, setLocalHintHtml);
|
||||
})
|
||||
.catch(() => {});
|
||||
});
|
||||
@@ -361,6 +382,12 @@ export default function OrderDetailPage() {
|
||||
{order.createdAt ? String(order.createdAt).slice(0, 19).replace('T', ' ') : '-'}
|
||||
</Text>
|
||||
</View>
|
||||
{order.deliveryType === 'LOCAL' && localHintHtml ? (
|
||||
<View className="order-row">
|
||||
<Text className="order-row-label">配送时效</Text>
|
||||
<DeliveryHintHtml className="order-row-value" html={localHintHtml} />
|
||||
</View>
|
||||
) : null}
|
||||
</View>
|
||||
</>
|
||||
)}
|
||||
|
||||
Reference in New Issue
Block a user