feats

src/layouts/index.jsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react'
-import Taro, { useDidShow } from '@tarojs/taro'
+import Taro, { useDidShow, useRouter } from '@tarojs/taro'
 import AdvLayer from '@/components/AdvLayer'
 import GetUserIcon from '@/components/GetUserIcon/index'
 import GetUserPhone from '@/components/GetUserPhone/index'
@@ -22,6 +22,7 @@ const showError = err => {
 
 export default function (props) {
   const { user } = useModel('user')
+  const router = useRouter()
 
   const [page, setPage] = useState({})
   const [loading, setLoading] = useState(true)
@@ -40,7 +41,7 @@ export default function (props) {
   const goback = () => Taro.navigateBack({ delta: 1, fail: () => Taro.switchTab({ url: '/pages/ShouYe/index' }) })
 
   useDidShow(() => {
-    setPage(getPage())
+    setPage(getPage(router))
   })
 
   useEffect(() => {
@@ -57,7 +58,7 @@ export default function (props) {
   }, [page])
 
   // 埋点
-  useMountTrack()
+  useMountTrack({}, router)
 
   // 授权手机
   useEffect(() => {

src/pages/FuLi/ShangPinXiangQing/index.jsx

@@ -9,9 +9,9 @@ import '@/assets/css/iconfont.less'
 import './index.less'
 
 export default function ShangPinXiangQing () {
-
+  const router = useRouter()
   const { user } = useModel('user')
-  const [CurrnetId] = useState(useRouter().params.id) // 当前id
+  const [CurrnetId] = useState(router.params.id) // 当前id
   const [GoodsDetail, setGoodsDetail] = useState(null) // 商品详情
 
   Taro.useShareAppMessage(() => {
@@ -19,7 +19,7 @@ export default function ShangPinXiangQing () {
       title: GoodsDetail.goodsName,
       id: CurrnetId,
       image: GoodsDetail.imgUrl
-    }, user)
+    }, user, router)
   })
 
   useEffect(() => {

src/pages/HuoDong/HuoDongDetail/index.jsx

@@ -14,6 +14,7 @@ import './index.less'
 export default function HuoDongDetail () {
 
   const { user } = useModel('user')
+  const router = useRouter()
   const [DataLock, setDataLock] = useState(false)
   // const [HasJoin, setHasJoin] = useState(null)
   // const [HasSign, setHasSign] = useState(null)
@@ -23,7 +24,7 @@ export default function HuoDongDetail () {
   const [ShowJoinNumPopup, setShowJoinNumPopup] = useState(false)
   const [JoinNum, setJoinNum] = useState(null)
   const [ShowGetUserPhoneLayer, setShowGetUserPhoneLayer] = useState(false)
-  const [CurrnetHuoDongId] = useState(useRouter().params.id) // 当前活动id
+  const [CurrnetHuoDongId] = useState(router.params.id) // 当前活动id
   const [ActivityDetail, setActivityDetail] = useState(null) // 活动详情
   const [JoinInfo, setJoinInfo] = useState(null) // 参加活动详情
   const [Status, setStatus] = useState(null) // 参加活动状态 0-立即参与 1-未开始 2-去报名 3-已报名 4-去签到 5-已签到 6-已结束
@@ -34,7 +35,7 @@ export default function HuoDongDetail () {
       title: ActivityDetail.title,
       id: CurrnetHuoDongId,
       image: ActivityDetail.imgUrl
-    }, user)
+    }, user, router)
   })
 
   useEffect(() => {

src/pages/HuoDong/ZiXunDetail/index.jsx

@@ -13,7 +13,8 @@ import './index.less'
 export default function ZiXunDetail () {
 
   const { user } = useModel('user')
-  const [CurrnetZiXunId] = useState(useRouter().params.id) // 当前查询资讯id
+  const router = useRouter()
+  const [CurrnetZiXunId] = useState(router.params.id) // 当前查询资讯id
   const [NewsDetail, setNewsDetail] = useState(null) // 资讯详情
 
   Taro.useShareAppMessage(() => {
@@ -21,7 +22,7 @@ export default function ZiXunDetail () {
       title: NewsDetail.newsName,
       id: CurrnetZiXunId,
       image: NewsDetail.newsImg
-    }, user)
+    }, user, router)
   })
 
   useEffect(() => {

src/pages/ShouYe/index.jsx

@@ -6,7 +6,7 @@ import { Swiper, SwiperItem, Text } from '@tarojs/components'
 import request, { apis } from '@/utils/request'
 import { useModel } from '@/store'
 import useUserMounted from '@/utils/hooks/useUserMounted'
-import Taro from '@tarojs/taro'
+import Taro, { useRouter } from '@tarojs/taro'
 import Page from '@/layouts'
 import nav2detail from '@/utils/nav2detail'
 import { getShareObject } from '@/utils/share'
@@ -15,7 +15,7 @@ import '@/assets/css/iconfont.less'
 import './index.less'
 
 export default function Index () {
-
+  const router = useRouter()
   const { user } = useModel('user')
   const [OwnerList] = useState([
     { icon: require('@/assets/img/icon1.png'), name: '物业缴费', id: 1, router: '/pages/WuYe/index', setName: 'WuYeNavId', setValue: '4', isTab: true },
@@ -189,7 +189,7 @@ export default function Index () {
 
   // 分享转发
   Taro.useShareAppMessage(() => {
-    const shareObj = getShareObject({ title: '远道智慧社区' }, user)
+    const shareObj = getShareObject({ title: '远道智慧社区' }, user, router)
     return shareObj
   })
 

src/pages/WoDe/TuiJianErWeiMa/index.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react'
-import Taro from '@tarojs/taro'
+import Taro, { useRouter } from '@tarojs/taro'
 import CustomHeader from '@/components/CustomHeader/index'
 import { getQrCodeImage, getCardQrParam } from '@/utils/qrcode'
 import Page from '@/layouts'
@@ -10,7 +10,7 @@ import '@/assets/css/iconfont.less'
 import './index.less'
 
 export default function TuiJianErWeiMa () {
-
+  const router = useRouter()
   const { user } = useModel('user')
   const [QrCodeImg, setQrCodeImg] = useState(null)
 
@@ -19,7 +19,7 @@ export default function TuiJianErWeiMa () {
       title: '推荐二维码',
       id: user.personId,
       image: QrCodeImg
-    }, user)
+    }, user, router)
   })
 
   useEffect(() => {

src/pages/WuYe/BaoXiuDetail/index.jsx

@@ -12,9 +12,9 @@ import '@/assets/css/iconfont.less'
 import './index.less'
 
 export default function BaoXiuDetail () {
-
+  const router = useRouter()
   const { user } = useModel('user')
-  const [CurrnetBaoXiuId] = useState(useRouter().params.id)
+  const [CurrnetBaoXiuId] = useState(router.params.id)
   const [DetailInfo, setDetailInfo] = useState(null)
   const [PhoneList, setPhoneList] = useState([])
   const [ShowPopup, setShowPopup] = useState(false)
@@ -31,7 +31,7 @@ export default function BaoXiuDetail () {
       title: DetailInfo.ticketTitle,
       id: CurrnetBaoXiuId,
       image: null
-    }, user)
+    }, user, router)
   })
 
   useEffect(() => {

src/pages/WuYe/FuWuDetail/index.jsx

@@ -11,9 +11,9 @@ import '@/assets/css/iconfont.less'
 import './index.less'
 
 export default function WuYeFuWuDetail () {
-
+  const router = useRouter()
   const { user } = useModel('user')
-  const [CurrnetId] = useState(useRouter().params.id) // 当前id
+  const [CurrnetId] = useState(router.params.id) // 当前id
   const [DetailInfo, setDetailInfo] = useState(null) // 详情
 
   Taro.useShareAppMessage(() => {
@@ -21,7 +21,7 @@ export default function WuYeFuWuDetail () {
       title: DetailInfo.newsName,
       id: CurrnetId,
       image: DetailInfo.newsImg
-    }, user)
+    }, user, router)
   })
 
   useEffect(() => {

src/pages/WuYe/GongGaoDetail/index.jsx

@@ -11,7 +11,7 @@ import '@/assets/css/iconfont.less'
 import './index.less'
 
 export default function WuYeGongGaoDetail () {
-
+  const router = useRouter()
   const { user } = useModel('user')
   const [CurrnetId] = useState(useRouter().params.id)
   const [DetailInfo, setDetailInfo] = useState(null)
@@ -21,7 +21,7 @@ export default function WuYeGongGaoDetail () {
       title: DetailInfo.announcementTitle,
       id: CurrnetId,
       image: DetailInfo.announcementCarouselImg
-    }, user)
+    }, user, router)
   })
 
   useEffect(() => {

src/utils/hooks/useMountTrack.js

@@ -1,5 +1,4 @@
 import React, { useEffect, useRef } from 'react'
-import { getCurrentInstance } from '@tarojs/taro'
 import { useModel } from '@/store'
 import { getPage } from '@/utils'
 import request, { apis } from '../request'
@@ -11,7 +10,7 @@ import request, { apis } from '../request'
  * 
  * @param {*} params 
  */
-export default function useMountTrack(params) {
+export default function useMountTrack(params, router) {
   const execed = useRef(false)
   const { user } = useModel('user')
 
@@ -20,8 +19,7 @@ export default function useMountTrack(params) {
       return
     }
 
-    const router = getCurrentInstance().router
-    const page = getPage()
+    const page = getPage(router)
     if (!page) {
       return
     }

src/utils/index.js

@@ -1,4 +1,3 @@
-import { getCurrentInstance } from '@tarojs/taro'
 
 const pages = require('../pages')
 
@@ -6,8 +5,7 @@ const pages = require('../pages')
 export const deepCopy = x => JSON.parse(JSON.stringify(X))
 
 // 获取当前页面配置
-export const getPage = () => {
-  const router = getCurrentInstance().router
+export const getPage = (router) => {
   return pages.filter(x => router.path.indexOf(x.page) > -1)[0]
 }
 

src/utils/share.js

@@ -1,4 +1,3 @@
-import { getCurrentInstance } from '@tarojs/taro'
 import { shareTrack } from './track'
 import { getPage } from '.'
 
@@ -12,10 +11,9 @@ import { getPage } from '.'
  * @param {*} params 
  * @param {*} user 
  */
-export function getShareObject(params, user) {
+export function getShareObject(params, user, router) {
   console.log(user, `user`)
-  const router = getCurrentInstance().router
-  const page = getPage() || {}
+  const page = getPage(router) || {}
   const { title, image, targetId, ...leftParams } = params || {}
 
   const event = (params || {}).event || 'share'
@@ -28,7 +26,7 @@ export function getShareObject(params, user) {
     event,
     eventType,
     targetId,
-  }, user)
+  }, user, router)
 
   // 理论上 queryString 需要做 encodeURIComponent 处理
   const queryString = [

src/utils/track.js

@@ -9,7 +9,7 @@ import { getPage } from '.'
 export async function trackUserSource(router, qrcode) {
   const { path, scene, params } = router || {}
 
-  const page = getPage()
+  const page = getPage(router)
 
   const trackPayload = {
     ...(page.track || {}),
@@ -45,9 +45,9 @@ export async function trackUserSource(router, qrcode) {
  * 
  * @param {*} params 
  */
-export function shareTrack(params, user) {
+export function shareTrack(params, user, router) {
   // 埋点
-  const page = getPage() || {}
+  const page = getPage(router) || {}
   const eventType =  (params || {}).eventType || page.eventType
 
   const { targetId, ...trackParams } = params || {}