feats

jsconfig.json

@@ -0,0 +1,18 @@
+// 本文件, 仅仅是为了支持 IDE 跳转, 与项目打包没有任何关系
+
+{
+  "compilerOptions": {
+    "experimentalDecorators": true,
+    "baseUrl": ".",
+    "paths": {      
+      "@/actions/*": ["./src/actions/*"],
+      "@/assets/*": ["./src/assets/*"],
+      "@/components/*": ["./src/components/*"],
+      "@/constants/*": ["./src/constants/*"],
+      "@/reducers/*": ["./src/reducers/*"],
+      "@/styles/*": ["./src/styles/*"],
+      "@/utils/*": ["./src/utils/*"],
+      "@/services/*": ["./src/services/*"],
+    }
+  }
+}

src/layout/WrapperPerson.jsx

@@ -1,12 +0,0 @@
-import React from 'react'
-import { useSelector } from 'react-redux'
-import { useRouter } from '@tarojs/taro'
-
-export default (props) => {
-  const { person, ...extInfo } = useSelector(s => s.user.userInfo)
-  const router = useRouter()
-
-  return person && person.personId
-    ? React.cloneElement(props.children, { person, router, ...extInfo })
-    : null
-}

src/layout/index.js

@@ -1,4 +1,5 @@
 import React, { useState, useEffect } from 'react'
+import Taro, { useDidShow, useRouter } from '@tarojs/taro'
 import { useSelector } from 'react-redux'
 import { View } from '@tarojs/components'
 import Overlay from '@/components/Overlay'
@@ -6,23 +7,35 @@ import Loading from '@/components/Loading'
 import AuthAvatar from '@/components/Auth/AuthAvatar'
 import AuthPhone from '@/components/Auth/AuthPhone'
 import Spin from '@/components/Spin/Spin2'
-import WrapperPerson from './WrapperPerson'
 import useAuth from './useAuth'
