From 3f95a69f20f3eaa8a3a92000e1e368fdfc2e6871 Mon Sep 17 00:00:00 2001 From: zhangjing1 Date: Mon, 16 Mar 2026 13:54:36 +0800 Subject: [PATCH] bug(custom): baocuo --- src/api/guide.js | 13 +++++++++++-- src/api/req-dianwu.js | 4 ++-- src/api/req.js | 4 ++-- src/components/goods-item/index.js | 3 +-- src/components/sp-deliver/index.js | 2 +- src/components/sp-goods-item/index.js | 4 ++-- src/components/sp-login/index.h5.js | 2 +- src/components/sp-page/header.js | 2 +- src/components/sp-poster/index.js | 4 ++-- src/components/sp-scrollview/index.js | 2 +- src/components/tab-bar/index.js | 6 +++--- src/hocs/withPointitem.js | 2 +- src/hooks/useDianWuLogin.js | 2 +- src/marketing/pages/distribution/good-category.js | 2 +- src/marketing/pages/distribution/goods.js | 2 +- src/marketing/pages/distribution/shop-category.js | 2 +- src/marketing/pages/distribution/shop-goods.js | 2 +- src/marketing/pages/distribution/shop-home.js | 4 ++-- src/marketing/pages/item/group-detail.js | 2 +- src/marketing/pages/member/edit-address.js | 6 +++--- src/marketing/pages/member/user-info.js | 2 +- .../pages/plusprice/detail-plusprice-list.js | 2 +- src/pages/cart/comps/comp-deliver.js | 2 +- src/pages/cart/comps/deliver.js | 2 +- src/pages/cart/espier-checkout.js | 2 +- src/pages/cart/espier-index.js | 2 +- src/pages/item/comps/comp-buytoolbar.js | 2 +- src/pages/item/espier-detail.js | 2 +- src/pages/webview.js | 2 +- src/plugin/requestIntercept.js | 2 +- src/subpage/pages/recommend/detail.js | 6 +++--- src/subpage/pages/trade/after-sale-detail.js | 2 +- src/subpage/pages/trade/customer-pickup-list.js | 2 +- src/subpage/pages/trade/detail.js | 4 ++-- src/subpage/pages/trade/drug-list.js | 2 +- src/subpage/pages/trade/list.js | 2 +- src/subpages/auth/auth-loading.js | 2 +- src/subpages/auth/bindPhone.js | 2 +- src/subpages/auth/edit-password.js | 2 +- src/subpages/auth/forgotpwd.js | 2 +- src/subpages/auth/util.js | 2 +- src/subpages/case/view-case.js | 2 +- src/subpages/community/boxlist.js | 2 +- src/subpages/community/order-manage.js | 2 +- src/subpages/community/order.js | 4 ++-- src/subpages/community/trade/after-sale-detail.js | 2 +- src/subpages/dianwu/activity-code.js | 2 +- src/subpages/dianwu/cashier.js | 2 +- src/subpages/game-activity/pages/records.jsx | 2 +- src/subpages/guide/cart/espier-index.js | 2 +- src/subpages/guide/components/ba-tab-bar/index.js | 6 +++--- src/subpages/item/list.js | 2 +- src/subpages/pointshop/comps/comp-buytoolbar.js | 2 +- src/subpages/pointshop/comps/comp-deliver.js | 2 +- src/subpages/pointshop/espier-checkout.js | 4 ++-- src/subpages/pointshop/espier-detail.js | 2 +- src/subpages/purchase/espier-checkout.js | 2 +- src/subpages/purchase/espier-index.js | 2 +- src/subpages/purchase/list.js | 2 +- src/subpages/salesman/cart.js | 2 +- src/subpages/salesman/comps/comp-delivers.js | 2 +- src/subpages/salesman/distribution/good-category.js | 2 +- src/subpages/salesman/distribution/goods.js | 2 +- src/subpages/salesman/distribution/shop-category.js | 2 +- src/subpages/salesman/distribution/shop-goods.js | 2 +- src/subpages/salesman/distribution/shop-home.js | 4 ++-- src/subpages/salesman/espier-checkout.js | 2 +- src/subpages/store/brand-info.js | 2 +- src/subpages/store/comps/comp-add-cart.js | 2 +- src/subpages/store/comps/comp-tab.js | 2 +- src/subpages/store/index.js | 2 +- src/utils/entryLaunch.js | 6 +++--- src/utils/index.js | 2 +- src/utils/platform.h5.js | 2 +- 74 files changed, 103 insertions(+), 95 deletions(-) diff --git a/src/api/guide.js b/src/api/guide.js index 543b0b1eb..f519ac16b 100644 --- a/src/api/guide.js +++ b/src/api/guide.js @@ -1,15 +1,24 @@ /** * Copyright © ShopeX （http://www.shopex.cn）. All rights reserved. * See LICENSE file for license details. + * 公众号/服务号冷启动时不在顶层 import S，否则会 ReferenceError: Can't find variable: S */ -import S from '@/spx' import { transformPlatformUrl } from '@/utils/platform' import req from './req' +function getS() { + return ( + (typeof global !== 'undefined' && global.__SPX__) || + (typeof globalThis !== 'undefined' && globalThis.__SPX__) || + null + ) +} + function createHead() { + const s = getS() return { header: { - 'x-wxapp-session': (S && S.getAuthToken()) || '', + 'x-wxapp-session': (s && s.getAuthToken && s.getAuthToken()) || '', 'salesperson-type': 'shopping_guide' } } diff --git a/src/api/req-dianwu.js b/src/api/req-dianwu.js index 85d06fec3..cf5cd5ce8 100644 --- a/src/api/req-dianwu.js +++ b/src/api/req-dianwu.js @@ -130,8 +130,8 @@ class API { this.isRefreshingToken = false // S.logout() setTimeout(() => { - console.log(getCurrentInstance().router) - const { path, params } = getCurrentInstance().router + console.log(getCurrentInstance()?.router) + const { path, params } = getCurrentInstance()?.router delete params.$taroTimestamp const fullPath = Object.keys(params).length > 0 ? `${path}?${qs.stringify(params)}` : path // let url diff --git a/src/api/req.js b/src/api/req.js index 4d7aad670..bc17f635e 100644 --- a/src/api/req.js +++ b/src/api/req.js @@ -155,8 +155,8 @@ class API { this.isRefreshingToken = false getS().logout() setTimeout(() => { - console.log(getCurrentInstance().router) - const { path, params } = getCurrentInstance().router + console.log(getCurrentInstance()?.router) + const { path, params } = getCurrentInstance()?.router delete params.$taroTimestamp const fullPath = Object.keys(params).length > 0 ? `${path}?${qs.stringify(params)}` : path let url diff --git a/src/components/goods-item/index.js b/src/components/goods-item/index.js index 993f22da7..f44103391 100644 --- a/src/components/goods-item/index.js +++ b/src/components/goods-item/index.js @@ -9,11 +9,10 @@ import { SpImg, PointLine } from '@/components' import api from '@/api' import { connect } from 'react-redux' import { isObject, classNames, isWeb, VERSION_PLATFORM } from '@/utils' -import configStore from '@/store' import './index.scss' -const { store } = configStore() +/** 不在此处调用 configStore()，否则首页加载会触发 reducer 循环依赖报错；@connect 会从 Provider 取 store */ @connect( ({ colors, user }) => ({ diff --git a/src/components/sp-deliver/index.js b/src/components/sp-deliver/index.js index cbd5db6c3..68eeef320 100644 --- a/src/components/sp-deliver/index.js +++ b/src/components/sp-deliver/index.js @@ -92,7 +92,7 @@ function SpDeliver(props, ref) { } = state const formRef = useRef() const $instance = getCurrentInstance() - const { cart_type } = $instance.router?.params || {} + const { cart_type } = $instance?.router?.params || {} // useEffect(() => { // fetch() // }, []) diff --git a/src/components/sp-goods-item/index.js b/src/components/sp-goods-item/index.js index 83a10e6c9..c91956806 100644 --- a/src/components/sp-goods-item/index.js +++ b/src/components/sp-goods-item/index.js @@ -43,9 +43,9 @@ function SpGoodsItem(props) { loadingRef.current = true let isPurchase = false if (isWeixin) { - isPurchase = $instance.page.route.includes('subpages/purchase') + isPurchase = $instance?.page.route.includes('subpages/purchase') } else { - isPurchase = $instance.page.path.includes('subpages/purchase') + isPurchase = $instance?.page.path.includes('subpages/purchase') } setIsPurchase(isPurchase) } diff --git a/src/components/sp-login/index.h5.js b/src/components/sp-login/index.h5.js index a696f86ad..643170803 100644 --- a/src/components/sp-login/index.h5.js +++ b/src/components/sp-login/index.h5.js @@ -34,7 +34,7 @@ function SpLogin(props) { if (isLogin) { onChange && onChange(e) } else { - const { path, params } = $instance.router + const { path, params } = $instance?.router const _path = `${path.split('?')[0]}?${qs.stringify(params)}` let url = `/subpages/auth/login?redirect=${encodeURIComponent(`${_path}`)}` diff --git a/src/components/sp-page/header.js b/src/components/sp-page/header.js index 1dddeeab9..8df3007dd 100644 --- a/src/components/sp-page/header.js +++ b/src/components/sp-page/header.js @@ -180,7 +180,7 @@ const CustomNavigationHeader = memo((props) => { const navTitle = title || value?.wgtName || - getCurrentInstance().page?.config?.navigationBarTitleText || + getCurrentInstance()?.page?.config?.navigationBarTitleText || appName return ( {navTitle} diff --git a/src/components/sp-poster/index.js b/src/components/sp-poster/index.js index b11420804..100c703a2 100755 --- a/src/components/sp-poster/index.js +++ b/src/components/sp-poster/index.js @@ -105,7 +105,7 @@ function SpPoster(props) { Taro.showLoading({ title: '海报生成中...' }) - const ctx = Taro.createCanvasContext(eleId, Taro.getCurrentInstance().page) + const ctx = Taro.createCanvasContext(eleId, Taro.getCurrentInstance()?.page) let canvasObj switch (type) { case 'goodsDetial': @@ -216,7 +216,7 @@ function SpPoster(props) { height: pxHeight, canvasId: eleId }, - Taro.getCurrentInstance().page + Taro.getCurrentInstance()?.page ) resolve(tempFilePath) } else if (isAlipay) { diff --git a/src/components/sp-scrollview/index.js b/src/components/sp-scrollview/index.js index 22174f783..22809794d 100644 --- a/src/components/sp-scrollview/index.js +++ b/src/components/sp-scrollview/index.js @@ -38,7 +38,7 @@ function SpScrollView(props, ref) { useEffect(() => { let observer = null if (isWeixin || isAlipay) { - observer = Taro.createIntersectionObserver(Taro.getCurrentInstance().page, { + observer = Taro.createIntersectionObserver(Taro.getCurrentInstance()?.page, { observeAll: true }) setTimeout(() => { diff --git a/src/components/tab-bar/index.js b/src/components/tab-bar/index.js index ec52eee40..0362250b8 100644 --- a/src/components/tab-bar/index.js +++ b/src/components/tab-bar/index.js @@ -137,7 +137,7 @@ export default class TabBar extends Component { updateCurTab() { this.fetchCart() const { tabList, localCurrent } = this.state - const fullPath = getCurrentRoute(this.$instance.router).fullPath.split('?')[0] + const fullPath = getCurrentRoute(this.$instance?.router).fullPath.split('?')[0] console.log('--updateCurTab--', localCurrent, fullPath, tabList) @@ -164,7 +164,7 @@ export default class TabBar extends Component { }) } - const { path } = getCurrentRoute(this.$instance.router) + const { path } = getCurrentRoute(this.$instance?.router) if (this.state.tabList[cartTabIdx] && path === this.state.tabList[cartTabIdx].url) { updateCartCount('') return @@ -181,7 +181,7 @@ export default class TabBar extends Component { if (cur !== current) { const curTab = this.state.tabList[current] const { url, withLogin } = curTab - const fullPath = getCurrentRoute(this.$instance.router).fullPath.split('?')[0] + const fullPath = getCurrentRoute(this.$instance?.router).fullPath.split('?')[0] if (withLogin && !S.getAuthToken()) { return Taro.navigateTo({ diff --git a/src/hocs/withPointitem.js b/src/hocs/withPointitem.js index 48e190411..ac1072ae7 100644 --- a/src/hocs/withPointitem.js +++ b/src/hocs/withPointitem.js @@ -11,7 +11,7 @@ export default function withPointitem(Component) { } isPointitem() { - const options = getCurrentInstance().params + const options = getCurrentInstance()?.params return options && options.type === 'pointitem' } diff --git a/src/hooks/useDianWuLogin.js b/src/hooks/useDianWuLogin.js index 16dec7e3c..f8ade3d71 100644 --- a/src/hooks/useDianWuLogin.js +++ b/src/hooks/useDianWuLogin.js @@ -16,7 +16,7 @@ export default (props = {}) => { const $instance = getCurrentInstance() useEffect(() => { - const { token } = $instance.router?.params || {} + const { token } = $instance?.router?.params || {} if (token) { Taro.setStorageSync(SG_DIANWU_TOKEN, token) } diff --git a/src/marketing/pages/distribution/good-category.js b/src/marketing/pages/distribution/good-category.js index 2a339cebf..3c896c470 100644 --- a/src/marketing/pages/distribution/good-category.js +++ b/src/marketing/pages/distribution/good-category.js @@ -221,7 +221,7 @@ export default class DistributionShopCategory extends Component { const curTab = this.state.tabList[current] const { url } = curTab - const fullPath = getCurrentRoute(this.$instance.router).fullPath.split('?')[0] + const fullPath = getCurrentRoute(this.$instance?.router).fullPath.split('?')[0] if (url && fullPath !== url) { Taro.redirectTo({ url }) } diff --git a/src/marketing/pages/distribution/goods.js b/src/marketing/pages/distribution/goods.js index fa569cd2e..1e4273a80 100644 --- a/src/marketing/pages/distribution/goods.js +++ b/src/marketing/pages/distribution/goods.js @@ -345,7 +345,7 @@ export default class DistributionGoods extends Component { const curTab = this.state.tabList[current] const { url } = curTab - const fullPath = getCurrentRoute(this.$instance.router).fullPath.split('?')[0] + const fullPath = getCurrentRoute(this.$instance?.router).fullPath.split('?')[0] if (url && fullPath !== url) { Taro.redirectTo({ url }) diff --git a/src/marketing/pages/distribution/shop-category.js b/src/marketing/pages/distribution/shop-category.js index 4ebd51dec..6136a616b 100644 --- a/src/marketing/pages/distribution/shop-category.js +++ b/src/marketing/pages/distribution/shop-category.js @@ -183,7 +183,7 @@ export default class DistributionShopCategory extends Component { const curTab = this.state.tabList[current] const { url, urlRedirect } = curTab - const fullPath = getCurrentRoute(this.$instance.router).fullPath.split('?')[0] + const fullPath = getCurrentRoute(this.$instance?.router).fullPath.split('?')[0] if (url && fullPath !== url) { if (!urlRedirect || (url === '/subpages/member/index' && !S.getAuthToken())) { Taro.navigateTo({ url }) diff --git a/src/marketing/pages/distribution/shop-goods.js b/src/marketing/pages/distribution/shop-goods.js index d253e9621..a7089c18e 100644 --- a/src/marketing/pages/distribution/shop-goods.js +++ b/src/marketing/pages/distribution/shop-goods.js @@ -136,7 +136,7 @@ export default class DistributionShopGoods extends Component { const curTab = this.state.tabList[current] const { url } = curTab - const fullPath = getCurrentRoute(this.$instance.router).fullPath.split('?')[0] + const fullPath = getCurrentRoute(this.$instance?.router).fullPath.split('?')[0] if (url && fullPath !== url) { Taro.redirectTo({ url }) } diff --git a/src/marketing/pages/distribution/shop-home.js b/src/marketing/pages/distribution/shop-home.js index e7ea1fd06..c127075d0 100644 --- a/src/marketing/pages/distribution/shop-home.js +++ b/src/marketing/pages/distribution/shop-home.js @@ -75,7 +75,7 @@ export default class DistributionShopHome extends Component { async componentDidMount() { // if (!S.getAuthToken()) { - // const { path } = this.$instance.router + // const { path } = this.$instance?.router // const params = await entryLaunch.getRouteParams() // const redirect = encodeURIComponent(`${path}?${qs.stringify(params)}`) // Taro.navigateTo({ @@ -299,7 +299,7 @@ export default class DistributionShopHome extends Component { const curTab = this.state.tabList[current] const { url, urlRedirect } = curTab - const fullPath = getCurrentRoute(this.$instance.router).fullPath.split('?')[0] + const fullPath = getCurrentRoute(this.$instance?.router).fullPath.split('?')[0] if (url && fullPath !== url) { if (!urlRedirect || (url === '/subpages/member/index' && !S.getAuthToken())) { Taro.navigateTo({ url }) diff --git a/src/marketing/pages/item/group-detail.js b/src/marketing/pages/item/group-detail.js index 0d6abd3fb..1c3a35676 100644 --- a/src/marketing/pages/item/group-detail.js +++ b/src/marketing/pages/item/group-detail.js @@ -97,7 +97,7 @@ export default class GroupDetail extends Component { if (!S.getAuthToken()) { showToast('请先登录') - const { params, path } = this.$instance.router + const { params, path } = this.$instance?.router let url = '' if (isWeixin || isAlipay) { url = `/subpages/member/index?redirect=${encodeURIComponent( diff --git a/src/marketing/pages/member/edit-address.js b/src/marketing/pages/member/edit-address.js index c76ff5977..32e76fe7b 100644 --- a/src/marketing/pages/member/edit-address.js +++ b/src/marketing/pages/member/edit-address.js @@ -44,7 +44,7 @@ function AddressIndex(props) { }, []) const initNavigationBarTitle = () => { - return $instance.router?.params?.address_id ? '编辑地址' : '新增地址' + return $instance?.router?.params?.address_id ? '编辑地址' : '新增地址' } const fetchAddressList = async () => { @@ -62,7 +62,7 @@ function AddressIndex(props) { }) list.map((a_item) => { - if (a_item.address_id === $instance.router?.params?.address_id) { + if (a_item.address_id === $instance?.router?.params?.address_id) { setState((draft) => { draft.info = a_item draft.chooseValue = [a_item.province, a_item.city, a_item.county] @@ -70,7 +70,7 @@ function AddressIndex(props) { } }) - if ($instance.router?.params?.isWechatAddress) { + if ($instance?.router?.params?.isWechatAddress) { try { const resAddress = await Taro.chooseAddress() const query = { diff --git a/src/marketing/pages/member/user-info.js b/src/marketing/pages/member/user-info.js index c46e962f6..76b0ea96a 100644 --- a/src/marketing/pages/member/user-info.js +++ b/src/marketing/pages/member/user-info.js @@ -286,7 +286,7 @@ export default class Reg extends Component { } handleGetPhoneNumber = async (e) => { - // let { code } = getCurrentInstance().params + // let { code } = getCurrentInstance()?.params // try { // await Taro.checkSession() // } catch (e) { diff --git a/src/marketing/pages/plusprice/detail-plusprice-list.js b/src/marketing/pages/plusprice/detail-plusprice-list.js index 8828d33ac..0f44753b4 100644 --- a/src/marketing/pages/plusprice/detail-plusprice-list.js +++ b/src/marketing/pages/plusprice/detail-plusprice-list.js @@ -39,7 +39,7 @@ export default class DetailPluspriceList extends Component { componentDidMount() { console.log('---componentDidMount---') - // const { marketing_id } = getCurrentInstance().params + // const { marketing_id } = getCurrentInstance()?.params // this.setState({ // query: { // marketing_id: marketing_id diff --git a/src/pages/cart/comps/comp-deliver.js b/src/pages/cart/comps/comp-deliver.js index 55cba00ff..dc84c6933 100644 --- a/src/pages/cart/comps/comp-deliver.js +++ b/src/pages/cart/comps/comp-deliver.js @@ -90,7 +90,7 @@ function CompDeliver(props, ref) { } = state const formRef = useRef() const $instance = getCurrentInstance() - const { cart_type } = $instance.router?.params || {} + const { cart_type } = $instance?.router?.params || {} // useEffect(() => { // fetch() // }, []) diff --git a/src/pages/cart/comps/deliver.js b/src/pages/cart/comps/deliver.js index 9e16d9c73..45be9b780 100644 --- a/src/pages/cart/comps/deliver.js +++ b/src/pages/cart/comps/deliver.js @@ -65,7 +65,7 @@ export default class Deliver extends Component { render() { const { curStore, receiptType, address, isOpenStore, colors, headShop = {} } = this.props - const { goodType, type } = this.$instance.router?.params || {} + const { goodType, type } = this.$instance?.router?.params || {} // 收货方式[快递，同城，自提] const deliveryList = [ { diff --git a/src/pages/cart/espier-checkout.js b/src/pages/cart/espier-checkout.js index 0d1e07e6f..a8facc3f6 100644 --- a/src/pages/cart/espier-checkout.js +++ b/src/pages/cart/espier-checkout.js @@ -138,7 +138,7 @@ function CartCheckout(props) { launchScene = routerParams.launchScene } = $instance?.router?.params || {} const isLaunchScene = launchScene == 1 ? true : false - console.log('$instance.router?.params:', $instance.router) + console.log('$instance?.router?.params:', $instance?.router) useEffect(() => { Taro.eventCenter.on('onEventCheckoutInvoiceChange', (params) => { diff --git a/src/pages/cart/espier-index.js b/src/pages/cart/espier-index.js index 8e60d6bc7..8df46200d 100644 --- a/src/pages/cart/espier-index.js +++ b/src/pages/cart/espier-index.js @@ -59,7 +59,7 @@ function CartIndex() { const dispatch = useDispatch() const $instance = getCurrentInstance() - const router = $instance.router + const router = $instance?.router const [state, setState] = useImmer(initialState) const { current, recommendList, policyModal, cartRemind } = state diff --git a/src/pages/item/comps/comp-buytoolbar.js b/src/pages/item/comps/comp-buytoolbar.js index b5d3df43c..d75950736 100644 --- a/src/pages/item/comps/comp-buytoolbar.js +++ b/src/pages/item/comps/comp-buytoolbar.js @@ -35,7 +35,7 @@ function CompGoodsBuyToolbar(props) { const RenderBtns = () => { // 兑换券 - const { card_id } = $instance.router?.params || {} + const { card_id } = $instance?.router?.params || {} if (card_id) { btns.push(BUY_TOOL_BTNS().EX_CHANGE) return diff --git a/src/pages/item/espier-detail.js b/src/pages/item/espier-detail.js index bd28201a6..0d18dad02 100644 --- a/src/pages/item/espier-detail.js +++ b/src/pages/item/espier-detail.js @@ -176,7 +176,7 @@ function EspierDetail(props) { }, [packageOpen, skuPanelOpen, sharePanelOpen, posterModalOpen, promotionOpen, isParameter]) useEffect(() => { - const { path } = $instance.router + const { path } = $instance?.router if (id && path === '/pages/item/espier-detail') { fetch() } diff --git a/src/pages/webview.js b/src/pages/webview.js index 25289dc1a..f85d1d4ef 100644 --- a/src/pages/webview.js +++ b/src/pages/webview.js @@ -10,7 +10,7 @@ import { View, WebView } from '@tarojs/components' const initialState = {} function WebviewIndex() { const $instance = getCurrentInstance() - const { url } = $instance.router?.params + const { url } = $instance?.router?.params const webviewSrc = decodeURIComponent(url) return ( diff --git a/src/plugin/requestIntercept.js b/src/plugin/requestIntercept.js index ffac8c697..6336602ff 100644 --- a/src/plugin/requestIntercept.js +++ b/src/plugin/requestIntercept.js @@ -12,7 +12,7 @@ export function requestIntercept() { let requestParams = chain.requestParams const { method, data, url } = requestParams // console.log('getCurrentInstance:', getCurrentInstance()) - if (isObject(getCurrentInstance().router)) { + if (isObject(getCurrentInstance()?.router)) { const { path } = getCurrentInstance()?.router // console.log('getCurrentInstance params:', path) if ( diff --git a/src/subpage/pages/recommend/detail.js b/src/subpage/pages/recommend/detail.js index 87dd5e425..2e7777596 100644 --- a/src/subpage/pages/recommend/detail.js +++ b/src/subpage/pages/recommend/detail.js @@ -79,7 +79,7 @@ export default class recommendDetail extends Component { // 确认本人文章是否已收藏 confirmCollectArticle = async () => { const { id } = this.$instance?.router?.params - console.log('this.$instance.router:', this.$instance.router) + console.log('this.$instance?.router:', this.$instance?.router) if (S.getAuthToken()) { const res = await api.article.collectArticleInfo({ article_id: id }) if (res.length === 0) { @@ -107,7 +107,7 @@ export default class recommendDetail extends Component { async fetchContent() { const { id } = this.$instance?.router?.params - console.log('this.$instance.router:', this.$instance.router) + console.log('this.$instance?.router:', this.$instance?.router) // 关注数加1 const resFocus = await api.article.focus(id) @@ -144,7 +144,7 @@ export default class recommendDetail extends Component { if(!S.getAuthToken()){ return false } - const { id } = getCurrentInstance().params + const { id } = getCurrentInstance()?.params const { status } = await api.article.praiseCheck(id) this.setState({ praiseCheckStatus: status diff --git a/src/subpage/pages/trade/after-sale-detail.js b/src/subpage/pages/trade/after-sale-detail.js index 597f76b5c..cf6d07d23 100644 --- a/src/subpage/pages/trade/after-sale-detail.js +++ b/src/subpage/pages/trade/after-sale-detail.js @@ -398,7 +398,7 @@ export default class TradeDetail extends Component { icon: 'success' }) - const { fullPath } = getCurrentRoute(this.$instance.router) + const { fullPath } = getCurrentRoute(this.$instance?.router) Taro.redirectTo({ url: fullPath }) diff --git a/src/subpage/pages/trade/customer-pickup-list.js b/src/subpage/pages/trade/customer-pickup-list.js index 90251b089..25fcbf8c9 100644 --- a/src/subpage/pages/trade/customer-pickup-list.js +++ b/src/subpage/pages/trade/customer-pickup-list.js @@ -124,7 +124,7 @@ export default class TradePickList extends Component { const { tid } = trade if (type === 'confirm') { await api.trade.confirm(tid) - const { fullPath } = getCurrentRoute(this.$instance.router) + const { fullPath } = getCurrentRoute(this.$instance?.router) Taro.redirectTo({ url: fullPath }) diff --git a/src/subpage/pages/trade/detail.js b/src/subpage/pages/trade/detail.js index a957a611e..5f335efb1 100644 --- a/src/subpage/pages/trade/detail.js +++ b/src/subpage/pages/trade/detail.js @@ -425,12 +425,12 @@ export default class TradeDetail extends Component { if (confirm) { await api.trade.confirm(info.tid) if (isWeixin || isAlipay) { - const { fullPath } = getCurrentRoute(this.$instance.router) + const { fullPath } = getCurrentRoute(this.$instance?.router) Taro.redirectTo({ url: fullPath }) } else { - const { path } = this.$instance.router + const { path } = this.$instance?.router Taro.redirectTo({ url: path }) diff --git a/src/subpage/pages/trade/drug-list.js b/src/subpage/pages/trade/drug-list.js index ac907dc2e..2f9024f42 100644 --- a/src/subpage/pages/trade/drug-list.js +++ b/src/subpage/pages/trade/drug-list.js @@ -121,7 +121,7 @@ export default class TradePickList extends Component { const { tid } = trade if (type === 'confirm') { await api.trade.confirm(tid) - const { fullPath } = getCurrentRoute(this.$instance.router) + const { fullPath } = getCurrentRoute(this.$instance?.router) Taro.redirectTo({ url: fullPath }) diff --git a/src/subpage/pages/trade/list.js b/src/subpage/pages/trade/list.js index 48fe581db..511967d08 100644 --- a/src/subpage/pages/trade/list.js +++ b/src/subpage/pages/trade/list.js @@ -257,7 +257,7 @@ export default class TradeList extends Component { if (type === 'confirm') { await api.trade.confirm(tid) - const { fullPath } = getCurrentRoute(this.$instance.router) + const { fullPath } = getCurrentRoute(this.$instance?.router) Taro.redirectTo({ url: fullPath }) diff --git a/src/subpages/auth/auth-loading.js b/src/subpages/auth/auth-loading.js index 86ff9d5d2..c3a810542 100644 --- a/src/subpages/auth/auth-loading.js +++ b/src/subpages/auth/auth-loading.js @@ -15,7 +15,7 @@ const AuthLoading = () => { const $instance = getCurrentInstance() const { params: { code, redi_url } - } = $instance.router + } = $instance?.router const { getUserInfo } = useLogin() diff --git a/src/subpages/auth/bindPhone.js b/src/subpages/auth/bindPhone.js index bb4c97f95..e722f5d0c 100644 --- a/src/subpages/auth/bindPhone.js +++ b/src/subpages/auth/bindPhone.js @@ -29,7 +29,7 @@ const PageBindPhone = () => { const $instance = getCurrentInstance() const { params: { unionid, redi_url } - } = $instance.router + } = $instance?.router const { getUserInfo } = useLogin() diff --git a/src/subpages/auth/edit-password.js b/src/subpages/auth/edit-password.js index 96fde98c9..c5840a7d8 100644 --- a/src/subpages/auth/edit-password.js +++ b/src/subpages/auth/edit-password.js @@ -26,7 +26,7 @@ const PageEditPassword = () => { const { params: { phone, unionid, vcode } - } = $instance.router + } = $instance?.router const [state, setState] = useImmer(initialValue) diff --git a/src/subpages/auth/forgotpwd.js b/src/subpages/auth/forgotpwd.js index 7e7ebd252..1fdf0d90c 100644 --- a/src/subpages/auth/forgotpwd.js +++ b/src/subpages/auth/forgotpwd.js @@ -31,7 +31,7 @@ const PageBindPhone = () => { const $instance = getCurrentInstance() const { params: { phone, redi_url } - } = $instance.router + } = $instance?.router const [state, setState] = useImmer(initialValue) diff --git a/src/subpages/auth/util.js b/src/subpages/auth/util.js index f8a0e2935..33de2e7ed 100644 --- a/src/subpages/auth/util.js +++ b/src/subpages/auth/util.js @@ -33,7 +33,7 @@ async function setTokenAndRedirect(token = '', tokenSetSuccessCallback) { const hasToken = setToken(token) const $instance = this ? this.$instance : getCurrentInstance() - const router = $instance.router + const router = $instance?.router if (hasToken) { await tokenSetSuccessCallback?.() const { redi_url, redirect } = router?.params diff --git a/src/subpages/case/view-case.js b/src/subpages/case/view-case.js index 7f004bbc0..7ad3f375c 100644 --- a/src/subpages/case/view-case.js +++ b/src/subpages/case/view-case.js @@ -17,7 +17,7 @@ function ViewCase() { const [state, setState] = useImmer(initialState) const { designWorks } = state const $instance = getCurrentInstance() - const { design_works } = $instance.router?.params || {} + const { design_works } = $instance?.router?.params || {} useEffect(() => { if (design_works) { const designWorksList = JSON.parse(design_works) diff --git a/src/subpages/community/boxlist.js b/src/subpages/community/boxlist.js index 070767014..ce0481ce5 100644 --- a/src/subpages/community/boxlist.js +++ b/src/subpages/community/boxlist.js @@ -40,7 +40,7 @@ const BoxList = () => { state const goodsRef = useRef() const $instance = getCurrentInstance() - const { activity_id } = $instance.router?.params + const { activity_id } = $instance?.router?.params // useEffect(() => { // if (startDate && startTime && endDate && endTime) { diff --git a/src/subpages/community/order-manage.js b/src/subpages/community/order-manage.js index 38715d89b..aef513b90 100644 --- a/src/subpages/community/order-manage.js +++ b/src/subpages/community/order-manage.js @@ -67,7 +67,7 @@ function CheifOrderManage(props) { const { checkIsChief } = useSelector((state) => state.user) const orderRef = useRef() const $instance = getCurrentInstance() - const { activity_id } = $instance.router?.params + const { activity_id } = $instance?.router?.params const { keywords, diff --git a/src/subpages/community/order.js b/src/subpages/community/order.js index 8f0b9a6c6..0deb433d4 100644 --- a/src/subpages/community/order.js +++ b/src/subpages/community/order.js @@ -65,7 +65,7 @@ function CommunityOrder(props) { const { colorPrimary } = useSelector((state) => state.sys) const orderRef = useRef() const $instance = getCurrentInstance() - const { activity_id } = $instance.router?.params + const { activity_id } = $instance?.router?.params const { keywords, orderList, curTabIdx, isOpened, remark, payLoading } = state const fetch = async ({ pageIndex, pageSize }) => { @@ -267,7 +267,7 @@ function CommunityOrder(props) { title: '支付成功', icon: 'success' }) - const { fullPath } = getCurrentRoute($instance.router?.params || {}) + const { fullPath } = getCurrentRoute($instance?.router?.params || {}) Taro.redirectTo({ url: fullPath }) diff --git a/src/subpages/community/trade/after-sale-detail.js b/src/subpages/community/trade/after-sale-detail.js index e88167277..70a637fbd 100644 --- a/src/subpages/community/trade/after-sale-detail.js +++ b/src/subpages/community/trade/after-sale-detail.js @@ -402,7 +402,7 @@ export default class TradeDetail extends Component { icon: 'success' }) - const { fullPath } = getCurrentRoute(this.$instance.router) + const { fullPath } = getCurrentRoute(this.$instance?.router) Taro.redirectTo({ url: fullPath }) diff --git a/src/subpages/dianwu/activity-code.js b/src/subpages/dianwu/activity-code.js index aa5183450..1023157c4 100644 --- a/src/subpages/dianwu/activity-code.js +++ b/src/subpages/dianwu/activity-code.js @@ -25,7 +25,7 @@ function ActivityCode(props) { useEffect(() => {}, []) const handleScanGoodsBN = async () => { - // 注意：真机scancode扫码完成后回调，taro getCurrentInstance().router = null，无法获取到路由参数 + // 注意：真机scancode扫码完成后回调，taro getCurrentInstance()?.router = null，无法获取到路由参数 const { errMsg, result } = await Taro.scanCode() console.log('handleScanCode:', result) if (errMsg == 'scanCode:ok') { diff --git a/src/subpages/dianwu/cashier.js b/src/subpages/dianwu/cashier.js index e98b4f52a..6b2743a44 100644 --- a/src/subpages/dianwu/cashier.js +++ b/src/subpages/dianwu/cashier.js @@ -140,7 +140,7 @@ function DianWuCashier() { } const handleScanGoodsBN = async () => { - // 注意：真机scancode扫码完成后回调，taro getCurrentInstance().router = null，无法获取到路由参数 + // 注意：真机scancode扫码完成后回调，taro getCurrentInstance()?.router = null，无法获取到路由参数 const { errMsg, result } = await Taro.scanCode() console.log('handleScanCode:', result) if (errMsg == 'scanCode:ok') { diff --git a/src/subpages/game-activity/pages/records.jsx b/src/subpages/game-activity/pages/records.jsx index c7d6aa519..3086ea6c8 100644 --- a/src/subpages/game-activity/pages/records.jsx +++ b/src/subpages/game-activity/pages/records.jsx @@ -13,7 +13,7 @@ const SpRecordLayout = () => { const [records, setRecords] = useState([]) const $instance = Taro.getCurrentInstance() - const { path, params } = $instance.router + const { path, params } = $instance?.router const id = params.id useEffect(() => { initData() diff --git a/src/subpages/guide/cart/espier-index.js b/src/subpages/guide/cart/espier-index.js index 175cf0a9a..f8d74493e 100644 --- a/src/subpages/guide/cart/espier-index.js +++ b/src/subpages/guide/cart/espier-index.js @@ -34,7 +34,7 @@ const initialState = { function CartIndex() { const dispatch = useDispatch() const $instance = getCurrentInstance() - const router = $instance.router + const router = $instance?.router const [state, setState] = useImmer(initialState) const { current, policyModal } = state diff --git a/src/subpages/guide/components/ba-tab-bar/index.js b/src/subpages/guide/components/ba-tab-bar/index.js index 6441c158a..a707beca7 100644 --- a/src/subpages/guide/components/ba-tab-bar/index.js +++ b/src/subpages/guide/components/ba-tab-bar/index.js @@ -121,7 +121,7 @@ export default class TabBar extends Component { updateCurTab() { this.fetchCart() const { tabList, localCurrent } = this.state - const fullPath = getCurrentRoute(getCurrentInstance().router).fullPath.split('?')[0] + const fullPath = getCurrentRoute(getCurrentInstance()?.router).fullPath.split('?')[0] if (tabList.length == 0) { return } @@ -145,7 +145,7 @@ export default class TabBar extends Component { }) } - const { path } = getCurrentRoute(getCurrentInstance().router) + const { path } = getCurrentRoute(getCurrentInstance()?.router) if (this.state.tabList[cartTabIdx] && path === this.state.tabList[cartTabIdx].url) { updateCartCount('') return @@ -163,7 +163,7 @@ export default class TabBar extends Component { const curTab = this.state.tabList[current] const { url, withLogin } = curTab console.log('tabbar-withLogin', url, withLogin) - const fullPath = getCurrentRoute(getCurrentInstance().router).fullPath.split('?')[0] + const fullPath = getCurrentRoute(getCurrentInstance()?.router).fullPath.split('?')[0] // if (withLogin && !S.getAuthToken()) { // return Taro.navigateTo({ // url: process.env.APP_AUTH_PAGE diff --git a/src/subpages/item/list.js b/src/subpages/item/list.js index dfcfa2d62..ed52e5bed 100644 --- a/src/subpages/item/list.js +++ b/src/subpages/item/list.js @@ -82,7 +82,7 @@ function ItemList() { const goodsRef = useRef() const pageRef = useRef() - // console.log('$instance?.router?.params', $instance.router?.params) + // console.log('$instance?.router?.params', $instance?.router?.params) useEffect(() => { if (S.getAuthToken()) { dispatch(fetchUserFavs()) diff --git a/src/subpages/pointshop/comps/comp-buytoolbar.js b/src/subpages/pointshop/comps/comp-buytoolbar.js index 172e836f0..4445fe1dc 100644 --- a/src/subpages/pointshop/comps/comp-buytoolbar.js +++ b/src/subpages/pointshop/comps/comp-buytoolbar.js @@ -34,7 +34,7 @@ function CompGoodsBuyToolbar(props) { const RenderBtns = () => { // 兑换券 - const { card_id } = $instance.router?.params || {} + const { card_id } = $instance?.router?.params || {} if (card_id) { btns.push(BUY_TOOL_BTNS().EX_CHANGE) return diff --git a/src/subpages/pointshop/comps/comp-deliver.js b/src/subpages/pointshop/comps/comp-deliver.js index 356635ee2..9282ce6f3 100644 --- a/src/subpages/pointshop/comps/comp-deliver.js +++ b/src/subpages/pointshop/comps/comp-deliver.js @@ -73,7 +73,7 @@ function CompDeliver(props, ref) { } = state const formRef = useRef() const $instance = getCurrentInstance() - const { cart_type } = $instance.router?.params || {} + const { cart_type } = $instance?.router?.params || {} // useEffect(() => { // fetch() // }, []) diff --git a/src/subpages/pointshop/espier-checkout.js b/src/subpages/pointshop/espier-checkout.js index 00d88a05b..0f11e97b1 100644 --- a/src/subpages/pointshop/espier-checkout.js +++ b/src/subpages/pointshop/espier-checkout.js @@ -105,8 +105,8 @@ function PointShopEspierCheckout() { scene, // 情景值 goodType, ticket = null - } = $instance.router?.params || {} - console.log('$instance.router?.params:', $instance) + } = $instance?.router?.params || {} + console.log('$instance?.router?.params:', $instance) useEffect(() => { if (isLogin) { getTradeSetting() diff --git a/src/subpages/pointshop/espier-detail.js b/src/subpages/pointshop/espier-detail.js index cebd9b5d3..14a61a0fa 100644 --- a/src/subpages/pointshop/espier-detail.js +++ b/src/subpages/pointshop/espier-detail.js @@ -111,7 +111,7 @@ function PointShopEspierDetail(props) { }, []) useEffect(() => { - const { path } = $instance.router + const { path } = $instance?.router if (id && path === '/subpages/pointshop/espier-detail') { fetch() } diff --git a/src/subpages/purchase/espier-checkout.js b/src/subpages/purchase/espier-checkout.js index 1c305d2dc..d89b80fdc 100644 --- a/src/subpages/purchase/espier-checkout.js +++ b/src/subpages/purchase/espier-checkout.js @@ -131,7 +131,7 @@ function PurchaseCheckout(props) { scene, // 情景值 goodType, ticket = null - } = $instance.router?.params || {} + } = $instance?.router?.params || {} useEffect(() => { if (isLogin) { diff --git a/src/subpages/purchase/espier-index.js b/src/subpages/purchase/espier-index.js index a64d246e0..596d70017 100644 --- a/src/subpages/purchase/espier-index.js +++ b/src/subpages/purchase/espier-index.js @@ -41,7 +41,7 @@ function CartIndex() { const dispatch = useDispatch() const $instance = getCurrentInstance() - const router = $instance.router + const router = $instance?.router const [state, setState] = useImmer(initialState) const { current, policyModal } = state diff --git a/src/subpages/purchase/list.js b/src/subpages/purchase/list.js index ced935152..78bd60411 100644 --- a/src/subpages/purchase/list.js +++ b/src/subpages/purchase/list.js @@ -79,7 +79,7 @@ function ItemList() { const dispatch = useDispatch() const goodsRef = useRef() - // console.log('$instance?.router?.params', $instance.router?.params) + // console.log('$instance?.router?.params', $instance?.router?.params) useEffect(() => { if (S.getAuthToken()) { dispatch(fetchUserFavs()) diff --git a/src/subpages/salesman/cart.js b/src/subpages/salesman/cart.js index 128f85f92..6aa2cb32b 100644 --- a/src/subpages/salesman/cart.js +++ b/src/subpages/salesman/cart.js @@ -35,7 +35,7 @@ function Cart() { const { allChecked, current } = state const dispatch = useDispatch() const $instance = getCurrentInstance() - const router = $instance.router + const router = $instance?.router const { validSalesmanCart = [], invalidSalesmanCart = [], diff --git a/src/subpages/salesman/comps/comp-delivers.js b/src/subpages/salesman/comps/comp-delivers.js index 318b77a6b..951eb3606 100644 --- a/src/subpages/salesman/comps/comp-delivers.js +++ b/src/subpages/salesman/comps/comp-delivers.js @@ -90,7 +90,7 @@ function CompDeliver(props, ref) { } = state const formRef = useRef() const $instance = getCurrentInstance() - const { cart_type } = $instance.router?.params || {} + const { cart_type } = $instance?.router?.params || {} // useEffect(() => { // fetch() // }, []) diff --git a/src/subpages/salesman/distribution/good-category.js b/src/subpages/salesman/distribution/good-category.js index a2c78ae07..fbedcebd3 100644 --- a/src/subpages/salesman/distribution/good-category.js +++ b/src/subpages/salesman/distribution/good-category.js @@ -218,7 +218,7 @@ export default class DistributionShopCategory extends Component { const curTab = this.state.tabList[current] const { url } = curTab - const fullPath = getCurrentRoute(this.$instance.router).fullPath.split('?')[0] + const fullPath = getCurrentRoute(this.$instance?.router).fullPath.split('?')[0] if (url && fullPath !== url) { Taro.redirectTo({ url }) } diff --git a/src/subpages/salesman/distribution/goods.js b/src/subpages/salesman/distribution/goods.js index 6421d9be7..1ed6b307f 100644 --- a/src/subpages/salesman/distribution/goods.js +++ b/src/subpages/salesman/distribution/goods.js @@ -470,7 +470,7 @@ export default class DistributionGoods extends Component { const curTab = this.state.tabList[current] const { url } = curTab - const fullPath = getCurrentRoute(this.$instance.router).fullPath.split('?')[0] + const fullPath = getCurrentRoute(this.$instance?.router).fullPath.split('?')[0] if (url && fullPath !== url) { Taro.redirectTo({ url }) diff --git a/src/subpages/salesman/distribution/shop-category.js b/src/subpages/salesman/distribution/shop-category.js index e8a59aa47..138950a97 100644 --- a/src/subpages/salesman/distribution/shop-category.js +++ b/src/subpages/salesman/distribution/shop-category.js @@ -184,7 +184,7 @@ export default class DistributionShopCategory extends Component { const curTab = this.state.tabList[current] const { url, urlRedirect } = curTab - const fullPath = getCurrentRoute(this.$instance.router).fullPath.split('?')[0] + const fullPath = getCurrentRoute(this.$instance?.router).fullPath.split('?')[0] if (url && fullPath !== url) { if (!urlRedirect || (url === '/subpages/member/index' && !S.getAuthToken())) { Taro.navigateTo({ url }) diff --git a/src/subpages/salesman/distribution/shop-goods.js b/src/subpages/salesman/distribution/shop-goods.js index fc639280d..babfd736a 100644 --- a/src/subpages/salesman/distribution/shop-goods.js +++ b/src/subpages/salesman/distribution/shop-goods.js @@ -137,7 +137,7 @@ export default class DistributionShopGoods extends Component { const curTab = this.state.tabList[current] const { url } = curTab - const fullPath = getCurrentRoute(this.$instance.router).fullPath.split('?')[0] + const fullPath = getCurrentRoute(this.$instance?.router).fullPath.split('?')[0] if (url && fullPath !== url) { Taro.redirectTo({ url }) } diff --git a/src/subpages/salesman/distribution/shop-home.js b/src/subpages/salesman/distribution/shop-home.js index 9344f79d5..a7eaed5ff 100644 --- a/src/subpages/salesman/distribution/shop-home.js +++ b/src/subpages/salesman/distribution/shop-home.js @@ -80,7 +80,7 @@ export default class DistributionShopHome extends Component { async componentDidMount() { // if (!S.getAuthToken()) { - // const { path } = this.$instance.router + // const { path } = this.$instance?.router // const params = await entryLaunch.getRouteParams() // const redirect = encodeURIComponent(`${path}?${qs.stringify(params)}`) // Taro.navigateTo({ @@ -338,7 +338,7 @@ export default class DistributionShopHome extends Component { const curTab = this.state.tabList[current] const { url, urlRedirect } = curTab - const fullPath = getCurrentRoute(this.$instance.router).fullPath.split('?')[0] + const fullPath = getCurrentRoute(this.$instance?.router).fullPath.split('?')[0] if (url && fullPath !== url) { if (!urlRedirect || (url === '/subpages/member/index' && !S.getAuthToken())) { Taro.navigateTo({ url }) diff --git a/src/subpages/salesman/espier-checkout.js b/src/subpages/salesman/espier-checkout.js index 304560d6e..27b628ca8 100644 --- a/src/subpages/salesman/espier-checkout.js +++ b/src/subpages/salesman/espier-checkout.js @@ -131,7 +131,7 @@ function CartCheckout(props) { scene, // 情景值 goodType = routerParams.goodType } = $instance?.router?.params || {} - console.log('$instance.router?.params:', $instance.router) + console.log('$instance?.router?.params:', $instance?.router) useEffect(() => { if (isLogin) { getTradeSetting() diff --git a/src/subpages/store/brand-info.js b/src/subpages/store/brand-info.js index 8e85cc4b8..7b2fd972a 100644 --- a/src/subpages/store/brand-info.js +++ b/src/subpages/store/brand-info.js @@ -26,7 +26,7 @@ const PageBrandInfo = () => { const { params: { distributor_id } - } = $instance.router + } = $instance?.router const getDetail = async () => { const { diff --git a/src/subpages/store/comps/comp-add-cart.js b/src/subpages/store/comps/comp-add-cart.js index f444111ee..bafd63674 100644 --- a/src/subpages/store/comps/comp-add-cart.js +++ b/src/subpages/store/comps/comp-add-cart.js @@ -38,7 +38,7 @@ function CompAddCart(props) { const [state, setState] = useImmer(initialState) const { hideClose } = state const $instance = getCurrentInstance() - const router = $instance.router + const router = $instance?.router const plus_buy_activity = shopCartCount?.storeDetails?.plus_buy_activity?.[0] const exchange_item = plus_buy_activity?.plus_item ? pickBy(plus_buy_activity?.plus_item, { ...doc.cart.PLUS_BUY_ITEM }) diff --git a/src/subpages/store/comps/comp-tab.js b/src/subpages/store/comps/comp-tab.js index 9dda6a68d..f98d07969 100644 --- a/src/subpages/store/comps/comp-tab.js +++ b/src/subpages/store/comps/comp-tab.js @@ -26,7 +26,7 @@ function CompTab(props) { const [state, setState] = useImmer(initialState) const { fav, couponList, extend } = state const $instance = getCurrentInstance() - const router = $instance.router + const router = $instance?.router if (!shopCartCount) { return null diff --git a/src/subpages/store/index.js b/src/subpages/store/index.js index a4e439550..d8a9107bb 100644 --- a/src/subpages/store/index.js +++ b/src/subpages/store/index.js @@ -64,7 +64,7 @@ function StoreIndex() { const { shopCartCount } = useSelector((state) => state.cart) const { setNavigationBarTitle } = useNavigation() const $instance = getCurrentInstance() - const router = $instance.router + const router = $instance?.router const { wgts, diff --git a/src/utils/entryLaunch.js b/src/utils/entryLaunch.js index 647ef9024..e53a24b2b 100644 --- a/src/utils/entryLaunch.js +++ b/src/utils/entryLaunch.js @@ -39,7 +39,7 @@ class EntryLaunch { * @function 获取小程序路由参数 */ async getRouteParams(options) { - const params = options?.query || options?.params || $instance.router?.params || {} + const params = options?.query || options?.params || $instance?.router?.params || {} const pageStack = Taro.getCurrentPages() @@ -56,7 +56,7 @@ class EntryLaunch { } let _options = {} - console.log('$instance.router?.params', $instance.router?.params) + console.log('$instance?.router?.params', $instance?.router?.params) if (params?.scene) { console.log('params scene:', params.scene, resolveUrlParamsParse(params.scene)) _options = { @@ -457,7 +457,7 @@ class EntryLaunch { * 导购任务埋点上报 */ async postGuideTask(customPath) { - const { path, params } = $instance.router + const { path, params } = $instance?.router const paths = customPath || path const routePath = { '/pages/item/espier-detail': 'activeItemDetail', diff --git a/src/utils/index.js b/src/utils/index.js index 03dca82b4..8cf4448f9 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -168,7 +168,7 @@ export const isIphoneX = () => { // TODO: 验证方法在h5及边界情况稳定性 export function getCurrentRoute() { - const router = getCurrentInstance().router + const router = getCurrentInstance()?.router // eslint-disable-next-line const { $taroTimestamp, ...params } = router?.params || {} const path = router?.path diff --git a/src/utils/platform.h5.js b/src/utils/platform.h5.js index b93a8bd46..fe1b35480 100644 --- a/src/utils/platform.h5.js +++ b/src/utils/platform.h5.js @@ -37,7 +37,7 @@ export const transformPlatformUrl = (url) => { // 授权页面 export const goToAuthPage = () => { const $instance = useMemo(getCurrentInstance, []) - const router = $instance.router + const router = $instance?.router const { path } = router Taro.navigateTo({ url: `/pages/auth/login?redirect=`