feats

config/dev.js

@@ -3,8 +3,8 @@ module.exports = {
     NODE_ENV: '"development"'
   },
   defineConstants: {
-    HOST: '"https://xlk.njyz.tech"',
-    // HOST: '"http://127.0.0.1:8088"',
+    // HOST: '"https://xlk.njyz.tech"',
+    HOST: '"http://127.0.0.1:8081"',
     WSS_HOST: '"wss://xlk.njyz.tech"',
     OSS_PATH: '"https://zhiyun-image.oss-accelerate.aliyuncs.com/"',
     OSS_FAST_PATH: '"https://zhiyun-image.oss-accelerate.aliyuncs.com/"',

src/components/Auth/AuthPhone.jsx

@@ -6,10 +6,15 @@ import useAuth from './useAuth'
 import './style.scss'
 
 export default (props) => {
-  const { onCancel = (x => x) } = props;
+  const {
+    consultant,
+    router,
+    page,
+    onCancel = (x => x),
+  } = props;
 
   const [loading, setLoading] = useState(false)
-  const { updatePhoneNumber } = useAuth()
+  const { updatePhoneNumber } = useAuth(consultant, router, page)
 
   const handlePhoneNumber = (detail) => {
     const { errMsg, ...data } = detail || {}

src/components/Auth/useAuth.js

@@ -5,7 +5,7 @@ import { dispatchUpdateUserInfo } from '@/actions/user'
 import { queryUserPhone } from '@/services/user'
 import { UPDATE_USER_INFO } from '@/constants/user'
 
-export default function useAuth() {
+export default function useAuth(consultant, router, page) {
   const dispatch = useDispatch()
 
   const updateUserInfo = useCallback((data) => {
@@ -24,8 +24,19 @@ export default function useAuth() {
   const updatePhoneNumber = useCallback((data) => {
     return new Promise((resolve, reject) => {
       const sessionKey = Taro.getStorageSync('sessionKey')
-      Object.assign(data, { sessionKey })
-      queryUserPhone(data).then((res) => {
+      const { id: targetId, recommender } = router.params
+      const buildingId = router.path.indexOf('pages/index/buildingInfo/index') > -1 ? targetId : undefined
+      const params = {
+        sessionKey,
+        sceneId: router.scene,
+        buildingId,
+        targetId,
+        targetType: page.type,
+        targetName: page.name,
+        promoter: recommender,
+        ...data,
+      }
+      queryUserPhone(params).then((res) => {
         dispatch({
           type: UPDATE_USER_INFO,
           payload: {
@@ -38,7 +49,7 @@ export default function useAuth() {
         reject(err)
       })
     })
-  }, [dispatch])
+  }, [dispatch, consultant, router, page])
 
   return { updateUserInfo, updatePhoneNumber }
 }

src/constants/api.js

@@ -10,7 +10,7 @@ export const wss_host = WSS_HOST
 
 export const pathname = '/api/wx'
 
-const resolvePath = api => `${host + pathname}/${api}`
+export const resolvePath = api => `${host + pathname}/${api}`
 
 // 特价房源
 export const API_SPECIAL_ROOM_LIST = resolvePath('buildingSpecialRoom') // 特价房源列表
@@ -145,8 +145,8 @@ export const API_INDEX_SHARE = resolvePath('main/share')
 
 export const API_ACTIVITY_FAVOR = resolvePath('activity/save')
 export const API_NEWS_FAVOR = resolvePath('news/save')
-export const API_CARD_FAVOR = resolvePath('card/save')
-export const API_PROJECT_FAVOR = resolvePath('project/save')
+export const API_CARD_FAVOR = resolvePath('consultant/save')
+export const API_PROJECT_FAVOR = resolvePath('building/save')
 
 // 埋点接口
 export const API_BURIED_POINT = resolvePath('taPersonVisitRecord')

src/layout/index.js

@@ -17,15 +17,14 @@ export default (ChildComponent) => (props) => {
   const { spinning, userInfo } = useSelector(s => s.user)
   const { person, ...extInfo } = userInfo || {}
   const router = useRouter()
+  const page = routes.filter((r) => (router.path.indexOf(r.page) > -1))[0]
   const [loading, setLoading] = useState(false)
-  const [authPhone, authAvatar] = useAuth(person)
+  const [authPhone, authAvatar] = useAuth(person, page)
 
-  
   // 主要用于埋点
   useEffect(() => {
-    const page = routes.filter((r) => (router.path.indexOf(r.page) > -1))[0]
     Taro.setStorage({ key: 'page', data: page })
-  }, [router.path])
+  }, [page])
 
   useEffect(() => {
     setLoading(!person || !person.personId)
@@ -43,7 +42,7 @@ export default (ChildComponent) => (props) => {
       </Overlay>
       <Overlay visible={authPhone} aligin='bottom'>
         <View className='auth-wrapper'>
-          <AuthPhone />
+          <AuthPhone consultant={consultant} router={router} page={page} />
         </View>
       </Overlay>
       <Overlay visible={!authPhone && authAvatar} aligin='bottom'>

src/layout/useAuth.js

@@ -1,17 +1,13 @@
 import { useState, useEffect } from 'react'
-import { useRouter } from '@tarojs/taro'
-import { routes } from '../routes'
 
-export default function useAuth(person) {
+export default function useAuth(person, page) {
   const [authPhone, setAuthPhone] = useState(false)
   const [authAvatar, setAuthAvatar] = useState(false)
-  const { path } = useRouter()
 
   useEffect(() => {
-    const current = routes.filter((route) => path.indexOf(route.page) > -1)[0]
-    if (current && current.auth && current.auth.length) {
+    if (page && page.auth && page.auth.length) {
       // 如果需要授权手机
-      if (current.auth.indexOf('phone') > -1) {
+      if (page.auth.indexOf('phone') > -1) {
         if (person.inited && !person.phone) {
           setAuthPhone(true)
         } else {
@@ -20,7 +16,7 @@ export default function useAuth(person) {
       }
 
       // 如果需要授权头像
-      if (current.auth.indexOf('avatar') > -1) {
+      if (page.auth.indexOf('avatar') > -1) {
         if (person.inited && (!person.avatarurl || person.avatarurl.indexOf('default_avatar') > -1)) {
           setAuthAvatar(true)
         } else {
@@ -31,7 +27,7 @@ export default function useAuth(person) {
       setAuthPhone(false)
       setAuthAvatar(false)
     }
-  }, [person, path])
+  }, [person, page])
 
   return [authPhone, authAvatar]
 }

src/pages/index/buildingDetail/components/BasicInfo/index.jsx

@@ -11,7 +11,7 @@ export default function BasicInfo (props) {
   const { Info = {} } = props
   const { buildingId, isSave } = Info
 
-  const [isSaved, handleFavor] = useFavor(isSave)
+  const [isSaved, handleFavor] = useFavor(isSave, { id: buildingId, buildingId, eventType: 'building' })
 
   const goto = (url) => Taro.navigateTo({ url })
 

src/pages/index/buildingDetail/components/LivingActivity/index.jsx

@@ -1,11 +1,22 @@
-
+import Taro from '@tarojs/taro'
 import { Image } from '@tarojs/components'
 import '@/assets/css/iconfont.css'
 import { getImgURL } from '@/utils/image'
 import './index.scss'
 
 export default function LivingActivity (props) {
-  const { List = [] } = props
+  const { Info = {} } = props
+  const List = Info?.liveActivityList || []
+
+  const gotoList = () => {
+    const buildingId = Info?.buildingId
+    Taro.switchTab({
+      url: `/pages/video/index?buildingId=${buildingId}`
+    })
+  }
+
+  const gotoDetail = () => {}
+
   return List.length > 0 ? (
     <view className='components LivingActivity'>
 
@@ -13,14 +24,14 @@ export default function LivingActivity (props) {
         <view className='flex-item'>
           <text>直播活动</text>
         </view>
-        <text>更多</text>
+        <text onClick={gotoList}>更多</text>
         <text className='iconfont icon-jiantouright'></text>
       </view>
 
       <view className='List flex-h'>
         {
           List.map((item, index) => (
-            <view className='flex-item' key={`ListItem-${index}`}>
+            <view className='flex-item' key={`ListItem-${index}`} onClick={() => gotoDetail(item)}>
               <view style={{display: item.listImg ? 'block' : 'none'}}>
                 <Image mode='aspectFill' src={getImgURL(item.listImg)} className='centerLabel'></Image>
               </view>

src/pages/index/buildingDetail/components/News/index.jsx

@@ -1,26 +1,54 @@
-
+import { useState, useEffect } from 'react'
+import Taro from '@tarojs/taro'
 import { Image } from '@tarojs/components'
 import { getImgURL } from '@/utils/image'
+import { fetch } from '@/utils/request'
+import { API_NEWS_LIST } from '@/constants/api'
 import '@/assets/css/iconfont.css'
 import './index.scss'
 
 export default function News (props) {
-  const { List = [] } = props
-  return List.length > 0 ? (
+  const { Info = {} } = props
+
+  const [NewsList, setNewsList] = useState([])
+
+  const gotoList = () => {
+    const buildingId = Info?.buildingId
+    Taro.navigateTo({
+      url: `/pages/index/newsList/index?buildingId=${buildingId}`
+    })
+  }
+
+  const gotoDetail = (item) => {
+    Taro.navigateTo({
+      url: `/pages/index/newsDetail/index?id=${item.newsId}`
+    })
+  }
+
+  useEffect(() => {
+    if (Info?.buildingId) {
+      // 获取资讯列表
+      fetch({ url: API_NEWS_LIST, payload: { buildingId: Info.buildingId, pageSize: 2, pageNum: 1 } }).then((res) => {
+        setNewsList(res.records || [])
+      })
+    }
+  }, [Info?.buildingId])
+
+  return NewsList.length > 0 ? (
     <view className='components News'>
 
       <view className='Title flex-h'>
         <view className='flex-item'>
           <text>新鲜资讯</text>
         </view>
-        <text>更多</text>
+        <text onClick={gotoList}>更多</text>
         <text className='iconfont icon-jiantouright'></text>
       </view>
 
       <view className='List flex-h'>
         {
-          List.map((item, index) => (
-            <view className='flex-item' key={`ListItem-${index}`}>
+          NewsList.map((item, index) => (
+            <view className='flex-item' key={`ListItem-${index}`} onClick={() => gotoDetail(item)}>
               <view className='Img' style={{display: item.newsImg || item.newsName ? 'block' : 'none'}}>
                 <Image mode='aspectFill' src={getImgURL(item.newsImg)} className='centerLabel'></Image>
               </view>

src/pages/index/buildingDetail/components/ProjectDynamic/index.jsx

@@ -1,4 +1,5 @@
 // import React, { useState, useEffect } from 'react'
+import Taro from '@tarojs/taro'
 import '@/assets/css/iconfont.css'
 import './index.scss'
 
@@ -7,6 +8,12 @@ export default function ProjectDynamic (props) {
 
   const info = List[0]
 
+  const handleClick = () => {
+    Taro.navigateTo({
+      url: `/pages/index/buildingDynamic/index?id=${info.buildingId}`
+    })
+  }
+
   return info ? (
     <view className='components ProjectDynamic'>
 
@@ -14,11 +21,11 @@ export default function ProjectDynamic (props) {
         <view className='flex-item'>
           <text>项目动态</text>
         </view>
-        <text>更多</text>
+        <text onClick={handleClick}>更多</text>
         <text className='iconfont icon-jiantouright'></text>
       </view>
 
-      <view className='Info'>
+      <view className='Info' onClick={handleClick}>
         <text className='Time'>{info.trendTime}</text>
         <text className='Title'>{info.trendTitle}</text>
         <text className='Desc'>{info.trendContent}</text>

src/pages/index/buildingDetail/index.jsx

@@ -1,10 +1,10 @@
-import { useState, useEffect, useMemo, useRef } from 'react'
+import { useState, useEffect } from 'react'
 import withLayout from '@/layout'
 import { ScrollView } from '@tarojs/components'
 import Disclaimer from '@/components/Disclaimer'
 import Poster from '@/components/Poster'
 import { fetch } from '@/utils/request'
-import { API_ITEMS_DETAIL, API_NEWS_LIST } from '@/constants/api'
+import { API_ITEMS_DETAIL } from '@/constants/api'
 import DetailBottom from './components/DetailBottom/index'
 import BuildingDetailBanner from './components/BuildingDetailBanner/index'
 import BasicInfo from './components/BasicInfo/index'
@@ -30,7 +30,6 @@ export default withLayout((props) => {
   const [showPoster, setShowPoster] = useState(false)
   const [DetailInfo, setDetailInfo] = useState({})
   const [PictureList, setPictureList] = useState([])
-  const [NewsList, setNewsList] = useState([])
 
   // 本页面分享或者海报参数
   const paramsRef = useParams(person, DetailInfo)
@@ -55,10 +54,6 @@ export default withLayout((props) => {
       console.error(err)
     })
 
-    // 获取资讯列表
-    fetch({ url: API_NEWS_LIST, payload: { buildingId: id, pageSize: 2, pageNum: 1 } }).then((res) => {
-      setNewsList(res.records || [])
-    })
   }, [id, router.path])
 
   return (
@@ -117,12 +112,12 @@ export default withLayout((props) => {
 
                 {/* 直播活动 */}
                 <view className='LivingActivity' style={{minHeight: 0}}>
-                  <LivingActivity List={DetailInfo?.liveActivityList}></LivingActivity>
+                  <LivingActivity Info={DetailInfo}></LivingActivity>
                 </view>
 
                 {/* 新鲜资讯 */}
                 <view className='News' style={{minHeight: 0}}>
-                  <News List={NewsList}></News>
+                  <News Info={DetailInfo}></News>
                 </view>
 
                 {/* 相册 */}

src/utils/hooks/useFavor.js

@@ -1,15 +1,21 @@
 import { useEffect, useState } from 'react'
 import Taro from '@tarojs/taro'
-import { favorProject, cancelFavorProject } from '@/services/item'
+import { fetch } from '@/utils/request'
+import { resolvePath } from '@/constants/api'
+import track from '@/utils/tracking/track'
 
-export default function(eventType, saved) {
+const addFavor = (type, id) => fetch({ url: resolvePath(`${type}/save/${id}`),  method: 'POST' })
+const cancelFavor = (type, id) => fetch({ url: resolvePath(`${type}/save/${id}`),  method: 'POST' })
+
+export default function(saved, options = {}) {
+  const { id, eventType } = options
   const [isSaved, setIsSaved] = useState(saved)
 
   useEffect(() => setIsSaved(saved), [saved])
 
-  const handleSave = (buildingId) => {
+  const handleSave = () => {
     if (isSaved) {
-      cancelFavorProject(buildingId).then(() => {
+      cancelFavor(eventType, id).then(() => {
         setIsSaved(false)
         Taro.showToast({
           title: '已取消收藏',
@@ -17,7 +23,7 @@ export default function(eventType, saved) {
         })
       })
     } else {
-      favorProject(buildingId).then(() => {
+      addFavor(eventType, id).then(() => {
         setIsSaved(true)
         Taro.showToast({
           title: '收藏成功',
@@ -25,18 +31,11 @@ export default function(eventType, saved) {
         })
       })
     }
-    // savePoint({
-    //   event: 'save',
-    //   eventType: type,
-    //   propertyName: '项目收藏',
-    //   data: '{}'
-    // })
+    track({
+      event: 'save',
+      ...options,
+    })
   }
 
-  switch (eventType) {
-    case 'building':
-      return [isSaved, handleSave];
-    default:
-      return [];
-  }
+  return [isSaved, handleSave];
 }

src/utils/tracking/share.js

@@ -1,5 +1,5 @@
 import Taro from '@tarojs/taro'
-import { savePoint } from '@/services/common'
+import track from './track'
 import addNum from './addNum'
 
 export default (options) => {
@@ -7,25 +7,13 @@ export default (options) => {
   if (!page) return;
 
   const { name: propertyName, type: eventType } = page
-  const {
-    event = 'share',
-    // eventType = '',
-    // propertyName = '',
-    consultantId = '',
-    sharePersonId = '',
-    targetId = '',
-    buildingId = '',
-  } = options
+  addNum({ eventType, targetId: options.targetId })
 
-  addNum({ eventType, targetId })
-  savePoint({
-    event,
+  track({
+    event: 'share',
     eventType,
     propertyName,
-    consultantId,
-    sharePersonId,
-    targetId,
-    buildingId,
     data: '{}',
+    ...options,
   })
 }

src/utils/tracking/track.js

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