+import { routes } from '../routes'
 
 import './style.scss'
 
 export default (ChildComponent) => (props) => {
-  const { person } = useSelector(s => s.user.userInfo)
-  const { spinning } = useSelector(s => s.user)
-
+  const consultant = useSelector(s => s.system.consultant)
+  const { spinning, userInfo } = useSelector(s => s.user)
+  const { person, ...extInfo } = userInfo || {}
+  const router = useRouter()
   const [loading, setLoading] = useState(false)
   const [authPhone, authAvatar] = useAuth(person)
 
+  
+  // 主要用于埋点
+  useEffect(() => {
+    const page = routes.filter((r) => (router.path.indexOf(r.page) > -1))[0]
+    Taro.setStorage({ key: 'page', data: page })
+  }, [router.path])
+
   useEffect(() => {
     setLoading(!person || !person.personId)
   // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [person])
 
+  useDidShow(() => {
+    console.log('componentDidShow')
+  })
+
   return (
     <>
       <Overlay visible={loading} style={{background: '#fff'}}>
@@ -39,9 +52,17 @@ export default (ChildComponent) => (props) => {
         </View>
       </Overlay>
       <Spin size={32} spinning={spinning} />
-      <WrapperPerson>
-        <ChildComponent />
-      </WrapperPerson>
+      {
+        person && person.personId
+        ? <ChildComponent
+            person={person}
+            router={router}
+            consultant={consultant}
+            {...props}
+            {...extInfo}
+        />
+        : null
+      }
     </>
   )
 }

src/pages/index/buildingDetail/hooks/useBuildingPoster.js

@@ -0,0 +1,23 @@
+import { useEffect, useState } from 'react'
+import { getMiniQrcode } from '@/services/common'
+
+export default function useBuildingPoster(person, router, poster, paramsRef) {
+  const [posterData, setPosterData] = useState()
+
+  useEffect(() => {
+    const page = router.path
+    const scene = paramsRef.current
+
+    getMiniQrcode({ page, scene }).then((miniCode) => {
+      setPosterData({
+        poster,
+        miniCode,
+        name: person.name || person.nickname,
+        avatar: person.avatarurl,
+      })
+    })
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [router.path, poster])
+
+  return posterData
+}

src/pages/index/buildingDetail/hooks/useBuildingShare.js

@@ -0,0 +1,32 @@
+import { useRef, useEffect } from 'react'
+import useShare from '@/utils/hooks/useShare'
+import { ROLE_CODE } from '@/constants/user'
+
+export default function useBuildingShare(person, buildingInfo, router, paramsRef) {
+  const shareRef = useRef()
+  const trackRef = useRef()
+
+  useEffect(() => {
+    if (buildingInfo?.buildingId) {
+      const shareContents = (buildingInfo.shareContents || [])[0] || {}
+      shareRef.current = {
+        title: shareContents.shareContentTitle || buildingInfo.buildingName,
+        path: `${router.path}?${paramsRef.current}`,
+        image: shareContents.shareContentImg,
+      }
+    }
+
+    // 判断当前人员是否置业顾问
+    const consultant = person.personType === ROLE_CODE.CONSULTANT ? { id: person.personId } : {}
+
+    trackRef.current = {
+      targetId: buildingInfo?.buildingId,
+      consultantId: consultant.id,
+      sharePersonId: person.personId,
+      buildingId: buildingInfo?.buildingId,
+    }
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [buildingInfo, router.path])
+
+  useShare(shareRef, trackRef)
+}

src/pages/index/buildingDetail/hooks/useParams.js

@@ -0,0 +1,20 @@
+import { useRef, useMemo } from 'react'
+import { ROLE_CODE } from '@/constants/user'
+
+export default function useParams(person, buildingInfo) {  
+
+  // 判断当前人员是否置业顾问
+  const consultant = person.personType === ROLE_CODE.CONSULTANT ? { id: person.personId } : {}
+
+  const paramsRef = useRef()
+  paramsRef.current = useMemo(() => {
+    return [
+      `id=${buildingInfo?.buildingId}`,
+      `from=building_share`,
+      `recommender=${person.personId}`,
+      consultant.id ? `consultant=${consultant.id}` : undefined,
+    ].filter(Boolean).join('&')
+  }, [buildingInfo?.buildingId, person.personId, consultant.id])
+
+  return paramsRef
+}

src/pages/index/buildingDetail/index.jsx

@@ -1,10 +1,10 @@
-import { useState, useEffect, useMemo } from 'react'
-import Taro, { useShareAppMessage } from '@tarojs/taro'
+import { useState, useEffect, useMemo, useRef } from 'react'
 import withLayout from '@/layout'
 import { ScrollView } from '@tarojs/components'
 import Disclaimer from '@/components/Disclaimer'
 import { fetch } from '@/utils/request'
 import { API_ITEMS_DETAIL, API_NEWS_LIST } from '@/constants/api'
+import useConsultant from '@/utils/hooks/useConsultant'
 import DetailBottom from './components/DetailBottom/index'
 import BuildingDetailBanner from './components/BuildingDetailBanner/index'
 import BasicInfo from './components/BasicInfo/index'
@@ -17,6 +17,9 @@ import MarketingActivity from './components/MarketingActivity/index'
 import LivingActivity from './components/LivingActivity/index'
 import News from './components/News/index'
 import Pictures from './components/Pictures/index'
+import useParams from './hooks/useParams'
+import useBuildingShare from './hooks/useBuildingShare'
+import useBuildingPoster from './hooks/useBuildingPoster'
 
 import './index.scss'
 
@@ -28,27 +31,14 @@ export default withLayout((props) => {
   const [PictureList, setPictureList] = useState([])
   const [NewsList, setNewsList] = useState([])
 
-  const [IsPull, setPull] = useState(false)
-  const [PullTimer, setPullTimer] = useState(null)
+  // 本页面分享或者海报参数
+  const paramsRef = useParams(person, DetailInfo)
 
-  const posterData = useMemo(() => {
-    if (!DetailInfo?.poster) {
-      return undefined
-    }
+  // 分享
+  useBuildingShare(person, DetailInfo, router, paramsRef)
 
-    return {
-      name: person.name || person.nickname,
-      avatar: person.avatarurl,
-      poster: DetailInfo?.poster,
-      miniCode: DetailInfo?.poster,
-    }
-
-  }, [DetailInfo?.poster, person.avatarurl, person.name, person.nickname])
-
-  
-  useShareAppMessage((res) => {
-    return {}
-  })
+  // 海报
+  const posterData = useBuildingPoster(person, router, DetailInfo?.poster, paramsRef)
 
   useEffect(() => {
     // 获取楼盘信息
@@ -59,6 +49,7 @@ export default withLayout((props) => {
         const List = res.buildingApartment.filter(item => item.apartmentType === 'photo')
         setPictureList(List.filter(item => item.buildingImgList.length > 0))
       }
+
     }).catch((err) => {
       console.error(err)
     })
@@ -67,26 +58,13 @@ export default withLayout((props) => {
     fetch({ url: API_NEWS_LIST, payload: { buildingId: id, pageSize: 2, pageNum: 1 } }).then((res) => {
       setNewsList(res.records || [])
     })
-  }, [id])
-
-  const PageRefresh = () => { // 页面下拉刷新回调
-    setPull(true)
-  }
-
-  useEffect(() => { // 下拉刷新触发
-    if (IsPull) {
-      clearTimeout(PullTimer)
-      setPullTimer(setTimeout(() => {
-        setPull(false)
-      }, 2000))
-    }
-  }, [IsPull])
+  }, [id, router.path])
 
   return (
     <view className='Page buildingDetail flex-v'>
       <view className='flex-item'>
         <view>
-          <ScrollView scroll-y refresher-enabled={false} refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} refresher-background='#f8f8f8'>
+          <ScrollView scroll-y>
             <view className='PageContent'>
 
               {/* banner */}

src/utils/hooks/useConsultant.js

@@ -0,0 +1,6 @@
+import { useSelector } from 'react-redux'
+
+export default function useConsultant() {
+  const consultant = useSelector(s => s.system.consultant)
+  return consultant
+}

src/utils/hooks/useShare.js

@@ -1,32 +1,33 @@
 import React, { useState } from 'react'
 import Taro, { useShareAppMessage } from '@tarojs/taro'
+import { shareTracking } from '@/utils/tracking'
 
-export default function useShare(shareRef) {
+export default function useShare(shareRef, trackRef) {
   useShareAppMessage((res) => {
     const {
       title = '',
       path = '',
-      imageUrl = '',
-      eventType = '',
-      propertyName = '',
+      image = '',
+    } = shareRef.current || {}
+
+    const {
+      // event = 'share',
+      // eventType = '',
+      // propertyName = '',
       consultantId = '',
       sharePersonId = '',
       targetId = '',
       buildingId = '',
-    } = shareRef.current || {}
+    } = trackRef.current || {}
 
-        // // 分享埋点
-        // shareSavePoint({
-        //   event: 'share',
-        //   eventType: 'building',
-        //   propertyName: '项目详情分享',
-        //   consultantId: consultantId,
-        //   sharePersonId: personId,
-        //   targetId: buildingId,
-        //   buildingId: buildingId || '',
-        //   data: '{}'
-        // }, 'project')
+    // 分享埋点
+    shareTracking({
+      consultantId,
+      sharePersonId,
+      targetId,
+      buildingId,
+    })
     
-    return shareObject
+    return { title, path, imageUrl: image }
   })
 }

src/utils/tracking/addNum.js

@@ -0,0 +1,56 @@
+import { savePoint } from '@/services/common'
+import { addItemShareNum } from '@/services/item'
+import { addActivityShareNum, addHelpShareNum, addGroupShareNum, addHFiveShareNum } from '@/services/activity'
+import { addCardShareNum } from '@/services/card'
+import {
+    addIndexShareNum,
+    addNewsShareNum,
+    addHousePosterNum,
+    addHouseShareNum,
+    addLivePosterNum,
+    addLiveShareNum,
+} from '@/services/news'
+
+
+export default function addNum({ targetId, eventType }) {
+  switch (eventType) {
+    case 'main':
+        addIndexShareNum(targetId)
+        break;
+    case 'building':
+        addItemShareNum(targetId)
+        break;
+    case 'activity':
+        addActivityShareNum(targetId)
+        break;
+    case 'consultant':
+        addCardShareNum(targetId)
+        break;
+    case 'news':
+        addNewsShareNum(targetId)
+        break;
+    // case 'houseApp':
+    //     addHouseShareNum(targetId)
+    //     break;
+    // case 'housePoster':
+    //     addHousePosterNum(targetId)
+    //     break;
+    // case 'liveApp':
+    //     addLiveShareNum(targetId)
+    //     break;
+    // case 'livePoster':
+    //     addLivePosterNum(targetId)
+    //     break;
+    // case 'help':
+    //     addHelpShareNum(targetId)
+    //     break;
+    // case 'group':
+    //     addGroupShareNum(targetId)
+    //     break;
+    // case 'h5':
+    //     addHFiveShareNum(targetId)
+    //     break;
+    default:
+        return
+  }
+}

src/utils/tracking/index.js

@@ -0,0 +1,31 @@
+import Taro from '@tarojs/taro'
+import { savePoint } from '@/services/common'
+import addNum from './addNum'
+
+export function shareTracking(options) {
+  const page = Taro.getStorageSync('page')
+  if (!page) return;
+
+  const { name: propertyName, type: eventType } = page
+  const {
+    event = 'share',
+    // eventType = '',
+    // propertyName = '',
+    consultantId = '',
+    sharePersonId = '',
+    targetId = '',
+    buildingId = '',
+  } = options
+
+  addNum({ eventType, targetId })
+  savePoint({
+    event,
+    eventType,
+    propertyName,
+    consultantId,
+    sharePersonId,
+    targetId,
+    buildingId,
+    data: '{}',
+  })
+}