From 646c5fee71f4d08e33b3dc207a723a7b5f44d4c7 Mon Sep 17 00:00:00 2001 From: zhangjing1 Date: Mon, 3 Aug 2026 13:28:37 +0800 Subject: [PATCH] [TBID:ECX-9549] chore: merge master changes for release --- src/app.js | 3 ++- src/hocs/withPageWrapper.js | 11 +++++++++- src/utils/entryLaunch.js | 44 ++++++++++++++++++++++++++++++++----- 3 files changed, 50 insertions(+), 8 deletions(-) diff --git a/src/app.js b/src/app.js index 7a7630f51..c36964b19 100644 --- a/src/app.js +++ b/src/app.js @@ -150,7 +150,8 @@ function App({ children }) { }) useDidShow(async (options) => { - entryLaunch.getRouteParams(isWeb ? { query: options } : options).then((params) => { + // H5 的 useDidShow(options) 通常不是小程序那种 { path, query }，直接透传会导致丢 dtid + entryLaunch.getRouteParams(isWeb ? { params: options || {} } : options).then((params) => { Taro.setStorageSync(SG_ROUTER_PARAMS, params) if (params.gu || params.gu_user_id) { diff --git a/src/hocs/withPageWrapper.js b/src/hocs/withPageWrapper.js index f9b72032f..f2c07ffa5 100644 --- a/src/hocs/withPageWrapper.js +++ b/src/hocs/withPageWrapper.js @@ -64,12 +64,21 @@ function withPageWrapper(Component) { const checkEnterStoreRule = async () => { return new Promise((resolve, reject) => { - const { dtid } = Taro.getStorageSync(SG_ROUTER_PARAMS) + const { dtid } = Taro.getStorageSync(SG_ROUTER_PARAMS) || {} const { gu_user_id } = Taro.getStorageSync(SG_GUIDE_PARAMS) // gu_user_id = 导购工号 console.log('entryStoreRules', entryStoreRules) const ruleList = JSON.parse(JSON.stringify(entryStoreRules.filter((item) => item.status))) || [] + // URL 带 dtid 且开启店铺码进店时优先按店铺码进店，避免被排在前面的 shop_white 缓存店覆盖 + const hasDistributorCodeRule = ruleList.some((item) => item.key === 'distributor_code') + if (dtid && hasDistributorCodeRule) { + checkStoreWhiteList(dtid) + .then(() => resolve()) + .catch((err) => reject(err)) + return + } + const nextRule = async () => { const rule = ruleList.shift() if (!rule) { diff --git a/src/utils/entryLaunch.js b/src/utils/entryLaunch.js index 4b79f0114..af65d97ad 100644 --- a/src/utils/entryLaunch.js +++ b/src/utils/entryLaunch.js @@ -15,13 +15,28 @@ import MapLoader from '@/utils/lbs' import S from '@/spx' import { $t } from '@/i18n' -const $instance = getCurrentInstance() || {} const { store } = configStore() // 经纬度逆地理缓存：同一位置在有效期内不重复请求 getAreaByJwd（避免每次返回首页都调接口） const LNGLAT_CACHE_TTL_MS = 5 * 60 * 1000 // 5 分钟 const LNGLAT_CACHE_PRECISION = 4 // 小数点位数，约 10m 内视为同位置 +/** H5：从 location.search / hash 解析 query（browser、hash 路由都覆盖） */ +function getH5LocationQuery() { + if (typeof window === 'undefined' || !window.location) return {} + const { search = '', hash = '' } = window.location + let query = {} + if (search && search.length > 1) { + query = { ...query, ...qs.parse(search.slice(1)) } + } + // hash 形如 #/pages/index?dtid=1 或 #/?dtid=1 + const hashQueryIndex = hash.indexOf('?') + if (hashQueryIndex >= 0) { + query = { ...query, ...qs.parse(hash.slice(hashQueryIndex + 1)) } + } + return query +} + class EntryLaunch { constructor() { this._lnglatCache = null // { key: string, at: number, data: object } @@ -38,7 +53,19 @@ class EntryLaunch { * @function 获取小程序路由参数 */ async getRouteParams(options) { - const params = options?.query || options?.params || $instance?.router?.params || {} + // 每次实时取 instance，模块顶层缓存的 getCurrentInstance 在 H5 首屏时常为空 + const $instance = getCurrentInstance() || {} + const routerParams = $instance?.router?.params || {} + const h5Query = Taro.getEnv() === Taro.ENV_TYPE.WEB ? getH5LocationQuery() : {} + // H5 useDidShow(options) 往往不含 query，需合并 location / 实时 router + const params = { + ...h5Query, + ...routerParams, + ...(options?.params || {}), + ...(options?.query && typeof options.query === 'object' && !Array.isArray(options.query) + ? options.query + : {}) + } const pageStack = Taro.getCurrentPages() @@ -51,12 +78,14 @@ class EntryLaunch { if (resPage) { return { ...Taro.getStorageSync(SG_ROUTER_PARAMS), + ...h5Query, + ...routerParams, runFlag: true // 标识小程序启动标志，用于判断是否是小程序启动 } } let _options = {} - console.log('$instance?.router?.params', $instance?.router?.params) + console.log('$instance?.router?.params', routerParams) if (params?.scene) { console.log('params scene:', params.scene, resolveUrlParamsParse(params.scene)) _options = { @@ -74,6 +103,8 @@ class EntryLaunch { delete _options?.distributorInfo delete _options?.salespersonInfo } + // scene 解析后仍合并 URL/router 上的显式参数（如 dtid） + _options = { ...params, ..._options } } else { _options = params } @@ -146,8 +177,9 @@ class EntryLaunch { const { is_open_wechatapp_location } = Taro.getStorageSync('settingInfo') const pages = Taro.getCurrentPages() const currentPage = pages[pages.length - 1] - const { dtid } = - process.env.TARO_ENV == 'weapp' ? currentPage.options : currentPage.$router?.params + const pageParams = + process.env.TARO_ENV == 'weapp' ? currentPage?.options : currentPage?.$router?.params + const { dtid } = pageParams || {} let storeQuery = {} // 店铺查询参数 if (dtid) { storeQuery = { @@ -504,7 +536,7 @@ class EntryLaunch { * 导购任务埋点上报 */ async postGuideTask(customPath) { - const { path, params } = $instance?.router + const { path, params } = getCurrentInstance()?.router || {} const paths = customPath || path const routePath = { '/pages/item/espier-detail': 'activeItemDetail',