bug(跳转):

src/boost/pages/detail/index.js

@@ -23,7 +23,7 @@ import './index.scss'
   })
 )
 export default class Detail extends Component {
-  $instance = getCurrentInstance()
+  $instance = getCurrentInstance() || {}
   constructor(props) {
     super(props)
     this.state = {

src/boost/pages/flop/index.js

@@ -17,7 +17,7 @@ import './index.scss'
   memberData: user.userInfo
 }))
 export default class Flop extends Component {
-  $instance = getCurrentInstance()
+  $instance = getCurrentInstance() || {}
   constructor(props) {
     super(props)
 

src/boost/pages/pay/index.js

@@ -23,7 +23,7 @@ import './index.scss'
   })
 )
 export default class Pay extends Component {
-  $instance = getCurrentInstance()
+  $instance = getCurrentInstance() || {}
   constructor(props) {
     super(props)
     this.state = {

src/boost/pages/payDetail/index.js

@@ -13,7 +13,7 @@ import { SpNavBar } from '@/components'
 import './index.scss'
 
 export default class PayDetail extends Component {
-  $instance = getCurrentInstance()
+  $instance = getCurrentInstance() || {}
   constructor(props) {
     super(props)
 

src/components/sp-cashier/index.js

@@ -49,7 +49,7 @@ function SpCashier(props) {
     salesman = false,
     isPurchase = false
   } = props
-  const $instance = getCurrentInstance()
+  const $instance = getCurrentInstance() || {}
   const { userInfo } = useSelector((state) => state.user)
   const { customerLnformation } = useSelector((state) => state.cart)
   const [state, setState] = useImmer(initialState)

src/components/sp-chat/index.js

@@ -22,7 +22,7 @@ function SpChat(props) {
   const [state, setState] = useImmer(initialState)
   const { isWeAppKefu } = state
   const { echat, meiqia } = useSelector((state) => state.sys)
-  const $instance = getCurrentInstance()
+  const $instance = getCurrentInstance() || {}
 
   useEffect(() => {
     init()

src/components/sp-deliver/index.js

@@ -91,7 +91,7 @@ function SpDeliver(props, ref) {
     activeTimeIdMerchant
   } = state
   const formRef = useRef()
-  const $instance = getCurrentInstance()
+  const $instance = getCurrentInstance() || {}
   const { cart_type } = $instance?.router?.params || {}
   // useEffect(() => {
   //   fetch()

src/components/sp-login/index.h5.js

@@ -23,7 +23,7 @@ function SpLogin(props) {
       updateAddress()
     }
   })
-  const $instance = getCurrentInstance()
+  const $instance = getCurrentInstance() || {}
   /**
    *
    */

src/components/tab-bar/index.js

@@ -15,7 +15,7 @@ const defaultTabList = []
 //   cartCount: cart.cartCount
 // }))
 export default class TabBar extends Component {
-  $instance = getCurrentInstance()
+  $instance = getCurrentInstance() || {}
   constructor(props) {
     super(props)
 

src/hooks/themeColor.js

@@ -10,7 +10,7 @@ function useThemsColor() {
   const sys = useSelector((state) => state.sys)
   const { colorPrimary, colorMarketing, colorAccent, rgb } = sys
 
-  const $instance = getCurrentInstance()
+  const $instance = getCurrentInstance() || {}
 
   const themeColor = () => {
     const { page, router } = $instance

src/hooks/useDianWuLogin.js

@@ -13,7 +13,7 @@ import S from '@/spx'
 import { SG_DIANWU_TOKEN } from '@/consts/localstorage'
 
 export default (props = {}) => {
-  const $instance = getCurrentInstance()
+  const $instance = getCurrentInstance() || {}
 
   useEffect(() => {
     const { token } = $instance?.router?.params || {}

src/hooks/useLogin.js

@@ -29,7 +29,7 @@ export default (props = {}) => {
   const dispatch = useDispatch()
   const { userInfo, isNewUser } = useSelector((state) => state.user)
   const { invite_code } = useSelector((state) => state.purchase)
-  const $instance = getCurrentInstance()
+  const $instance = getCurrentInstance() || {}
   // const policyTime = useRef(0)
 
   useEffect(() => {

src/hooks/useNavigation.js

@@ -15,10 +15,10 @@ export default (props = {}) => {
       })
     }
 
-    const { page } = getCurrentInstance()
+    const { page } = getCurrentInstance() || {}
     const allPages = Taro.getCurrentPages()
-    console.log('allPages:', allPages)
-    page.config['navigationBarTitleText'] = title
+    console.log('allPages:', allPages,page)
+    page && (page.config.navigationBarTitleText = title)
   }
 
   return {

src/hooks/usePayment.js

@@ -24,7 +24,7 @@ export default (props = {}) => {
   // const [state, setState] = useImmer(initialState)
   // const { params, orderInfo } = state
   const cashierResultUrl = `/pages/cart/cashier-result`
-  const $instance = getCurrentInstance()
+  const $instance = getCurrentInstance() || {}
   const currentPath = $instance?.router?.path
   const router = useRouter()
   const callbackRef = useRef()
@@ -188,7 +188,7 @@ export default (props = {}) => {
 
   // 微信H5 JSDK
   const wxpayjsPay = async (params, orderInfo) => {
-    // const $instance = getCurrentInstance()
+    // const $instance = getCurrentInstance() || {}
     const { order_id, code } = router?.params
     if (!code) {
       // 微信客户端code授权

src/marketing/pages/distribution/good-category.js

@@ -16,7 +16,7 @@ import './shop-category.scss'
 @withPager
 @withBackToTop
 export default class DistributionShopCategory extends Component {
-  $instance = getCurrentInstance()
+  $instance = getCurrentInstance() || {}
   spPageRef = React.createRef()
   constructor(props) {
     super(props)

src/marketing/pages/distribution/goods.js

@@ -19,7 +19,7 @@ import './goods.scss'
 @withPager
 @withBackToTop
 export default class DistributionGoods extends Component {
-  $instance = getCurrentInstance()
+  $instance = getCurrentInstance() || {}
   spPageRef = React.createRef()
   constructor(props) {
     super(props)

src/marketing/pages/distribution/qrcode.js

@@ -16,7 +16,7 @@ import './qrcode.scss'
   colors: colors.current
 }))
 export default class DistributionQrcode extends Component {
-  $instance = getCurrentInstance()
+  $instance = getCurrentInstance() || {}
   constructor(props) {
     super(props)
 

src/marketing/pages/distribution/shop-category.js

@@ -17,7 +17,7 @@ import './shop-category.scss'
 @withPager
 @withBackToTop
 export default class DistributionShopCategory extends Component {
-  $instance = getCurrentInstance()
+  $instance = getCurrentInstance() || {}
   constructor(props) {
     super(props)
 

src/marketing/pages/distribution/shop-form.js

@@ -15,7 +15,7 @@ import api from '@/api'
 import './shop-form.scss'
 
 export default class DistributionShopForm extends Component {
-  $instance = getCurrentInstance()
+  $instance = getCurrentInstance() || {}
   constructor(props) {
     super(props)
 

src/marketing/pages/distribution/shop-goods.js

@@ -16,7 +16,7 @@ import './shop-goods.scss'
 @withPager
 @withBackToTop
 export default class DistributionShopGoods extends Component {
-  $instance = getCurrentInstance()
+  $instance = getCurrentInstance() || {}
   constructor(props) {
     super(props)
 

src/marketing/pages/distribution/shop-home.js

@@ -20,7 +20,7 @@ import './shop-home.scss'
 
 @withPager
 export default class DistributionShopHome extends Component {
-  $instance = getCurrentInstance()
+  $instance = getCurrentInstance() || {}
   constructor(props) {
     super(props)
 

src/marketing/pages/distribution/shop.js

@@ -17,7 +17,7 @@ import './shop.scss'
   colors: colors.current
 }))
 export default class DistributionShop extends Component {
-  $instance = getCurrentInstance()
+  $instance = getCurrentInstance() || {}
   constructor(props) {
     super(props)
 

src/marketing/pages/distribution/trade.js

@@ -16,7 +16,7 @@ import './trade.scss'
 @withPager
 @withBackToTop
 export default class DistributionTrade extends Component {
-  $instance = getCurrentInstance()
+  $instance = getCurrentInstance() || {}
   constructor(props) {
     super(props)
 

src/marketing/pages/item/espier-evaluation-detail.js

@@ -23,7 +23,7 @@ import './espier-evaluation.scss'
 )
 @withPager
 export default class EvaluationDetail extends Component {
-  $instance = getCurrentInstance()
+  $instance = getCurrentInstance() || {}
   static options = {
     addGlobalClass: true
   }

src/marketing/pages/item/espier-evaluation.js

@@ -23,7 +23,7 @@ import './espier-evaluation.scss'
 @withPager
 @withBackToTop
 export default class Evaluation extends Component {
-  $instance = getCurrentInstance()
+  $instance = getCurrentInstance() || {}
   static options = {
     addGlobalClass: true
   }

src/marketing/pages/item/group-detail.js

@@ -17,7 +17,7 @@ import { getDtidIdUrl } from '@/utils/helper'
 import './group-detail.scss'
 
 export default class GroupDetail extends Component {
-  $instance = getCurrentInstance()
+  $instance = getCurrentInstance() || {}
 
   constructor(props) {
     super(props)

src/marketing/pages/item/rate.js

@@ -22,7 +22,7 @@ import './rate.scss'
   () => ({})
 )
 export default class TradeRate extends Component {
-  $instance = getCurrentInstance()
+  $instance = getCurrentInstance() || {}
   constructor(props) {
     super(props)
 

src/marketing/pages/item/seckill-goods-list.js

@@ -20,7 +20,7 @@ import './seckill-goods-list.scss'
 @withPager
 @withBackToTop
 export default class SeckillGoodsList extends Component {
-  $instance = getCurrentInstance()
+  $instance = getCurrentInstance() || {}
   constructor(props) {
     super(props)
 

src/marketing/pages/member/activity-detail-old.js

@@ -26,7 +26,7 @@ import './activity-detail.scss'
   colors: colors.current
 }))
 export default class ActivityDetail extends Component {
-  $instance = getCurrentInstance()
+  $instance = getCurrentInstance() || {}
   constructor(props) {
     super(props)
 

src/marketing/pages/member/address.js

@@ -24,7 +24,7 @@ const initialState = {
 }
 
 function AddressIndex(props) {
-  const $instance = getCurrentInstance()
+  const $instance = getCurrentInstance() || {}
   const [state, setState] = useImmer(initialState)
   const colors = useSelector((state) => state.sys)
   const { address } = useSelector((state) => state.user)

src/marketing/pages/member/coupon-detail.js

@@ -15,7 +15,7 @@ import './coupon-detail.scss'
   colors: colors.current
 }))
 export default class CouponDetail extends Component {
-  $instance = getCurrentInstance()
+  $instance = getCurrentInstance() || {}
   constructor(props) {
     super(props)
 

src/marketing/pages/member/destroy-member.js

@@ -18,7 +18,7 @@ const { store } = configStore()
   colors: colors.current
 }))
 export default class SettingIndex extends Component {
-  $instance = getCurrentInstance()
+  $instance = getCurrentInstance() || {}
   constructor(props) {
     super(props)
     this.state = {

src/marketing/pages/member/edit-address.js

@@ -27,7 +27,7 @@ const initialState = {
 }
 
 function AddressIndex(props) {
-  const $instance = getCurrentInstance()
+  const $instance = getCurrentInstance() || {}
   const [state, setState] = useImmer(initialState)
   const colors = useSelector((state) => state.colors.current)
   const dispatch = useDispatch()

src/marketing/pages/member/shopping-guide-card.js

@@ -14,7 +14,7 @@ import { normalizeQuerys } from '@/utils'
 import './shopping-guide-card.scss'
 
 export default class ShoppingGuideCard extends Component {
-  $instance = getCurrentInstance()
+  $instance = getCurrentInstance() || {}
   constructor(props) {
     super(props)
 

src/marketing/pages/member/user-info.js

@@ -31,7 +31,7 @@ const isWeapp = Taro.getEnv() === Taro.ENV_TYPE.WEAPP
   () => ({})
 )
 export default class Reg extends Component {
-  $instance = getCurrentInstance()
+  $instance = getCurrentInstance() || {}
   constructor(props) {
     super(props)
 

src/marketing/pages/plusprice/cart-plusprice-list.js

@@ -20,7 +20,7 @@ import './plusprice.scss'
 @withPager
 @withBackToTop
 export default class DetailPluspriceList extends Component {
-  $instance = getCurrentInstance()
+  $instance = getCurrentInstance() || {}
   constructor(props) {
     super(props)
 

src/marketing/pages/plusprice/detail-plusprice-list.js

@@ -21,7 +21,7 @@ import './plusprice.scss'
 @withPager
 @withBackToTop
 export default class DetailPluspriceList extends Component {
-  $instance = getCurrentInstance()
+  $instance = getCurrentInstance() || {}
   constructor(props) {
     super(props)
 

src/marketing/pages/reservation/goods-reservate-old.js

@@ -22,7 +22,7 @@ import './goods-reservate.scss'
 @withPager
 @withBackToTop
 export default class GoodsReservate extends Component {
-  $instance = getCurrentInstance()
+  $instance = getCurrentInstance() || {}
   constructor(props) {
     super(props)
 

src/marketing/pages/reservation/goods-reservate.js

@@ -46,7 +46,7 @@ const initialState = {
 }
 
 function GoodReservate(props) {
-  const $instance = getCurrentInstance()
+  const $instance = getCurrentInstance() || {}
   const [state, setState] = useImmer(initialState)
   const colors = useSelector((state) => state.colors.current)
   const dispatch = useDispatch()

src/others/pages/auth/index.js

@@ -13,7 +13,7 @@ import { normalizeQuerys, getAppId } from '@/utils'
 import './index.scss'
 
 export default class AuthLogin extends Component {
-  $instance = getCurrentInstance()
+  $instance = getCurrentInstance() || {}
   constructor(props) {
     super(props)
     this.state = {

src/others/pages/cart/coupon-picker.js

@@ -23,7 +23,7 @@ import './coupon-picker.scss'
 )
 @withPager
 export default class CouponPicker extends Component {
-  $instance = getCurrentInstance()
+  $instance = getCurrentInstance() || {}
   constructor(props) {
     super(props)
     this.state = {

src/others/pages/recharge/history.js

@@ -17,7 +17,7 @@ import './history.scss'
   colors: colors.current
 }))
 export default class History extends Component {
-  $instance = getCurrentInstance()
+  $instance = getCurrentInstance() || {}
   constructor(props) {
     super(props)
     this.state = {

src/pages/article/index.js

@@ -12,7 +12,7 @@ import { formatTime } from '@/utils'
 import './index.scss'
 
 export default class ArticleIndex extends Component {
-  $instance = getCurrentInstance()
+  $instance = getCurrentInstance() || {}
   constructor(props) {
     super(props)
 

src/pages/cart/add-personnel.js

@@ -29,7 +29,7 @@ const initialState = {
 }
 
 function AddPersonnel() {
-  const $instance = getCurrentInstance()
+  const $instance = getCurrentInstance() || {}
   const [state, setState] = useImmer(initialState)
   const { setNavigationBarTitle } = useNavigation()
 

src/pages/cart/cashier-result.js

@@ -22,7 +22,7 @@ const initialState = {
 }
 
 function CashierResult(props) {
-  const $instance = getCurrentInstance()
+  const $instance = getCurrentInstance() || {}
 
   const { cashierPayment } = usePayment()
   const [state, setState] = useImmer(initialState)

src/pages/cart/cashier-weapp.js

@@ -24,7 +24,7 @@ const initialState = {
   orderInfo: {}
 }
 function CashierWeApp(props) {
-  const $instance = getCurrentInstance()
+  const $instance = getCurrentInstance() || {}
   // const { params, orderInfo } = $instance?.router?.params
   // const _params = JSON.parse(decodeURIComponent(params))
   // const _orderInfo = JSON.parse(decodeURIComponent(orderInfo))

src/pages/cart/comps/comp-deliver.js

@@ -89,7 +89,7 @@ function CompDeliver(props, ref) {
     activeTimeIdMerchant
   } = state
   const formRef = useRef()
-  const $instance = getCurrentInstance()
+  const $instance = getCurrentInstance() || {}
   const { cart_type } = $instance?.router?.params || {}
   // useEffect(() => {
   //   fetch()

src/pages/cart/comps/deliver.js

@@ -15,7 +15,7 @@ import './deliver.scss'
   colors: colors.current
 }))
 export default class Deliver extends Component {
-  $instance = getCurrentInstance()
+  $instance = getCurrentInstance() || {}
   static defaultProps = {
     list: [],
     curStore: {},

src/pages/cart/espier-checkout.js

@@ -58,7 +58,7 @@ import CompPointUse from './comps/comp-pointuse'
 import './espier-checkout.scss'
 
 function CartCheckout(props) {
-  const $instance = getCurrentInstance()
+  const $instance = getCurrentInstance() || {}
   const { updateAddress } = useLocation()
   const { isLogin, getUserInfoAuth } = useLogin({
     autoLogin: true,

src/pages/cart/espier-index.js

@@ -58,7 +58,7 @@ function CartIndex() {
   })
 
   const dispatch = useDispatch()
-  const $instance = getCurrentInstance()
+  const $instance = getCurrentInstance() || {}
   const router = $instance?.router
 
   const [state, setState] = useImmer(initialState)

src/pages/cart/offline-transfer.js

@@ -37,7 +37,7 @@ const initialState = {
 }
 
 function OfflineTransfer() {
-  const $instance = getCurrentInstance()
+  const $instance = getCurrentInstance() || {}
   const [state, setState] = useImmer(initialState)
   const colors = useSelector((_state) => _state.colors.current)
   const { params } = useRouter()

src/pages/category/comps/comps-category-addCart.js

@@ -43,7 +43,7 @@ const initialState = {
 }
 
 function CompsCategoryAddCart(props) {
-  const $instance = getCurrentInstance()
+  const $instance = getCurrentInstance() || {}
   const [state, setState] = useImmer(initialState)
   // const { purchase_share_info = {} } = useSelector((state) => state.purchase)
   const {

src/pages/chat/index.js

@@ -10,7 +10,7 @@ import { SpPage } from '@/components'
 import './index.scss'
 
 function ChatIndex(props) {
-  const $instance = getCurrentInstance()
+  const $instance = getCurrentInstance() || {}
 
   const { url } = $instance?.router?.params
   const webviewSrc = decodeURIComponent(url)

src/pages/custom/custom-page.js

@@ -34,7 +34,7 @@ const initialState = {
   footerHeight: 0
 }
 function CustomPage(props) {
-  const $instance = getCurrentInstance()
+  const $instance = getCurrentInstance() || {}
   const [state, setState] = useImmer(initialState)
   const { wgts, loading, shareInfo, skuPanelOpen, selectType, info, isShowTabBar } = state
   const MSpSkuSelect = React.memo(SpSkuSelect)

src/pages/home/landing.js

@@ -17,7 +17,7 @@ import './landing.scss'
   })
 )
 export default class Landing extends Component {
-  $instance = getCurrentInstance()
+  $instance = getCurrentInstance() || {}
   constructor(props) {
     super(props)
 

src/pages/home/wgts/couponcard/index.jsx

@@ -17,7 +17,7 @@ import doc from '@/doc'
 import { getGlobalBaseStyle } from '../helper'
 import './index.scss'
 
-const $instance = getCurrentInstance()
+const $instance = getCurrentInstance() || {}
 function WgtCouponCard(props) {
   const [state, setState] = useImmer({
     couponCardList: []

src/pages/home/wgts/full-slider.js

@@ -13,7 +13,7 @@ import { needLoginPageType, needLoginPage } from '@/consts'
 import { WgtsContext } from './wgts-context'
 import './full-slider.scss'
 
-const $instance = getCurrentInstance()
+const $instance = getCurrentInstance() || {}
 const initState = {
   curIdx: 0,
   play: false,

src/pages/home/wgts/full-slider/index.jsx

@@ -14,7 +14,7 @@ import { WgtsContext } from '../wgts-context'
 import { getGlobalBaseStyle } from '../helper'
 import './index.scss'
 
-const $instance = getCurrentInstance()
+const $instance = getCurrentInstance() || {}
 const initState = {
   curIdx: 0,
   play: false,

src/pages/home/wgts/goods-scroll.js

@@ -19,7 +19,7 @@ export default class WgtGoodsScroll extends Component {
     addGlobalClass: true,
     info: null
   }
-  $instance = getCurrentInstance()
+  $instance = getCurrentInstance() || {}
 
   constructor(props) {
     super(props)

src/pages/home/wgts/slider/index.jsx

@@ -12,7 +12,7 @@ import { needLoginPageType, needLoginPage } from '@/consts'
 import { getGlobalBaseStyle } from '../helper'
 import './index.scss'
 
-const $instance = getCurrentInstance()
+const $instance = getCurrentInstance() || {}
 
 const initialState = {
   curIdx: 0,

src/pages/index.js

@@ -30,7 +30,8 @@ import {
   pickBy,
   log,
   showToast,
-  buildSharePath
+  buildSharePath,
+  isWeb
 } from '@/utils'
 import {
   updatePurchaseShareInfo,
@@ -124,23 +125,21 @@ function Home() {
   // 仅当定位结果真正变化（如城市/区县）时重拉首页配置，避免每次 useDidShow→updateAddress 导致 location 引用变化就整页重载
   useEffect(() => {
     if (!location || !VERSION_STANDARD) return
-    const key = [location.city, location.district, location.lat, location.lng].filter(Boolean).join('|')
-    if (locationKeyRef.current === key) return
-    locationKeyRef.current = key
     fetchWgts()
   }, [location])
 
   useEffect(() => {
     if (skuPanelOpen) {
-      pageRef.current.pageLock()
+      pageRef.current?.pageLock()
     } else {
-      pageRef.current.pageUnLock()
+      pageRef.current?.pageUnLock()
     }
   }, [skuPanelOpen])
 
   // H5：手动滚动到目标 section，等布局完成再测量并预留吸顶导航高度
   useEffect(() => {
-    if (process.env.TARO_ENV !== 'h5' || !scrollIntoView) return
+    if (!isWeb || !scrollIntoView) return
+    console.log('scrollIntoView:', scrollIntoView)
     const id = String(scrollIntoView).replace(/^#/, '')
     if (!id) return
     const navH = state.navbarHeight || 0

src/pages/item/comps/comp-buytoolbar.js

@@ -25,7 +25,7 @@ function CompGoodsBuyToolbar(props) {
   } = props
   const { cartCount = 0 } = useSelector((state) => state.cart)
   const { favs = [] } = useSelector((state) => state.user)
-  const $instance = getCurrentInstance()
+  const $instance = getCurrentInstance() || {}
   const dispatch = useDispatch()
   const btns = []
 

src/pages/item/espier-detail.js

@@ -115,7 +115,7 @@ const initialState = {
 }
 
 function EspierDetail(props) {
-  const $instance = getCurrentInstance()
+  const $instance = getCurrentInstance() || {}
   const pageRef = useRef()
 
   const { userInfo } = useSelector((state) => state.user)

src/pages/item/item-params.js

@@ -13,7 +13,7 @@ import { ParamsItem } from './comps'
 import './item-params.scss'
 
 export default class ItemParams extends Component {
-  $instance = getCurrentInstance()
+  $instance = getCurrentInstance() || {}
 
   constructor(props) {
     super(props)

src/pages/purchase/auth.js

@@ -55,7 +55,7 @@ function PurchaseAuth() {
   const dispatch = useDispatch()
   const codeRef = useRef()
   const { showModal } = useModal()
-  const $instance = getCurrentInstance()
+  const $instance = getCurrentInstance() || {}
   const [state, setState] = useImmer(initialState)
 
   const { invite_code, activity_id, enterprise_id, is_activity } = state

src/pages/recommend/detail.js

@@ -29,7 +29,7 @@ const initialState = {
   collectArticleStatus: false
 }
 function GuideRecommendDetail(props) {
-  const $instance = getCurrentInstance()
+  const $instance = getCurrentInstance() || {}
   const [state, setState] = useImmer(initialState)
   const { img, shareImageUrl, itemId, title, content, articleFocusNum, updated } = state
   const { userInfo } = useSelector((state) => state.guide)

src/pages/webview.js

@@ -9,7 +9,7 @@ import { View, WebView } from '@tarojs/components'
 
 const initialState = {}
 function WebviewIndex() {
-  const $instance = getCurrentInstance()
+  const $instance = getCurrentInstance() || {}
   const { url } = $instance?.router?.params
   const webviewSrc = decodeURIComponent(url)
 

src/subpage/pages/auth/pclogin.js

@@ -26,7 +26,7 @@ function parseUrlStr(urlStr) {
 }
 
 export default class PcAuth extends Component {
-  $instance = getCurrentInstance()
+  $instance = getCurrentInstance() || {}
   state = {
     checkStatus: false
   }

src/subpage/pages/cashier/cashier-result.js

@@ -13,7 +13,7 @@ import payFailPng from '../../../assets/imgs/pay_fail.png'
 import './cashier-result.scss'
 
 export default class CashierResult extends Component {
-  $instance = getCurrentInstance()
+  $instance = getCurrentInstance() || {}
   constructor(props) {
     super(props)
 

src/subpage/pages/cashier/comps/we-h5.js

@@ -10,7 +10,7 @@ import api from '@/api'
 import './we.scss'
 
 export default class WeappBtn extends Component {
-  $instance = getCurrentInstance()
+  $instance = getCurrentInstance() || {}
   static options = {
     addGlobalClass: true
   }

src/subpage/pages/cashier/comps/we.js

@@ -10,7 +10,7 @@ import api from '@/api'
 import './we.scss'
 
 export default class WeappBtn extends Component {
-  $instance = getCurrentInstance()
+  $instance = getCurrentInstance() || {}
   static options = {
     addGlobalClass: true
   }

src/subpage/pages/cashier/index.js

@@ -23,7 +23,7 @@ import './index.scss'
 }))
 @withLogin()
 export default class Cashier extends Component {
-  $instance = getCurrentInstance()
+  $instance = getCurrentInstance() || {}
   state = {
     info: null,
     env: '',

src/subpage/pages/editShare/index.js

@@ -34,7 +34,7 @@ const steps = [
   colors: colors.current
 }))
 export default class EditShare extends Component {
-  $instance = getCurrentInstance()
+  $instance = getCurrentInstance() || {}
   constructor(...props) {
     super(...props)
 

src/subpage/pages/qrcode-buy.js

@@ -22,7 +22,7 @@ import '../../pages/member/qrcode-buy.scss'
 @withPager
 @withBackToTop
 export default class QrcodeBuy extends Component {
-  $instance = getCurrentInstance()
+  $instance = getCurrentInstance() || {}
   constructor(props) {
     super(props)
 

src/subpage/pages/recommend/detail.js

@@ -20,7 +20,7 @@ import './detail.scss'
 }))
 @withPager
 export default class recommendDetail extends Component {
-  $instance = getCurrentInstance()
+  $instance = getCurrentInstance() || {}
   constructor(props) {
     props = props || {}
     // props.pageSize = 50

src/subpage/pages/trade/after-sale-detail.js

@@ -28,7 +28,7 @@ import './after-sale-detail.scss'
   pointName: sys.pointName
 }))
 export default class TradeDetail extends Component {
-  $instance = getCurrentInstance()
+  $instance = getCurrentInstance() || {}
   constructor(props) {
     super(props)
 

src/subpage/pages/trade/after-sale.js

@@ -23,7 +23,7 @@ import './list.scss'
 @withPager
 @withLogin()
 export default class AfterSale extends Component {
-  $instance = getCurrentInstance()
+  $instance = getCurrentInstance() || {}
   constructor(props) {
     super(props)
 

src/subpage/pages/trade/cancel.js

@@ -20,7 +20,7 @@ const TEXTCOUNT = 255
   colors: colors.current
 }))
 export default class TradeCancel extends Component {
-  $instance = getCurrentInstance()
+  $instance = getCurrentInstance() || {}
 
   constructor(props) {
     super(props)

src/subpage/pages/trade/customer-pickup-list.js

@@ -20,7 +20,7 @@ import './list.scss'
 }))
 @withPager
 export default class TradePickList extends Component {
-  $instance = getCurrentInstance()
+  $instance = getCurrentInstance() || {}
 
   constructor(props) {
     super(props)

src/subpage/pages/trade/detail.js

@@ -70,7 +70,7 @@ const statusImg = {
   purchase: purchase.purchase_share_info
 }))
 export default class TradeDetail extends Component {
-  $instance = getCurrentInstance()
+  $instance = getCurrentInstance() || {}
   constructor(props) {
     super(props)
 

src/subpage/pages/trade/drug-list.js

@@ -17,7 +17,7 @@ import './list.scss'
 @withPager
 @withLogin()
 export default class TradePickList extends Component {
-  $instance = getCurrentInstance()
+  $instance = getCurrentInstance() || {}
 
   constructor(props) {
     super(props)

src/subpage/pages/trade/list.js

@@ -35,7 +35,7 @@ import './list.scss'
 }))
 @withPager
 export default class TradeList extends Component {
-  $instance = getCurrentInstance()
+  $instance = getCurrentInstance() || {}
   constructor(props) {
     super(props)
 

src/subpage/pages/trade/refund-detail.js

@@ -12,7 +12,7 @@ import api from '@/api'
 import './refund-detail.scss'
 
 export default class TradeRefundDetail extends Component {
-  $instance = getCurrentInstance()
+  $instance = getCurrentInstance() || {}
   constructor(props) {
     super(props)
 

src/subpage/pages/trade/refund-sendback.js

@@ -33,7 +33,7 @@ import './refund-sendback.scss'
 //   'JTSD': '极兔速递',
 // }
 export default class TradeRefundSendback extends Component {
-  $instance = getCurrentInstance()
+  $instance = getCurrentInstance() || {}
 
   constructor(props) {
     super(props)

src/subpage/pages/trade/refund.js

@@ -21,7 +21,7 @@ import './refund.scss'
   colors: colors.current
 }))
 export default class TradeRefund extends Component {
-  $instance = getCurrentInstance()
+  $instance = getCurrentInstance() || {}
   constructor(props) {
     super(props)
 

src/subpage/pages/vip/vipgrades.js

@@ -37,7 +37,7 @@ import './vipgrades.scss'
   })
 )
 export default class VipIndex extends Component {
-  $instance = getCurrentInstance()
+  $instance = getCurrentInstance() || {}
   constructor(props) {
     super(props)
 

src/subpages/auth/auth-loading.js

@@ -12,7 +12,7 @@ import { setTokenAndRedirect, getToken } from './util'
 import './auth-loading.scss'
 
 const AuthLoading = () => {
-  const $instance = getCurrentInstance()
+  const $instance = getCurrentInstance() || {}
   const {
     params: { code, redi_url }
   } = $instance?.router

src/subpages/auth/bindPhone.js

@@ -26,7 +26,7 @@ const initialValue = {
 }
 
 const PageBindPhone = () => {
-  const $instance = getCurrentInstance()
+  const $instance = getCurrentInstance() || {}
   const {
     params: { unionid, redi_url }
   } = $instance?.router

src/subpages/auth/comps/comp-otherlogin.js

@@ -11,7 +11,7 @@ import './comp-otherlogin.scss'
 
 const CompOtherLogin = () => {
   const handleClickWexin = async () => {
-    const $instance = getCurrentInstance()
+    const $instance = getCurrentInstance() || {}
     //跳转
     const { redirect = '' } = $instance?.router?.params
     const redirectUrl =

src/subpages/auth/edit-password.js

@@ -22,7 +22,7 @@ const initialValue = {
 }
 
 const PageEditPassword = () => {
-  const $instance = getCurrentInstance()
+  const $instance = getCurrentInstance() || {}
 
   const {
     params: { phone, unionid, vcode }

src/subpages/auth/forgotpwd.js

@@ -28,7 +28,7 @@ const initialValue = {
 }
 
 const PageBindPhone = () => {
-  const $instance = getCurrentInstance()
+  const $instance = getCurrentInstance() || {}
   const {
     params: { phone, redi_url }
   } = $instance?.router

src/subpages/auth/login.js

@@ -23,7 +23,7 @@ import './login.scss'
   (dispatch) => ({ dispatch })
 )
 export default class Login extends Component {
-  $instance = getCurrentInstance()
+  $instance = getCurrentInstance() || {}
   constructor(props) {
     super(props)
 

src/subpages/auth/reg-rule.js

@@ -13,7 +13,7 @@ import './reg-rule.scss'
 
 @withPager
 export default class RegRule extends Component {
-  $instance = getCurrentInstance()
+  $instance = getCurrentInstance() || {}
   constructor(props) {
     super(props)
 

src/subpages/case/detail.js

@@ -16,7 +16,7 @@ const initialState = {
 function CaseDetail() {
   const [state, setState] = useImmer(initialState)
   const { detail } = state
-  const $instance = getCurrentInstance()
+  const $instance = getCurrentInstance() || {}
   const { design_id, plan_id } = $instance?.router?.params || {}
   const { levelinfo } = detail || {}
 

src/subpages/case/view-case.js

@@ -16,7 +16,7 @@ const initialState = {
 function ViewCase() {
   const [state, setState] = useImmer(initialState)
   const { designWorks } = state
-  const $instance = getCurrentInstance()
+  const $instance = getCurrentInstance() || {}
   const { design_works } = $instance?.router?.params || {}
   useEffect(() => {
     if (design_works) {

src/subpages/community/apply-chief.js

@@ -55,7 +55,7 @@ function ApplyChief(props) {
     loading
   } = state
   const { colorPrimary } = useSelector((state) => state.sys)
-  const $instance = getCurrentInstance()
+  const $instance = getCurrentInstance() || {}
   const formRef = useRef()
   const { distributor_id: dtid, scene = '' } = $instance?.router?.params
   let distributor_id = dtid

src/subpages/community/boxlist.js

@@ -39,7 +39,7 @@ const BoxList = () => {
   const { startDate, startTime, endDate, endTime, activeIndex, list, itemBoxNum, itemPieceNum } =
     state
   const goodsRef = useRef()
-  const $instance = getCurrentInstance()
+  const $instance = getCurrentInstance() || {}
   const { activity_id } = $instance?.router?.params
 
   // useEffect(() => {

src/subpages/community/chief-licence.js

@@ -19,7 +19,7 @@ const initialState = {
 }
 function PointRule(props) {
   const [state, setState] = useImmer(initialState)
-  const $instance = getCurrentInstance()
+  const $instance = getCurrentInstance() || {}
   const { content } = state
 
   useEffect(() => {

src/subpages/community/community-edit.js

@@ -23,7 +23,7 @@ const initialState = {
 function CommunityEdit(props) {
   const [state, setState] = useImmer(initialState)
   const { ziti_name, address, areaValue, province, city, area } = state
-  const $instance = getCurrentInstance()
+  const $instance = getCurrentInstance() || {}
   const { id } = $instance?.router?.params
   useEffect(() => {
     if (id) {

src/subpages/community/espier-checkout.js

@@ -26,7 +26,7 @@ const initialState = {
 }
 
 const EspierCheckout = () => {
-  const $instance = getCurrentInstance()
+  const $instance = getCurrentInstance() || {}
   const { activity_id, items } = $instance?.router?.params
   const { address, chiefInfo, checkIsChief } = useSelector((state) => state.user)
   const { cashierPayment } = usePayment()