Merge branch 'main' of http://git.ycjcjy.com/marketing/miniapp into main

config/dev.js

@@ -4,7 +4,7 @@ module.exports = {
   },
   defineConstants: {
     HOST: '"https://xlk.njyz.tech"',
-    // HOST: '"http://127.0.0.1:8088"',
+    // 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/"',

config/index.js

@@ -28,6 +28,7 @@ const config = {
   },
   copy: {
     patterns: [
+      { from: 'src/native/', to: 'dist/native/' },
     ],
     options: {
     }

src/app.jsx

@@ -5,19 +5,26 @@ import { getLocation, getRouterParams } from '@/utils/tools'
 import login from '@/utils/login'
 import im from '@/utils/im'
 import store from './store'
+import trackUserSource from '@/utils/tracking/userSource'
 
 import './app.scss'
 
 class App extends Component {
+  // 更新埋点
+  updateTracking;
 
   componentDidMount () {}
 
   componentDidShow (options) {
     // 保留初始场景
     Taro.setStorage({ key: 'scene', data: options.scene })
+    // 埋点
+    trackUserSource(options).then((res) => (this.updateTracking = res))
   }
 
-  componentDidHide () {}
+  componentDidHide () {
+    this.updateTracking()
+  }
 
   componentDidCatchError () {}
 

src/assets/css/iconfont.json

@@ -1,6 +1,6 @@
 {
   "id": "2603904",
-  "name": "新联康",
+  "name": "新联家",
   "font_family": "iconfont",
   "css_prefix_text": "icon-",
   "description": "",

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/components/Poster/index.jsx

@@ -85,8 +85,10 @@ export default (props) => {
   }
 
   return (
-    <Modal title={title} visible={show} onClose={onClose}>
-      <View className='modal-poster'>
+    // <Modal title={title} visible={show} onClose={onClose}>
+    // eslint-disable-next-line react/jsx-no-undef
+    <page-container show={show} position='bottom' onClickOverlay={onClose}>
+      <View className='modal-poster' onClick={onClose}>
         <View className='modal-poster-img-box'>
         {
           !processing
@@ -99,6 +101,6 @@ export default (props) => {
         </Button>
       </View>
       <Poster dataSource={dataSource} onStart={() => setProcessing(true)} onEnd={handlePoster} />
-    </Modal>
+    </page-container>
   )
 }

src/components/Poster/style.scss

@@ -1,6 +1,7 @@
 .modal-poster {
   width: 100vw;
-  height: calc(100vh - 62rpx);
+  height: 100vh;
+  // height: calc(100vh - 62rpx);
   box-sizing: border-box;
   padding: 40rpx;
 
@@ -31,4 +32,9 @@
     font-weight: 600;
     line-height: 90rpx;
   }
-}
+}
+
+page-container {
+  position: fixed;
+  z-index: 1000;
+}

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

@@ -7,6 +7,7 @@ import Loading from '@/components/Loading'
 import AuthAvatar from '@/components/Auth/AuthAvatar'
 import AuthPhone from '@/components/Auth/AuthPhone'
 import Spin from '@/components/Spin/Spin2'
+import { ROLE_CODE } from '@/constants/user'
 import useAuth from './useAuth'
 import { routes } from '../routes'
 
@@ -17,15 +18,41 @@ 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)
+
+  const { id } = router.params
+
+  // 页面分享
+  const [shareContent, setShareContent] = useState({})
+  // 页面埋点
+  const [trackData, setTrackData] = useState({})
+
+  // 请求埋点设置
+  useEffect(() => {
+    if (id) {
+      setShareContent({})
+    }
+  } ,[id, page.type])
+
+  // 埋点数据
+  useEffect(() => {
+    const consultantId = person?.personType === ROLE_CODE.CONSULTANT ? person.personId : undefined
+
+    setTrackData({
+      eventType: page.type,
+      propertyName: page.name,
+      consultantId,
+      sharePersonId: person?.personId,
+      targetId: id,
+    })
+  }, [person, page, id])
 
-  
   // 主要用于埋点
   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 +70,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'>
@@ -58,6 +85,9 @@ export default (ChildComponent) => (props) => {
             person={person}
             router={router}
             consultant={consultant}
+            page={page}
+            shareContent={shareContent}
+            trackData={trackData}
             {...props}
             {...extInfo}
         />

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/native/PageContainer/index.js

@@ -0,0 +1,66 @@
+Component({
+  properties: {
+    show: {
+      type: Boolean,
+      value: false,
+    },
+    position: {
+      type: String,
+      value: 'right',
+    },
+    duration: {
+      type: Number,
+      value: 300,
+    },
+    round: {
+      type: Boolean,
+      value: false,
+    },
+    overlay: {
+      type: Boolean,
+      value: true,
+    },
+    height: {
+      type: String,
+      value: '100%',
+      observer: function(val) {
+        const h = val || '100%'
+        const customStyle = 'height: '+ h +';'
+        this.setData({ customStyle })
+      }
+    },
+    overlayColor: {
+      type: String,
+      value: 'black',
+      observer: function(val) {
+        let overlayStyle = ''
+        switch(val) {
+          case 'white':
+            overlayStyle = 'background-color: rgba(255, 255, 255, 0.7)'
+            break
+          case 'blur':
+            overlayStyle = 'background-color: rgba(0, 0, 0, 0.7); filter: blur(4px);'
+            break
+          default:
+            overlayStyle = 'background-color: rgba(0, 0, 0, 0.7)'
+        }
+        this.setData({ overlayStyle })
+      }
+    }
+  },
+  data: {
+    customStyle: '',
+    overlayStyle: ''
+  },
+  methods: {
+    onBeforeEnter(e) {},
+    onEnter(e) {},
+    onAfterEnter(e) {},
+    onBeforeLeave(e) {},
+    onLeave(e) {},
+    onAfterLeave(e) {},
+    onClickOverlay(e) {
+      this.triggerEvent('clickOverlay', e)
+    }
+  }
+})

src/native/PageContainer/index.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

src/native/PageContainer/index.wxml

@@ -0,0 +1,19 @@
+<page-container 
+  show="{{show}}"
+  round="{{round}}"
+  overlay="{{overlay}}"
+  duration="{{duration}}"
+  position="{{position}}"
+  close-on-slide-down="{{false}}"
+  bindbeforeenter="onBeforeEnter"
+  bindenter="onEnter"
+  bindafterenter="onAfterEnter"
+  bindbeforeleave="onBeforeLeave"
+  bindleave="onLeave"
+  bindafterleave="onAfterLeave"
+  bindclickoverlay="onClickOverlay"
+  custom-style="{{customStyle}}"
+  overlay-style="{{overlayStyle}}"
+>
+  <slot></slot>
+</page-container>

src/pages/index/activityDetail/index.jsx

@@ -1,5 +1,5 @@
 import { useState, useEffect } from "react";
-import Taro, { useDidShow, useReady } from "@tarojs/taro";
+import Taro from "@tarojs/taro";
 import withLayout from "@/layout";
 import {
   ScrollView,
@@ -11,12 +11,13 @@ import Disclaimer from '@/components/Disclaimer'
 import {
   // addActivityShareNum,
   signupActivity,
-  favorActivity,
-  cancelFavorActivity,
   queryActivityDetail,
 } from "@/services/activity";
 import { getImgURL } from "@/utils/image";
 import getDateFormat from "@/utils/chatDate";
+import useParams from '@/utils/hooks/useParams'
+import useShare from '@/utils/hooks/useShare'
+import useFavor from '@/utils/hooks/useFavor'
 
 import "./index.scss";
 
@@ -40,29 +41,10 @@ const activityStatusDict = {
 };
 
 export default withLayout((props) => {
-  const { id } = props.router.params;
+  const { router, shareContent, trackData, person, page } = props
+  const { id } = router.params;
   const [detail, setDetail] = useState();
-  const [canChoose, setCanChoose] = useState("none");
-
-  const [IsPull, setPull] = useState(false);
-  const [PullTimer, setPullTimer] = useState(null);
-
-  const PageRefresh = () => {
-    // 页面下拉刷新回调
-    setPull(true);
-  };
-
-  useEffect(() => {
-    // 下拉刷新触发
-    if (IsPull) {
-      clearTimeout(PullTimer);
-      setPullTimer(
-        setTimeout(() => {
-          setPull(false);
-        }, 2000)
-      );
-    }
-  }, [IsPull]);
+  const buildingId = detail?.buildingId
 
   const getDetail = (params) => {
     Taro.showLoading();
@@ -75,59 +57,28 @@ export default withLayout((props) => {
     });
   };
 
+  // 本页面分享或者海报参数
+  const paramsRef = useParams({id, buildingId, person, from: `${page.type}_share`})
+
+  const fullTrackData = { ...trackData, buildingId }
+  
+  const [isSaved, handleFavor] = useFavor(detail?.isSaved, { id, buildingId, ...trackData })
+
+  useShare(
+    {
+      title: shareContent.shareContentTitle || detail?.title,
+      path: `${router.path}?${paramsRef.current}`,
+      image: shareContent.shareContentImg || getImgURL(detail?.imgUrl),
+    },
+    fullTrackData,
+  )
+
   useEffect(() => {
     if (id) {
       getDetail(id);
     }
   }, [id]);
 
-  useReady(() => {
-    console.log("Taro.showLoading()");
-  });
-
-  useDidShow(() => {
-    // Taro.getCurrentPages()
-    console.log("Taro.showLoading()");
-
-    // console.log(Taro.getCurrentPages(),'Taro.showLoading()')
-    // getDetail()
-  });
-
-  //收藏
-  const handleFavo = () => {
-    const { dynamicId, isSaved } = detail;
-    if (isSaved) {
-      cancelFavorActivity(dynamicId).then((res) => {
-        Taro.showToast({
-          title: "已取消收藏",
-        });
-        setDetail({
-          ...detail,
-          isSaved: 0,
-        });
-      });
-    } else {
-      favorActivity(dynamicId).then((res) => {
-        Taro.showToast({
-          title: "收藏成功",
-        });
-        setDetail({
-          ...detail,
-          isSaved: 1,
-        });
-      });
-    }
-    // savePoint({
-    //   event: 'save',
-    //   eventType: 'activity',
-    //   targetType: 'dynamic',
-    //   propertyName: '活动详情收藏',
-    //   data: '{}'
-    // }).then(res => {
-    //   console.log('活动详情收藏')
-    // })
-  };
-
   const handleSignup = () => {
     const {
       detail: { buildingId, dynamicId, isSign },
@@ -152,116 +103,106 @@ export default withLayout((props) => {
   };
 
   return <>
-  {
- detail && (
-  <view className="Page activityDetail flex-v">
-    <view className="flex-item">
-      <view>
-        <ScrollView
-          scroll-y
-          refresher-enabled
-          refresher-triggered={IsPull}
-          onrefresherrefresh={PageRefresh}
-          refresher-background="#fff"
-        >
-          <view className="PageContent">
-            <view className="Top">
-              <Image
-                mode="aspectFill"
-                src={getImgURL(detail.bannerListImg)}
-                className="centerLabel"
-              ></Image>
-            </view>
+  { detail && (
+    <view className="Page activityDetail flex-v">
+      <view className="flex-item">
+        <view>
+          <ScrollView scroll-y>
+            <view className="PageContent">
+              <view className="Top">
+                <Image
+                  mode="aspectFill"
+                  src={getImgURL(detail.bannerListImg)}
+                  className="centerLabel"
+                ></Image>
+              </view>
 
-            <view className="Info">
-              <view>
-                <view className="Title flex-h">
-                  <view className="flex-item">
-                    <text>{detail.title}</text>
+              <view className="Info">
+                <view>
+                  <view className="Title flex-h">
+                    <view className="flex-item">
+                      <text>{detail.title}</text>
+                    </view>
+                    <text className="Tips">
+                      {detail.enlisted || 0}人已报名
+                    </text>
                   </view>
-                  <text className="Tips">
-                    {detail.enlisted || 0}人已报名
+                  <text className="Time">
+                    报名截止时间：
+                    {getDateFormat(
+                      new Date(detail.enlistEnd).valueOf(),
+                      true,
+                      "yyyy/M/d"
+                    )}
                   </text>
-                </view>
-                <text className="Time">
-                  报名截止时间：
-                  {getDateFormat(
-                    new Date(detail.enlistEnd).valueOf(),
-                    true,
-                    "yyyy/M/d"
-                  )}
-                </text>
-                {/* <text className="Name">“香颂 · 蔚澜半岛”</text> */}
-                <view className="flex-h Address">
-                  <text>地址：</text>
-                  <view className="flex-item">
-                    <text>{detail.address}</text>
+                  {/* <text className="Name">“香颂 · 蔚澜半岛”</text> */}
+                  <view className="flex-h Address">
+                    <text>地址：</text>
+                    <view className="flex-item">
+                      <text>{detail.address}</text>
+                    </view>
                   </view>
-                </view>
-                <view className="flex-h Date">
-                  <text>时间：</text>
-                  <view className="flex-item">
-                    <text>
-                      {getDateFormat(
-                        new Date(detail.startDate).valueOf(),
-                        true,
-                        "yyyy/M/d"
-                      )}{" "}
-                      -{" "}
-                      {getDateFormat(
-                        new Date(detail.endDate).valueOf(),
-                        true,
-                        "yyyy/M/d"
-                      )}
-                    </text>
+                  <view className="flex-h Date">
+                    <text>时间：</text>
+                    <view className="flex-item">
+                      <text>
+                        {getDateFormat(
+                          new Date(detail.startDate).valueOf(),
+                          true,
+                          "yyyy/M/d"
+                        )}{" "}
+                        -{" "}
+                        {getDateFormat(
+                          new Date(detail.endDate).valueOf(),
+                          true,
+                          "yyyy/M/d"
+                        )}
+                      </text>
+                    </view>
+                  </view>
+                  <view className="Btn">
+                    <text>分享好友</text>
                   </view>
-                </view>
-                <view className="Btn">
-                  <text>分享好友</text>
                 </view>
               </view>
-            </view>
 
-            <view className="ActivityIntro">
-              <view className="Title">
-                <text>活动介绍</text>
+              <view className="ActivityIntro">
+                <view className="Title">
+                  <text>活动介绍</text>
+                </view>
+                <Image
+                  mode="aspectFill"
+                  src={getImgURL(detail.imgUrl)}
+                  className="img"
+                ></Image>
+                <RichText nodes={detail.desc} />
+                {/* <richText nodes={detail.desc} ></richText> */}
               </view>
-              <Image
-                mode="aspectFill"
-                src={getImgURL(detail.imgUrl)}
-                className="img"
-              ></Image>
-              <RichText nodes={detail.desc} />
-              {/* <richText nodes={detail.desc} ></richText> */}
-            </view>
 
-            <Disclaimer />
-          </view>
-        </ScrollView>
-      </view>
-    </view>
-    <view className="PageBottom flex-h">
-      <view className="Share">
-        <text className="iconfont icon-fenxiang"></text>
-        <text>分享</text>
+              <Disclaimer />
+            </view>
+          </ScrollView>
+        </view>
       </view>
-      <view className="Collect" onClick={handleFavo}>
-        <text
-          className="iconfont icon-shoucang"
-          style={detail.isSaved === 1 ? { color: "red" } : undefined}
-        ></text>
-        <text>收藏</text>
+      <view className="PageBottom flex-h">
+        <view className="Share">
+          <text className="iconfont icon-fenxiang"></text>
+          <text>分享</text>
+        </view>
+        <view className="Collect" onClick={handleFavor}>
+          <text
+            className="iconfont icon-shoucang"
+            style={isSaved ? { color: "red" } : undefined}
+          ></text>
+          <text>收藏</text>
+        </view>
+        <view className="flex-item"></view>
+
+        <text className="Post" onClick={handleSignup}>
+          {activityStatusDict[detail.activityStatus]?.text}
+        </text>
       </view>
-      <view className="flex-item"></view>
-
-      <text className="Post" onClick={handleSignup}>
-        {activityStatusDict[detail.activityStatus]?.text}
-      </text>
     </view>
-  </view>
-)
-  }
-    </>
-   
-  
+  )}
+  </>
 });

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

@@ -4,14 +4,14 @@ import { getImgURL } from '@/utils/image'
 import './index.scss'
 
 export default function Banner (props) {
-  const { List = [] } = props
+  const { List, onClick } = props
   return (
     <view className='components Banner'>
       <Swiper autoplay interval={2000} indicator-dots>
         {
-          List.map((item, index) => (
+          (List||[]).map((item, index) => (
             <SwiperItem key={`Banner-${index}`}>
-              <view className='swiper-item'>
+              <view className='swiper-item' onClick={() => onClick(item, List)}>
                 <Image mode='aspectFill' className='centerLabel' src={getImgURL(item.image || item.coverImg || item.url || item.img)} />
               </view>
             </SwiperItem>

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

@@ -8,10 +8,10 @@ import './index.scss'
 
 
 export default function BasicInfo (props) {
-  const { Info = {} } = props
+  const { Info = {}, trackData } = props
   const { buildingId, isSave } = Info
 
-  const [isSaved, handleFavor] = useFavor(isSave)
+  const [isSaved, handleFavor] = useFavor(isSave, { id: buildingId, buildingId, ...trackData })
 
   const goto = (url) => Taro.navigateTo({ url })
 
@@ -23,7 +23,7 @@ export default function BasicInfo (props) {
         <view className='flex-item'>
           <text>{Info.buildingName}</text>
         </view>
-        <view className='Collect' onClick={() => handleFavor(buildingId)}>
+        <view className='Collect' onClick={handleFavor}>
           <text className={classNames(['iconfont icon-shoucang'], { active: isSaved })}></text>
           <text>{isSaved ? '取消收藏' : '收藏'}</text>
         </view>

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

@@ -1,10 +1,24 @@
 import { useState } from 'react'
-import { Swiper, SwiperItem, Image } from '@tarojs/components'
+import Taro from '@tarojs/taro'
+import { Video } from '@tarojs/components'
 import { getImgURL } from '@/utils/image'
+import Banner from '../Banner'
 import './index.scss'
 
+const getImage = item => getImgURL(item.image || item.coverImg || item.url || item.img)
+
 export default function BuildingDetailBanner (props) {
-  const { PictureList = [{}, {}, {}] } = props
+  const { Info } = props
+  const { buildingImg, panoramaList, videoUrl, videoImage } = Info || {}
+  const videoPoster = videoImage ? videoImage[0] : undefined
+
+  const showPicBtn = buildingImg && buildingImg.length > 0
+  const showVRBtn = panoramaList && panoramaList.length > 0
+  const shwoVideoBtn = !!videoUrl
+
+  // JS 中 true + true = 2
+  const showBtns = (showPicBtn + showVRBtn + shwoVideoBtn) > 1
+
   const [NavList] = useState([
     { name: 'VR', id: 1 },
     { name: '视频', id: 2 },
@@ -18,33 +32,63 @@ export default function BuildingDetailBanner (props) {
     }
   }
 
+  const handlePreview = (item, all) => {
+    const img = getImage(item)
+    if (!img) return
+
+    Taro.previewImage({
+      current: img,
+      urls: all.map(getImage),
+    })
+  }
+
+  const handleVR = (item) => {
+    const url = (item || {}).panoramaLink
+    if (!url) return
+
+    Taro.navigateTo({
+      url: `/pages/index/webview/index?url=${encodeURIComponent(url)}`
+    })
+  }
+
   return (
     <view className='components buildingDetailBanner'>
 
       {/* 切换 */}
-      <view className='CutPoint'>
-        <view>
-          {
-            NavList.map((item, index) => (
-              <text key={`NavItem-${index}`} className={CurrentNavId === item.id ? 'active' : ''} onClick={CutNavId(item.id)}>{item.name}</text>
-            ))
-          }
-        </view>
-      </view>
+      {
+        showBtns && (
+          <view className='CutPoint'>
+            <view>
+              {
+                NavList.map((item, index) => (
+                  <text key={`NavItem-${index}`} className={CurrentNavId === item.id ? 'active' : ''} onClick={CutNavId(item.id)}>{item.name}</text>
+                ))
+              }
+            </view>
+          </view>
+        )
+      }
 
       {/* VR */}
       {
-        CurrentNavId === 1 &&
-        <view className='Vr'>
-
-        </view>
+        CurrentNavId === 1 && (
+          <view className='Vr'>
+            <Banner List={panoramaList} onClick={handleVR} />
+          </view>
+        )
       }
 
       {/* 视频 */}
       {
         CurrentNavId === 2 &&
         <view className='Video'>
-
+          <Video
+            controls
+            showMuteBtn
+            src={videoUrl}
+            poster={getImgURL(videoPoster)}
+            style={{ height: '600rpx', width: '750rpx' }}
+          />
         </view>
       }
 
@@ -52,17 +96,7 @@ export default function BuildingDetailBanner (props) {
       {
         CurrentNavId === 3 &&
         <view className='Picture'>
-          <Swiper autoplay interval={2000} indicator-dots>
-            {
-              PictureList.map((item, index) => (
-                <SwiperItem key={`Banner-${index}`}>
-                  <view className='swiper-item'>
-                    <Image mode='aspectFill' className='centerLabel' src={getImgURL(item.image || item.coverImg || item.url || item.img) || null} />
-                  </view>
-                </SwiperItem>
-              ))
-            }
-          </Swiper>
+          <Banner List={buildingImg} onClick={handlePreview} />
         </view>
       }
 

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

@@ -3,17 +3,17 @@ import Taro from '@tarojs/taro'
 import { useSelector } from 'react-redux'
 import { Image } from '@tarojs/components'
 import AuthRole from '@/components/auth/AuthRole'
-import Poster from '@/components/Poster'
+// import Poster from '@/components/Poster'
 import { queryActivityList } from '@/services/activity'
 import { ROLE_CODE } from '@/constants/user'
 import './index.scss'
 
 export default function DetailBottom (props) {
-  const { Info = {}, poster } = props
+  const { Info = {}, onPoster } = props
 
   // 当前推荐置业
   const { consultant } = useSelector(s => s.system)
-  const [showPoster, setShowPoster] = useState(false)
+  // const [showPoster, setShowPoster] = useState(false)
   const [actList, setActList] = useState([])
 
   const handleCall = () => {
@@ -71,7 +71,7 @@ export default function DetailBottom (props) {
     <view>
       <view className='components DetailBottom flex-h'>
         <view className='flex-item'>
-          <view className='Item' onClick={() => setShowPoster(true)}>
+          <view className='Item' onClick={onPoster}>
             <Image mode='heightFix' src={require('@/assets/buildingDetail-icon3.png')}></Image>
             <text>一键海报</text>
           </view>
@@ -106,12 +106,12 @@ export default function DetailBottom (props) {
         </view>
       </view>
 
-      <Poster
+      {/* <Poster
         show={showPoster}
         dataSource={poster}
         onClose={() => setShowPoster(false)}
         onSuccess={() => setShowPoster(false)}
-      />
+      /> */}
     </view>
   )
 }

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/hooks/useBuildingPoster.js

@@ -1,23 +0,0 @@
-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

@@ -1,32 +0,0 @@
-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/index.config.js

@@ -1,4 +1,7 @@
 export default {
   navigationBarTitleText: '楼盘详情',
   enableShareAppMessage: true,
+  usingComponents: {
+    'page-container': '/native/PageContainer/index'
+  }
 }

src/pages/index/buildingDetail/index.jsx

@@ -1,10 +1,13 @@
-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 useConsultant from '@/utils/hooks/useConsultant'
+import { API_ITEMS_DETAIL } from '@/constants/api'
+import useParams from '@/utils/hooks/useParams'
+import useShare from '@/utils/hooks/useShare'
+import usePoster from '@/utils/hooks/usePoster'
 import DetailBottom from './components/DetailBottom/index'
 import BuildingDetailBanner from './components/BuildingDetailBanner/index'
 import BasicInfo from './components/BasicInfo/index'
@@ -17,28 +20,33 @@ 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'
 
 export default withLayout((props) => {
-  const { router, person } = props
+  const { router, person, shareContent, trackData, page } = props
   const { id } = router.params
 
+  const [showPoster, setShowPoster] = useState(false)
   const [DetailInfo, setDetailInfo] = useState({})
   const [PictureList, setPictureList] = useState([])
-  const [NewsList, setNewsList] = useState([])
 
   // 本页面分享或者海报参数
-  const paramsRef = useParams(person, DetailInfo)
+  const paramsRef = useParams({id, buildingId: id, person, from: `${page.type}_share`})
+
+  const fullTrackData = { ...trackData, buildingId: id }
 
   // 分享
-  useBuildingShare(person, DetailInfo, router, paramsRef)
+  useShare({
+      title: shareContent.shareContentTitle || DetailInfo?.buildingName,
+      path: `${router.path}?${paramsRef.current}`,
+      image: shareContent.shareContentImg,
+    },
+    fullTrackData,
+  )
 
   // 海报
-  const posterData = useBuildingPoster(person, router, DetailInfo?.poster, paramsRef)
+  const posterData = usePoster(person, DetailInfo?.poster, router, paramsRef)
 
   useEffect(() => {
     // 获取楼盘信息
@@ -54,10 +62,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 (
@@ -71,7 +75,7 @@ export default withLayout((props) => {
               <view className='BannerContainer'>
                 <view>
                   <view>
-                    <BuildingDetailBanner></BuildingDetailBanner>
+                    <BuildingDetailBanner Info={DetailInfo}></BuildingDetailBanner>
                   </view>
                 </view>
               </view>
@@ -81,7 +85,7 @@ export default withLayout((props) => {
 
                 {/* 基本信息 */}
                 <view className='BasicInfo'>
-                  <BasicInfo Info={DetailInfo}></BasicInfo>
+                  <BasicInfo Info={DetailInfo} trackData={fullTrackData}></BasicInfo>
                 </view>
 
                 {/* 特价房源 */}
@@ -116,12 +120,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>
 
                 {/* 相册 */}
@@ -139,8 +143,15 @@ export default withLayout((props) => {
       </view>
 
       <view className='PageBottom'>
-        <DetailBottom Info={DetailInfo} poster={posterData}></DetailBottom>
+        <DetailBottom Info={DetailInfo} onPoster={() => setShowPoster(true)}></DetailBottom>
       </view>
+
+      <Poster
+        show={showPoster}
+        dataSource={posterData}
+        onClose={() => setShowPoster(false)}
+        onSuccess={() => setShowPoster(false)}
+      />
     </view>
   )
 })

src/pages/index/index.config.js

@@ -1,3 +1,3 @@
 export default {
-  navigationBarTitleText: '新联康'
+  navigationBarTitleText: '新联家'
 }

src/pages/index/webview/index.config.js

@@ -0,0 +1,3 @@
+export default {
+  navigationBarTitleText: '新联家全景'
+}

src/pages/index/webview/index.jsx

@@ -0,0 +1,19 @@
+import React, { useEffect } from 'react'
+import Taro from '@tarojs/taro'
+import withLayout from '@/layout'
+import { WebView } from '@tarojs/components'
+
+export default withLayout((props) => {
+  const { router } = props
+  const { url, title } = router.params
+
+  useEffect(() => {
+    if (title) {
+      Taro.setNavigationBarTitle({ title: decodeURIComponent(title) })
+    }
+  }, [title])
+
+  return (
+    <WebView url={decodeURIComponent(url)} />
+  )
+})

src/routes.js

@@ -357,6 +357,12 @@ const routes = [
     pkg: 'main',
     type: 'mine',
   },
+  {
+    name: '全景图',
+    page: 'pages/index/webview/index',
+    pkg: 'main',
+    type: 'other',
+  },
 
 ]
 

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/pages/index/buildingDetail/hooks/useParams.js → src/utils/hooks/useParams.js

@@ -1,20 +1,24 @@
+/**
+ * 用来构造分享的参数, 比如分享，海报等等
+ */
+
 import { useRef, useMemo } from 'react'
 import { ROLE_CODE } from '@/constants/user'
 
-export default function useParams(person, buildingInfo) {  
-
+export default function useParams({id, buildingId, person, from}) {
   // 判断当前人员是否置业顾问
   const consultant = person.personType === ROLE_CODE.CONSULTANT ? { id: person.personId } : {}
 
   const paramsRef = useRef()
   paramsRef.current = useMemo(() => {
     return [
-      `id=${buildingInfo?.buildingId}`,
-      `from=building_share`,
+      `id=${id}`,
+      `from=${from}`,
       `recommender=${person.personId}`,
+      buildingId ? `buildingId=${buildingId}` : undefined,
       consultant.id ? `consultant=${consultant.id}` : undefined,
     ].filter(Boolean).join('&')
-  }, [buildingInfo?.buildingId, person.personId, consultant.id])
+  }, [id, buildingId, from, person.personId, consultant.id])
 
   return paramsRef
 }

src/utils/hooks/usePoster.js

@@ -0,0 +1,25 @@
+import { useEffect, useState } from 'react'
+import { getMiniQrcode } from '@/services/common'
+
+export default function usePoster(person, poster, router, paramsRef) {
+  const [posterData, setPosterData] = useState()
+
+  useEffect(() => {
+    if (poster) {
+      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/utils/hooks/useShare.js

@@ -1,27 +1,36 @@
-import React, { useState } from 'react'
+import React, { useRef } from 'react'
 import Taro, { useShareAppMessage } from '@tarojs/taro'
-import { shareTracking } from '@/utils/tracking'
+import shareTracking from '@/utils/tracking/share'
+
+export default function useShare(shareContent, trackData) {
+  const shareRef = useRef()
+  const trackRef = useRef()
+
+  shareRef.current = shareContent
+  trackRef.current = trackData
 
-export default function useShare(shareRef, trackRef) {
   useShareAppMessage((res) => {
     const {
-      title = '',
-      path = '',
-      image = '',
+      title,
+      path,
+      image,
     } = shareRef.current || {}
 
     const {
-      // event = 'share',
-      // eventType = '',
-      // propertyName = '',
-      consultantId = '',
-      sharePersonId = '',
-      targetId = '',
-      buildingId = '',
+      event = 'share',
+      eventType,
+      propertyName,
+      consultantId,
+      sharePersonId,
+      targetId,
+      buildingId,
     } = trackRef.current || {}
 
     // 分享埋点
     shareTracking({
+      event,
+      eventType,
+      propertyName,
       consultantId,
       sharePersonId,
       targetId,

src/utils/tracking/addNum.js

@@ -51,6 +51,6 @@ export default function addNum({ targetId, eventType }) {
     //     addHFiveShareNum(targetId)
     //     break;
     default:
-        return
+      return
   }
 }

src/utils/tracking/share.js

@@ -0,0 +1,19 @@
+import Taro from '@tarojs/taro'
+import track from './track'
+import addNum from './addNum'
+
+export default (options) => {
+  const page = Taro.getStorageSync('page')
+  if (!page) return;
+
+  const { name: propertyName, type: eventType } = page
+  addNum({ eventType, targetId: options.targetId })
+
+  track({
+    event: 'share',
+    eventType,
+    propertyName,
+    data: '{}',
+    ...options,
+  })
+}

src/utils/tracking/track.js

@@ -0,0 +1,24 @@
+import { savePoint } from '@/services/common'
+
+export default (options) => {
+  const {
+    event = '',
+    eventType = '',
+    propertyName = '',
+    consultantId = '',
+    sharePersonId = '',
+    targetId = '',
+    buildingId = '',
+  } = options
+
+  savePoint({
+    event,
+    eventType,
+    propertyName,
+    consultantId,
+    sharePersonId,
+    targetId,
+    buildingId,
+    data: '{}',
+  })
+}

src/utils/tracking/userSource.js

@@ -0,0 +1,29 @@
+import { savePoint, updatePoint } from '@/services/common'
+import { routes } from '../../routes'
+
+export default async (router) => {
+  const { path, query, scene } = router || {}
+  const { id, buildingId, recommender } = query || {}
+
+  const pageInfo = routes.filter(x => path.indexOf(x.page) > -1)[0] || { type: 'other', name: '其他' }
+
+  const trackPayload = {
+    event: 'start',
+    eventType: pageInfo.type,
+    propertyName: pageInfo.name,
+    data: '{}',
+    id,
+    buildingId,
+    realScene: scene,
+    sceneId: scene,
+    sharePersonId: recommender,
+  }
+
+  try {
+    const { recordId } = await savePoint(trackPayload)
+    return function () { updatePoint(recordId); }
+  } catch (e) {
+    console.error('进入小程序埋点出错:', e);
+    return function () { }
+  }
+}