feat(mini-user): v3.5.10 同城配送提示可配置并支持换行
承运商 HTML 按收货市下发;textarea 回车在 C 端转成换行。含门店去掉分享按钮与小程序企微客服。 Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -11,7 +11,9 @@ import { maskPhone } from '../../lib/phone';
|
||||
import { ensurePayReady } from '../../lib/pay-ready';
|
||||
import { fetchUserProfile } from '../../lib/pay-wechat';
|
||||
import { request, toast } from '../../lib/api';
|
||||
import DeliveryHintHtml from '../../components/DeliveryHintHtml';
|
||||
import { canCrossCity, isCrossCityAddress } from '../../lib/product-fulfillment';
|
||||
import { loadLocalDeliveries, matchLocalDelivery, resolveLocalDeliveryHintHtml } from '../../lib/local-delivery';
|
||||
import { getProductMainImage } from '../../lib/product-images';
|
||||
import BenefitFigure from '../../components/BenefitFigure';
|
||||
|
||||
@@ -75,6 +77,7 @@ export default function OrderConfirmPage() {
|
||||
const [addresses, setAddresses] = useState<Address[]>([]);
|
||||
const [addressId, setAddressId] = useState(checkoutCtx.addressId || '');
|
||||
const [preview, setPreview] = useState<OrderPreview | null>(null);
|
||||
const [localHintHtml, setLocalHintHtml] = useState('');
|
||||
const [previewLoading, setPreviewLoading] = useState(false);
|
||||
const [loading, setLoading] = useState(false);
|
||||
const [msg, setMsg] = useState('');
|
||||
@@ -151,6 +154,18 @@ export default function OrderConfirmPage() {
|
||||
[addresses, addressId],
|
||||
);
|
||||
|
||||
useEffect(() => {
|
||||
const cityName = selectedAddress?.city;
|
||||
if (!cityName) {
|
||||
setLocalHintHtml('');
|
||||
return;
|
||||
}
|
||||
void loadLocalDeliveries().then((list) => {
|
||||
const row = matchLocalDelivery(list, { cityName });
|
||||
setLocalHintHtml(row ? resolveLocalDeliveryHintHtml(row) : '');
|
||||
});
|
||||
}, [selectedAddress?.city]);
|
||||
|
||||
const allowCross =
|
||||
preview?.allowCrossCityDelivery !== undefined
|
||||
? canCrossCity({ allowCrossCityDelivery: preview.allowCrossCityDelivery })
|
||||
@@ -339,6 +354,12 @@ export default function OrderConfirmPage() {
|
||||
</View>
|
||||
) : null}
|
||||
|
||||
{!isCross && addressOk && addressId && localHintHtml ? (
|
||||
<View className="order-card">
|
||||
<DeliveryHintHtml className="u-muted" html={localHintHtml} />
|
||||
</View>
|
||||
) : null}
|
||||
|
||||
{preview ? (
|
||||
<>
|
||||
<View className="order-card">
|
||||
|
||||
Reference in New Issue
Block a user