feat(fulfillment): 同城运费与路由修复,配送单展示商品用户地址
同城 MANUAL/ZZXFX 按小飞侠价规计费,路由查询回退仓配凭证;HQ 配送单补商品、用户和收货地址。门店核销回跳与小程序核销码一并带上。 Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -1,22 +1 @@
|
||||
/** 从微信扫码结果解析核销 token(32 位 hex 或带 token 参数的 URL) */
|
||||
export function parseRedeemTokenFromScan(raw: string): string | null {
|
||||
const trimmed = raw.trim();
|
||||
if (!trimmed) return null;
|
||||
|
||||
if (/^[a-f0-9]{32}$/i.test(trimmed)) {
|
||||
return trimmed.toLowerCase();
|
||||
}
|
||||
|
||||
try {
|
||||
const url = trimmed.startsWith('http') ? new URL(trimmed) : new URL(trimmed, 'https://local.invalid');
|
||||
const fromQuery = url.searchParams.get('token');
|
||||
if (fromQuery && /^[a-f0-9]{32}$/i.test(fromQuery)) {
|
||||
return fromQuery.toLowerCase();
|
||||
}
|
||||
} catch {
|
||||
/* not a URL */
|
||||
}
|
||||
|
||||
const hexMatch = trimmed.match(/[a-f0-9]{32}/i);
|
||||
return hexMatch ? hexMatch[0].toLowerCase() : null;
|
||||
}
|
||||
export { parseRedeemTokenFromScan } from '@dukang/shared-types';
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
import { hardNavigateInWechat, shouldHardNavigateForJssdk } from '@dukang/weixin-sdk';
|
||||
|
||||
/** iOS 微信内用整页跳转,避免 JSSDK 入场 URL 与 SPA 路径不一致 */
|
||||
export function goShopPath(
|
||||
path: string,
|
||||
navigate: (path: string, opts?: { replace?: boolean }) => void,
|
||||
opts?: { replace?: boolean },
|
||||
): void {
|
||||
if (shouldHardNavigateForJssdk()) {
|
||||
hardNavigateInWechat(path);
|
||||
return;
|
||||
}
|
||||
navigate(path, { replace: opts?.replace ?? true });
|
||||
}
|
||||
@@ -0,0 +1,45 @@
|
||||
/** 扫核销码落地 /redeem?token= 后未登录或需选店,记下回跳路径(OAuth 整页跳转会丢掉 location.state) */
|
||||
export const SHOP_REDEEM_RETURN_KEY = 'shop_redeem_return';
|
||||
|
||||
function isRedeemReturnPath(path: string): boolean {
|
||||
if (!path.startsWith('/redeem')) return false;
|
||||
if (path.startsWith('/redeem/')) return false;
|
||||
try {
|
||||
const url = new URL(path, 'https://local.invalid');
|
||||
return !!url.searchParams.get('token')?.trim();
|
||||
} catch {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
export function rememberShopReturnTo(path: string): void {
|
||||
if (!isRedeemReturnPath(path)) return;
|
||||
try {
|
||||
sessionStorage.setItem(SHOP_REDEEM_RETURN_KEY, path);
|
||||
} catch {
|
||||
/* ignore */
|
||||
}
|
||||
}
|
||||
|
||||
export function rememberShopReturnPath(location: { pathname: string; search: string }): void {
|
||||
rememberShopReturnTo(`${location.pathname}${location.search}`);
|
||||
}
|
||||
|
||||
export function peekShopReturnTo(): string | null {
|
||||
try {
|
||||
const path = sessionStorage.getItem(SHOP_REDEEM_RETURN_KEY);
|
||||
return path && isRedeemReturnPath(path) ? path : null;
|
||||
} catch {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
export function consumeShopReturnTo(): string | null {
|
||||
const path = peekShopReturnTo();
|
||||
try {
|
||||
sessionStorage.removeItem(SHOP_REDEEM_RETURN_KEY);
|
||||
} catch {
|
||||
/* ignore */
|
||||
}
|
||||
return path;
|
||||
}
|
||||
Reference in New Issue
Block a user