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

project.config.json

@@ -77,6 +77,13 @@
 					"pathName": "pages/chat/chatDetail/index",
 					"query": "friend=d060bba5d66221200d8b19e7fa8b020b",
 					"scene": null
+				},
+				{
+					"id": -1,
+					"name": "pages/index/activityDetail/index",
+					"pathName": "pages/index/activityDetail/index",
+					"query": "id=5e1e226d71d7774ba8166440aed78a11&eventType=dymic",
+					"scene": null
 				}
 			]
 		}

src/components/ProjectListItem/index.jsx

@@ -11,9 +11,9 @@ export default function ProjectListItem (props) {
 
   const LinkTo = () => {
     if(Data.eventType === 'news') { // 资讯
-      Taro.navigateTo({ url: `/pages/index/newsDetail/index?id=${Data.targetId}` })
+      Taro.navigateTo({ url: `/pages/index/newsDetail/index?id=${Data.targetId}&eventType=${Data.type}` })
     } else if(Data.eventType === 'activity') { // 活动
-      Taro.navigateTo({ url: `/pages/index/activityDetail/index?id=${Data.targetId}` })
+      Taro.navigateTo({ url: `/pages/index/activityDetail/index?id=${Data.targetId}&eventType=${Data.type}` })
     } else { // 楼盘
       Taro.navigateTo({ url: `/pages/index/buildingDetail/index?id=${Data.buildingId || Data.targetId}` })
     }

src/layout/index.js

@@ -32,7 +32,7 @@ export default (ChildComponent) => (props) => {
   const [shareTimelineVisible, setShareTimelineVisible] = useState(false)
   const consultant = useSelector(s => s.system.consultant)
 
-  const { id, scene, qrInited } = router.params
+  const { id, scene, qrInited, type } = router.params
 
   const showConsultant = page.shortcut && page.shortcut.consultant
 
@@ -76,7 +76,7 @@ export default (ChildComponent) => (props) => {
     const consultantId = person?.personType === ROLE_CODE.CONSULTANT ? person.personId : undefined
 
     setTrackData({
-      eventType: page.type,
+      eventType: type || page.type,
       propertyName: page.name,
       consultantId,
       sharePersonId: person?.personId,

src/pages/index/activityDetail/index.jsx

@@ -1,6 +1,7 @@
-import { useState, useEffect } from 'react';
-import Taro from '@tarojs/taro';
-import withLayout from '@/layout';
+import { useState, useEffect } from "react";
+import Taro from "@tarojs/taro";
+import withLayout from "@/layout";
+import { savePoint } from "@/services/common";
 import {
   ScrollView,
   Image,
@@ -9,77 +10,70 @@ import {
   Text,
   Input,
   Picker,
-  Button
-} from '@tarojs/components';
-import Disclaimer from '@/components/Disclaimer';
-import { useSelector } from 'react-redux';
-import {
-  signupActivity,
-  queryActivityDetail,
-} from "@/services/activity";
+  Button,
+} from "@tarojs/components";
+import Disclaimer from "@/components/Disclaimer";
+import { useSelector } from "react-redux";
+import { signupActivity, queryActivityDetail } from "@/services/activity";
 import { getImgURL } from "@/utils/image";
 import { formatDate } from "@/utils/chatDate";
 import useParams from "@/utils/hooks/useParams";
 import useShare from "@/utils/hooks/useShare";
 import useFavor from "@/utils/hooks/useFavor";
 import { times } from "@/utils/tools";
-import useStatus from './useStatus'
-import CountDown from './CountDown'
+import useStatus from "./useStatus";
+import CountDown from "./CountDown";
 
 import "./index.scss";
 
-const activityStatusDict = {
-  0: {
-    text: '立即参与',
-    text1: '立即参团',
-    className: 'yellow',
-  },
-  1: {
-    text: '未开始',
-    text1: '未开始',
-    className: 'blue',
-  },
-  2: {
-    text: '已结束',
-    text1: '已结束',
-    className: 'grey',
-  },
-  3: {
-    text: '已参与',
-    text1: '已结束',
-    className: 'yellow',
-  },
-};
-
 export default withLayout((props) => {
-  const { router, shareContent, trackData, person, page, showShareTimeline, setNavigationBarTitle } = props;
-  const { id } = router.params;
+  const {
+    router,
+    shareContent,
+    trackData,
+    person,
+    page,
+    showShareTimeline,
+    setNavigationBarTitle,
+  } = props;
+  const { id, eventType = "dymic" } = router.params;
 
   const user = useSelector((state) => state.user);
 
-  const [detail, setDetail] = useState({})
-  const [canChoose, setCanChoose] = useState('none');
-  const [inputName, setInputName] = useState('');
-  const [selectorChecked, setSelectorChecked] = useState('1');
-  const [selector, setSelector] = useState('');
+  const [detail, setDetail] = useState({});
+  const [canChoose, setCanChoose] = useState("none");
+  const [inputName, setInputName] = useState("");
+  const [selectorChecked, setSelectorChecked] = useState("1");
+  const [selector, setSelector] = useState("");
 
   const buildingId = detail?.buildingId;
 
-  const [btnText, btnDisabled] = useStatus(detail)
+  const [btnText, btnDisabled] = useStatus(detail);
 
   const getDetail = (params) => {
     Taro.showLoading();
 
     queryActivityDetail(params).then((res) => {
-      const maxperson = 10
+      const maxperson = 10;
       setSelector(times(maxperson).map((_, i) => `${i + 1}`));
 
-      setDetail(res ||{});
-      setNavigationBarTitle(res?.title)
+      setDetail(res || {});
+      setNavigationBarTitle(res?.title);
       Taro.hideLoading();
     });
   };
 
+  useEffect(() => {
+    if (trackData.eventType && detail.dynamicId) {
+      savePoint({
+        ...trackData,
+        event: "detail",
+        eventType: detail.type || "dymic",
+        targetType: detail.type || "dymic",
+      });
+    }
+  }, [trackData, detail]);
+
   // 本页面分享或者海报参数
   const paramsRef = useParams({
     id,
@@ -99,32 +93,38 @@ export default withLayout((props) => {
   useShare(
     {
       title: shareContent.shareContentTitle || detail?.title,
-      path: `${router.path}?${paramsRef.current}`,
+      path: `${router.path}?${paramsRef.current}&type=${
+        detail.type || "dymic"
+      }`,
       // image: shareContent.shareContentImg || getImgURL(detail?.imgUrl),
-      image: '',
+      image: "",
     },
-    fullTrackData
+    { ...fullTrackData, eventType: detail.type || "dymic" }
   );
 
   useEffect(() => {
     if (id) {
       getDetail(id);
     }
-  }, [id])
+  }, [id]);
 
   const handleSignup = () => {
     setCanChoose("block");
   };
 
   const comfire = () => {
-    const { dynamicId } = detail
-    const { userInfo: { person: { phone, tel } } } = user
-    if (inputName === '') {
+    const { dynamicId } = detail;
+    const {
+      userInfo: {
+        person: { phone, tel },
+      },
+    } = user;
+    if (inputName === "") {
       Taro.showToast({
-        title: '请输入姓名',
-        icon: 'none'
-      })
-      return
+        title: "请输入姓名",
+        icon: "none",
+      });
+      return;
     }
 
     const payload = {
@@ -139,15 +139,15 @@ export default withLayout((props) => {
       Taro.showToast({
         title: "报名成功",
       });
-      setCanChoose('none')
+      setCanChoose("none");
       setTimeout(() => {
-        getDetail(id)
-      }, 500)
+        getDetail(id);
+      }, 500);
     });
   };
 
-  function hideModal () {
-    setCanChoose('none');
+  function hideModal() {
+    setCanChoose("none");
   }
 
   const onInputText = (e) => {
@@ -155,35 +155,38 @@ export default withLayout((props) => {
   };
 
   const dymic = () => (
-    <view className='Info'>
+    <view className="Info">
       <view>
-        <view className='Title flex-h'>
-          <view className='flex-item'>
+        <view className="Title flex-h">
+          <view className="flex-item">
             <text>{detail.halfTitle}</text>
           </view>
-          <text className='Tips'>{detail.enlisted || 0}人已报名</text>
+          <text className="Tips">{detail.enlisted || 0}人已报名</text>
         </view>
-        <text className='Time'>
+        <text className="Time">
           报名截止时间：
-          {formatDate(detail.enlistEnd, 'yyyy/MM/dd')}
+          {formatDate(detail.enlistEnd, "yyyy/MM/dd")}
         </text>
-        <text className='Name'>{detail.title}</text>
-        <view className='flex-h Address'>
+        <text className="Name">{detail.title}</text>
+        <view className="flex-h Address">
           <text>活动地址：</text>
-          <view className='flex-item'>
+          <view className="flex-item">
             <text>{detail.address}</text>
           </view>
         </view>
-        <view className='flex-h Date'>
+        <view className="flex-h Date">
           <text>活动时间：</text>
-          <view className='flex-item'>
+          <view className="flex-item">
             <text>
-              {`${formatDate(detail.startDate, 'yyyy/MM/dd')} - ${formatDate(detail.endDate, 'yyyy/MM/dd')}`}
+              {`${formatDate(detail.startDate, "yyyy/MM/dd")} - ${formatDate(
+                detail.endDate,
+                "yyyy/MM/dd"
+              )}`}
             </text>
           </view>
         </view>
-        <view className='Btn'>
-          <Button open-type='share'>
+        <view className="Btn">
+          <Button open-type="share">
             <text>分享好友</text>
           </Button>
         </view>
@@ -192,29 +195,35 @@ export default withLayout((props) => {
   );
 
   const house = () => (
-
-    <view className='BuildingInfo'>
-
-      <view className='flex-h Title'>
-        <view className='flex-item'>
-          <text className='Name'>{detail.title}</text>
-          <view className='Address flex-h'>
-            <text className='iconfont icon-dingwei'></text>
-            <view className='flex-item'>
+    <view className="BuildingInfo">
+      <view className="flex-h Title">
+        <view className="flex-item">
+          <text className="Name">{detail.title}</text>
+          <view className="Address flex-h">
+            <text className="iconfont icon-dingwei"></text>
+            <view className="flex-item">
               <text>{detail.address}</text>
             </view>
           </view>
-          <text className='Price'>{detail.groupBuyPrice || '价格待定'}</text>
-          <text className='Time'>活动时间：{formatDate(detail.startDate, 'yyyy/MM/dd')} - {formatDate(detail.endDate, 'yyyy/MM/dd')}</text>
+          <text className="Price">{detail.groupBuyPrice || "价格待定"}</text>
+          <text className="Time">
+            活动时间：{formatDate(detail.startDate, "yyyy/MM/dd")} -{" "}
+            {formatDate(detail.endDate, "yyyy/MM/dd")}
+          </text>
         </view>
-        <view className='Option'>
+        <view className="Option">
           <view>
-            <text className='iconfont icon-fenxiang1'></text>
+            <text className="iconfont icon-fenxiang1"></text>
             <text>分享</text>
-            <Button open-type='share' className='ShareBtn'>分享</Button>
+            <Button open-type="share" className="ShareBtn">
+              分享
+            </Button>
           </view>
           <view onClick={() => showShareTimeline(true)}>
-            <text className='iconfont icon-pengyouquan1' style='font-size: 32rpx'></text>
+            <text
+              className="iconfont icon-pengyouquan1"
+              style="font-size: 32rpx"
+            ></text>
             <text>朋友圈</text>
           </view>
         </view>
@@ -222,41 +231,45 @@ export default withLayout((props) => {
 
       <CountDown endTime={detail?.enlistEnd} />
 
-      <view className='Apply flex-h'>
-        <view className='Collect' onClick={handleFavor}>
-          <text className='iconfont icon-shoucang' style={isSaved ? { color: 'red' } : undefined}></text>
-          <text>{isSaved ? '已收藏' : '收藏'}</text>
+      <view className="Apply flex-h">
+        <view className="Collect" onClick={handleFavor}>
+          <text
+            className="iconfont icon-shoucang"
+            style={isSaved ? { color: "red" } : undefined}
+          ></text>
+          <text>{isSaved ? "已收藏" : "收藏"}</text>
         </view>
-        <text className='iconfont icon-baoming'></text>
-        <view className='flex-item'>
+        <text className="iconfont icon-baoming"></text>
+        <view className="flex-item">
           <text>{detail.enlisted || 0}人已报名</text>
         </view>
-        <button className='Btn' disabled={btnDisabled} onClick={handleSignup}>{btnText}</button>
+        <Button className="Btn" disabled={btnDisabled} onClick={handleSignup}>
+          {btnText}
+        </Button>
       </view>
-
     </view>
   );
 
   return (
     <>
       {detail && (
-        <view className='Page activityDetail flex-v'>
-          <view className='flex-item'>
+        <view className="Page activityDetail flex-v">
+          <view className="flex-item">
             <view>
               <ScrollView scroll-y>
-                <view className='PageContent'>
-                  <view className='Top'>
+                <view className="PageContent">
+                  <view className="Top">
                     <Image
-                      mode='aspectFill'
+                      mode="aspectFill"
                       src={getImgURL(detail.imgUrl)}
-                      className='centerLabel'
+                      className="centerLabel"
                     ></Image>
                   </view>
 
                   {detail.type == "dymic" && dymic()}
                   {detail.type !== "dymic" && house()}
-                  <view className='ActivityIntro'>
-                    <view className='Title'>
+                  <view className="ActivityIntro">
+                    <view className="Title">
                       <text>活动介绍</text>
                     </view>
                     <RichText nodes={detail.desc} />
@@ -268,21 +281,25 @@ export default withLayout((props) => {
             </view>
           </view>
           {detail.type == "dymic" && (
-            <view className='PageBottom flex-h'>
-              <Button className='Share' open-type='share'>
-                <text className='iconfont icon-fenxiang'></text>
+            <view className="PageBottom flex-h">
+              <Button className="Share" open-type="share">
+                <text className="iconfont icon-fenxiang"></text>
                 <text>分享</text>
               </Button>
-              <view className='Collect' onClick={handleFavor}>
+              <view className="Collect" onClick={handleFavor}>
                 <text
-                  className='iconfont icon-shoucang'
+                  className="iconfont icon-shoucang"
                   style={isSaved ? { color: "red" } : undefined}
                 ></text>
-                <text>{isSaved ? '已收藏' : '收藏'}</text>
+                <text>{isSaved ? "已收藏" : "收藏"}</text>
               </view>
-              <view className='flex-item'></view>
+              <view className="flex-item"></view>
 
-              <Button disabled={btnDisabled} className='Post' onClick={handleSignup}>
+              <Button
+                disabled={btnDisabled}
+                className="Post"
+                onClick={handleSignup}
+              >
                 {btnText}
               </Button>
             </view>
@@ -290,29 +307,29 @@ export default withLayout((props) => {
         </view>
       )}
 
-      <View className='page-body' style={{ display: canChoose }}>
-        <View className='mask' onClick={() => hideModal()}></View>
-        <View className='page-section'>
-          <Text className='page-section__title'>报名信息</Text>
-          <View className='page-content'>
+      <View className="page-body" style={{ display: canChoose }}>
+        <View className="mask" onClick={() => hideModal()}></View>
+        <View className="page-section">
+          <Text className="page-section__title">报名信息</Text>
+          <View className="page-content">
             <Input
-              className='inputName'
+              className="inputName"
               onInput={onInputText}
-              type='text'
-              placeholder='请输入姓名'
+              type="text"
+              placeholder="请输入姓名"
             />
             <Picker
-              mode='selector'
+              mode="selector"
               range={selector}
               onChange={(e) => setSelectorChecked(selector[e.detail.value])}
             >
-              <View className='picker'>
+              <View className="picker">
                 <Text>参加人数</Text>
-                <Text className='content'>{selectorChecked}</Text>
+                <Text className="content">{selectorChecked}</Text>
                 <Text>人</Text>
               </View>
             </Picker>
-            <View onClick={comfire} className='comfire'>
+            <View onClick={comfire} className="comfire">
               确认
             </View>
           </View>

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

@@ -58,7 +58,7 @@ export default function DetailBottom (props) {
       const id = actList[0].dynamicId
 
       Taro.navigateTo({
-        url: `/pages/index/activityDetail/index?id=${id}`
+        url: `/pages/index/activityDetail/index?id=${id}&eventType=${actList[0].type || 'dymic'}`
       })
     } else {
       Taro.showToast({ title: '该功能暂不能为您提供服务', icon: 'none', duration: 2000 })

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

@@ -13,7 +13,7 @@ export default function MarketingActivity (props) {
   const [dataList, setDataList] = useState([])
 
   const goMore = () => Taro.navigateTo({ url: `/pages/index/activityList/index?type=house&buildingId=${buildingId}` })
-  const goDetail = (id) => Taro.navigateTo({ url: `/pages/index/activityDetail/index?id=${id}` })
+  const goDetail = (id, type) => Taro.navigateTo({ url: `/pages/index/activityDetail/index?id=${id}&eventType=${type || 'dymic'}` })
 
   useEffect(() => {
     if (buildingId) {
@@ -43,7 +43,7 @@ export default function MarketingActivity (props) {
             {
               dataList.map((item, index) => (
                 <SwiperItem key={`Banner-${index}`}>
-                  <view className='swiper-item' onClick={() => goDetail(item.dynamicId)}>
+                  <view className='swiper-item' onClick={() => goDetail(item.dynamicId, item.type)}>
                     <Image mode='aspectFill' className='centerLabel' src={getImgURL(item.bannerListImg || item.imgUrl || item.image || item.url || item.img || item.imgUrl || item.detailImg)} />
                   </view>
                 </SwiperItem>

src/pages/index/buildingDetail/index.jsx

@@ -8,6 +8,8 @@ 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 { savePoint } from '@/services/common'
+import { addItemUv } from '@/services/item'
 import DetailBottom from './components/DetailBottom/index'
 import BuildingDetailBanner from './components/BuildingDetailBanner/index'
 import BasicInfo from './components/BasicInfo/index'
@@ -45,6 +47,18 @@ export default withLayout((props) => {
     fullTrackData,
   )
 
+  useEffect(() => {
+    if(trackData.eventType && DetailInfo.buildingId) {
+      savePoint({
+        ...trackData,
+        event: 'detail',
+        eventType: 'building',
+        targetType: 'building'
+      })
+      addItemUv(id)
+    }
+  }, [trackData, DetailInfo])
+
   // 海报
   const posterData = usePoster(person, DetailInfo?.poster, router, paramsRef)
 

src/pages/index/components/ActivityListItem/index.jsx

@@ -1,9 +1,9 @@
-import React, { useState, useEffect } from 'react'
-import './index.scss'
+
 import { Image } from '@tarojs/components'
 import Taro from '@tarojs/taro'
 import { getImgURL } from '@/utils/image'
 import { formatDate } from '@/utils/chatDate'
+import './index.scss'
 
 const activityStatusDict={
   0:{
@@ -26,7 +26,7 @@ const activityStatusDict={
 export default function ActivityListItem (props) {
   const { data = {} } = props
   return (
-    <view className='components ActivityListItem' onClick={() => { Taro.navigateTo({ url: `/pages/index/activityDetail/index?id=${data.dynamicId}` }) }}>
+    <view className='components ActivityListItem' onClick={() => { Taro.navigateTo({ url: `/pages/index/activityDetail/index?id=${data.dynamicId}&eventType=${data.type || 'dymic'}` }) }}>
       <view className='Img'>
         <Image mode='aspectFill' src={getImgURL(data.listImgUrl || data.imgUrl)} className='centerLabel'></Image>
       </view>

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

@@ -1,51 +1,11 @@
 
 import { Swiper, SwiperItem, Image } from '@tarojs/components'
-import Taro from '@tarojs/taro'
 import { getImgURL } from '@/utils/image'
 import nav2Target from '@/utils/nav2Target'
 import './index.scss'
 
 export default function Banner (props) {
   const { List = [] } = props
-  
-  const redirectTo = ({ targetId, contentType, buildingId } = {})=> {
-    switch (contentType) {
-      // 项目
-      case 'project':
-        Taro.navigateTo({
-          url: '/pages/index/buildingDetail/index?id=' + buildingId
-        })
-        return;
-
-      // 活动
-      case 'activity':
-        Taro.navigateTo({
-          url: '/pages/index/activityDetail/index?id=' + targetId
-        })
-        return;
-
-      // 资讯
-      case 'news':
-        Taro.navigateTo({
-          url: '/pages/index/newsDetail/index?id=' + targetId
-        })
-        return;
-
-      // live
-      case 'live':
-        Taro.navigateTo({
-          url: '/pages/video/liveDetail/index?id=' + targetId
-        })
-        return;
-
-
-      // 其他
-      case 'others':
-      default:
-        
-        return;
-    }
-  }
 
   const handleBannerClick = (item) => {
     if (item.contentType && item.contentType != "nothing") {

src/pages/index/components/HotRecommend/index.jsx

@@ -50,7 +50,7 @@ export default function HotRecommend (props) {
   const toDetail = (item) => {
     return () => {
       if (item.dynamicId) {
-        Taro.navigateTo({ url: `/pages/index/activityDetail/index?id=${item.dynamicId}` })
+        Taro.navigateTo({ url: `/pages/index/activityDetail/index?id=${item.dynamicId}&eventType=${item.type || 'dymic'}` })
       }
     }
   }

src/pages/index/helpToFindHouse/index.jsx

@@ -54,8 +54,8 @@ export default withLayout((props) => {
         // 用户选择 200, 则区间为 [100, 300]
         // 用户选择 300, 则区间为 [200, 400]
         const price = item.result === '' ? 300 : item.result - 0;
-        const min = price < 100 ? 100 : price - 100;
-        const max = price + 100;
+        const min = item.options[0]
+        const max = price
 
         params.push({ ...item, key: 'minPrice', result: CurrentDemandId === 2 ? min : min * 10000 })
         params.push({ ...item, key: 'maxPrice', result: CurrentDemandId === 2 ? max : max * 10000 })

src/pages/index/newsDetail/index.jsx

@@ -1,12 +1,13 @@
 import { useState, useEffect } from "react";
 import Taro from "@tarojs/taro";
 import withLayout from "@/layout";
-import { ScrollView, Image, RichText, WebView } from "@tarojs/components";
+import { ScrollView, RichText, WebView } from "@tarojs/components";
 import useParams from '@/utils/hooks/useParams'
 import useFavor from "@/utils/hooks/useFavor";
 import { queryNewsDetail } from "@/services/news";
 import { formatDate } from "@/utils/chatDate";
 import useShare from "@/utils/hooks/useShare";
+import { savePoint } from '@/services/common'
 import "@/assets/css/iconfont.css";
 import "./index.scss";
 
@@ -35,6 +36,17 @@ export default withLayout((props) => {
     fullTrackData
   );
 
+  useEffect(() => {
+    if(trackData.eventType && (data || {}).newsId) {
+      savePoint({
+        ...trackData,
+        event: 'detail',
+        eventType: 'news',
+        targetType: 'news'
+      })
+    }
+  }, [trackData, data])
+
   const getData = (params) => {
     Taro.showLoading();
     queryNewsDetail(params).then((res) => {

src/pages/mine/components/MyActivityListItem/index.jsx

@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react'
+
 import { getImgURL } from '@/utils/image'
 import Taro from '@tarojs/taro'
 import { Image } from '@tarojs/components'
@@ -9,7 +9,7 @@ export default function MyActivityListItem (props) {
   const { Data = {} } = props
 
   return (
-    <view className='components MyActivityListItem' onClick={() => { Taro.navigateTo({ url: `/pages/index/activityDetail/index?id=${Data.id}` }) }}>
+    <view className='components MyActivityListItem' onClick={() => { Taro.navigateTo({ url: `/pages/index/activityDetail/index?id=${Data.id}&eventType=${Data.type || 'dymic'}` }) }}>
       <view className='Img'>
         <Image mode='aspectFill' className='centerLabel' src={getImgURL(Data.listImgUrl) || null} />
       </view>

src/pages/mine/myCustomerForEditRecord/index.config.js

@@ -0,0 +1,3 @@
+export default {
+  navigationBarTitleText: '修改记录'
+}

src/pages/mine/myCustomerForEditRecord/index.jsx

@@ -0,0 +1,89 @@
+import { useState, useEffect } from 'react'
+import withLayout from '@/layout'
+import { ScrollView } from '@tarojs/components'
+import '@/assets/css/iconfont.css'
+import { useSelector } from 'react-redux'
+import { fetch } from '@/utils/request'
+import { API_ACTIVITY_LIST } from '@/constants/api'
+import './index.scss'
+
+export default withLayout(() => {
+
+  const user = useSelector(state => state.user)
+  const [PageList, setPageList] = useState([])
+  const [IsPull, setPull] = useState(false)
+  const [PersonId, setPersonId] = useState(null)
+  const [pageNumber, setPageNumber] = useState(1)
+  const [HasNextPage, setHasNextPage] = useState(true)
+
+  useEffect(() => {
+    if (user?.userInfo?.person?.personId) {
+      setPersonId(user.userInfo.person.personId)
+    }
+  }, [user])
+
+  useEffect(() => {
+    GetPageList()
+  }, [pageNumber])
+
+  const PageRefresh = () => { // 页面下拉刷新回调
+    setPull(true)
+  }
+
+  const GetPageList = () => {
+    setHasNextPage(false)
+    fetch({ url: API_ACTIVITY_LIST, method: 'get', payload: { mine: true, pageNumber, pageSize: 10 } }).then((res) => {
+      setPageList(pageNumber === 1 ? res.records || [] : PageList.concat(res.records || []))
+      setHasNextPage(res.current < res.pages)
+      setPull(false)
+    })
+  }
+
+  const PageLoadMore = () => { // 页面上拉加载更多
+    if (HasNextPage) {
+      setPageNumber(pageNumber + 1)
+    }
+  }
+
+  useEffect(() => { // 下拉刷新触发
+    if (IsPull) {
+      if (pageNumber === 1) {
+        GetPageList()
+      } else {
+        setPageNumber(1)
+      }
+    }
+  }, [IsPull])
+
+  return (
+    <view className='Page myActivity'>
+
+      <ScrollView scroll-y refresher-enabled refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} onscrolltolower={PageLoadMore} refresher-background='#fff'>
+        <view className='PageContent'>
+          <view className='List'>
+            {
+              PageList.map((item, index) => (
+                <view className='ListItem' key={`ListItem-${index}`}>
+                  <view className='flex-h'>
+                    <view className='flex-item'>
+                      <text>跟进人</text>
+                    </view>
+                    <text>2021-05-21 12:00</text>
+                  </view>
+                  <text>跟进内容</text>
+                </view>
+              ))
+            }
+          </view>
+
+          {/* bottom */}
+          <view className='PageBottom'>
+            <text>已经到底了~</text>
+          </view>
+
+        </view>
+      </ScrollView>
+
+    </view>
+  )
+})

src/pages/mine/myCustomerForEditRecord/index.scss

@@ -0,0 +1,62 @@
+.Page.myActivity {
+  background: #fff;
+  width: 100%;
+  height: 100%;
+  position: relative;
+  overflow: hidden;
+  > scroll-view {
+    width: 100%;
+    height: 100vh;
+    .PageContent {
+      position: relative;
+      overflow: hidden;
+      min-height: 100vh;
+      >.List {
+        padding: 0 30px;
+        position: relative;
+        overflow: hidden;
+        >.ListItem {
+          position: relative;
+          overflow: hidden;
+          border-bottom: 2px solid rgba(0, 0, 0, 0.08);
+          padding: 40px 0;
+          >.flex-h {
+            align-items: center;
+            >.flex-item {
+              >text {
+                display: block;
+                font-size: 32px;
+                color: #333;
+                line-height: 1;
+              }
+            }
+            >text {
+              font-size: 24px;
+              color: #999;
+              line-height: 1;
+            }
+          }
+          >text {
+            font-size: 28px;
+            color: 666;
+            line-height: 36px;
+            display: block;
+            margin-top: 38px;
+          }
+        }
+      }
+      > .PageBottom {
+        text-align: center;
+        font-size: 0;
+        white-space: nowrap;
+        > text {
+          display: inline-block;
+          font-size: 28px;
+          color: #666;
+          line-height: 40px;
+          margin: 20px auto;
+        }
+      }
+    }
+  }
+}

src/pages/video/liveDetail/index.jsx

@@ -1,5 +1,6 @@
 import { useState, useEffect, useRef } from "react";
-import Taro, { useDidShow, useReady } from "@tarojs/taro";
+import Taro from "@tarojs/taro";
+import { savePoint } from '@/services/common'
 import withLayout from "@/layout";
 import { Image } from "@tarojs/components";
 import { queryLiveDetail } from "@/services/item";
@@ -49,6 +50,17 @@ export default withLayout((props) => {
     })
   };
 
+  useEffect(() => {
+    if(trackData.eventType && data.liveActivityId) {
+      savePoint({
+        ...trackData,
+        event: 'detail',
+        eventType: 'live',
+        targetType: 'live'
+      })
+    }
+  }, [trackData, data])
+
   const handleLive = () => {
     if (!livingRef.current) {
       Taro.showToast({

src/routes.js

@@ -21,14 +21,14 @@ const routes = [
     page: 'pages/video/index',
     pkg: 'main',
     isTab: true,
-    type: 'video',
+    type: 'other',
   },
   {
     name: '消息',
     page: 'pages/chat/index',
     pkg: 'main',
     isTab: true,
-    type: 'chat',
+    type: 'other',
     auth: ['page', 'avatar'],
   },
   {
@@ -36,7 +36,7 @@ const routes = [
     page: 'pages/mine/index',
     pkg: 'main',
     isTab: true,
-    type: 'mine',
+    type: 'center',
     auth: ['page', 'avatar'],
   },
 
@@ -45,7 +45,7 @@ const routes = [
     name: '聊天',
     page: 'pages/chat/chatDetail/index',
     pkg: 'main',
-    type: 'chat',
+    type: 'other',
     auth: ['phone', 'avatar'],
   },
 
@@ -170,14 +170,14 @@ const routes = [
     name: '活动列表',
     page: 'pages/index/activityList/index',
     pkg: 'main',
-    type: 'activity',
+    type: 'dymic',
     // auth: ['phone', 'avatar'],
   },
   {
     name: '活动详情',
     page: 'pages/index/activityDetail/index',
     pkg: 'main',
-    type: 'activity',
+    type: 'dymic',
     auth: ['phone', 'avatar'],
   },
   {
@@ -233,7 +233,7 @@ const routes = [
     name: '课程详情',
     page: 'pages/index/courseDetail/index',
     pkg: 'main',
-    type: 'curriculum',
+    type: 'other',
   },
 
   //视频
@@ -241,13 +241,13 @@ const routes = [
     name: '直播活动',
     page: 'pages/video/liveDetail/index',
     pkg: 'main',
-    type: 'video',
+    type: 'live',
   },
   {
     name: '视频详情',
     page: 'pages/video/videoDetail/index',
     pkg: 'main',
-    type: 'video',
+    type: 'live',
   },
 
   // 我的
@@ -268,130 +268,130 @@ const routes = [
     name: '基本信息',
     page: 'pages/mine/userInfo/index',
     pkg: 'main',
-    type: 'mine',
+    type: 'center',
     auth: ['phone', 'avatar'],
   },
   {
     name: '成为驻场管理',
     page: 'pages/mine/toBeManager/index',
     pkg: 'main',
-    type: 'mine',
+    type: 'center',
     // auth: ['phone'],
   },
   {
     name: '成为合伙人',
     page: 'pages/mine/toBeAgent/index',
     pkg: 'main',
-    type: 'mine',
+    type: 'center',
     // auth: ['phone'],
   },
   {
     name: '我的分享',
     page: 'pages/mine/myShare/index',
     pkg: 'main',
-    type: 'mine',
+    type: 'center',
   },
   {
     name: '我的课堂',
     page: 'pages/mine/myCourse/index',
     pkg: 'main',
-    type: 'curriculum',
+    type: 'center',
     // auth: ['phone'],
   },
   {
     name: '我的活动',
     page: 'pages/mine/myActivity/index',
     pkg: 'main',
-    type: 'activity',
+    type: 'center',
   },
   {
     name: '我的客户',
     page: 'pages/mine/myCustomer/index',
     pkg: 'main',
-    type: 'mine',
+    type: 'center',
     // auth: ['phone'],
   },
   {
     name: '客户详情',
     page: 'pages/mine/myCustomerDetail/index',
     pkg: 'main',
-    type: 'mine',
+    type: 'other',
     // auth: ['phone'],
   },
   {
     name: '操作人员',
     page: 'pages/mine/myCustomerForOperator/index',
     pkg: 'main',
-    type: 'mine',
+    type: 'other',
     // auth: ['phone'],
   },
   {
     name: '跟进记录',
     page: 'pages/mine/myCustomerForRecord/index',
     pkg: 'main',
-    type: 'mine',
+    type: 'other',
     // auth: ['phone'],
   },
   {
     name: '我的收藏',
     page: 'pages/mine/myCollect/index',
     pkg: 'main',
-    type: 'mine',
+    type: 'other',
   },
   {
     name: '合作渠道',
     page: 'pages/channel/partnerChannel/index',
     pkg: 'subpackages',
-    type: 'mine',
+    type: 'other',
     // auth: ['phone'],
   },
   {
     name: '添加客户',
     page: 'pages/mine/addCustomer/index',
     pkg: 'main',
-    type: 'mine',
+    type: 'other',
     // auth: ['phone'],
   },
   {
     name: '驻场管理',
     page: 'pages/marketing/residentManager/index',
     pkg: 'subpackages',
-    type: 'mine',
+    type: 'other',
     // auth: ['phone'],
   },
   {
     name: '确认到访',
     page: 'pages/marketing/sureVisit/index',
     pkg: 'subpackages',
-    type: 'mine',
+    type: 'other',
     // auth: ['phone'],
   },
   {
     name: '变更交易节点',
     page: 'pages/marketing/changeVisit/index',
     pkg: 'subpackages',
-    type: 'mine',
+    type: 'other',
     // auth: ['phone'],
   },
   {
     name: '盘客工具',
     page: 'pages/consultant/statCustomer/index',
     pkg: 'subpackages',
-    type: 'mine',
+    type: 'other',
     // auth: ['phone'],
   },
   {
     name: '客户信息',
     page: 'pages/mine/customerDetail/index',
     pkg: 'main',
-    type: 'mine',
+    type: 'other',
     // auth: ['phone'],
   },
   {
     name: '客户分析',
     page: 'pages/consultant/customerAnalyse/index',
     pkg: 'subpackages',
-    type: 'mine',
+    type: 'other',
     // auth: ['phone'],
   },
   {
@@ -405,7 +405,7 @@ const routes = [
     name: '意见反馈',
     page: 'pages/mine/feedBack/index',
     pkg: 'main',
-    type: 'mine',
+    type: 'other',
   },
   {
     name: '全景图',

src/subpackages/pages/consultant/myHomepage/index.jsx

@@ -8,6 +8,7 @@ import { fetch } from '@/utils/request'
 import { API_CARDS_UV, API_ITEMS_DETAIL, API_CARDS_LIST } from '@/constants/api'
 import { getImgURL } from '@/utils/image'
 import useLike from "@/utils/hooks/useLike";
+import { savePoint } from '@/services/common'
 import '@/assets/css/iconfont.css'
 import './index.scss'
 
@@ -47,6 +48,12 @@ export default withLayout((props) => {
       if(id) {
         fetch({ url: `${API_CARDS_LIST}/${id}`, method: 'get' }).then((res) => {
           setUserInfo(res)
+          savePoint({
+            ...trackData,
+            event: 'detail',
+            eventType: 'card',
+            targetType: 'card'
+          })
         })
       } else {
         setPersonId(user.userInfo.person.personId)

src/utils/nav2Target.js

@@ -1,6 +1,6 @@
 import Taro from '@tarojs/taro'
 
-export default ({ targetId, contentType, buildingId } = {})=> {
+export default ({ targetId, contentType, buildingId, type = 'dymic' } = {})=> {
   if (!targetId && !buildingId) return;
 
   switch (contentType) {
@@ -14,7 +14,7 @@ export default ({ targetId, contentType, buildingId } = {})=> {
     // 活动
     case 'activity':
       Taro.navigateTo({
-        url: '/pages/index/activityDetail/index?id=' + targetId
+        url: '/pages/index/activityDetail/index?id=' + targetId + '&eventType=' + type
       })
       return;
 

src/utils/tracking/userSource.js

@@ -3,13 +3,13 @@ import { routes } from '../../routes'
 
 export default async (router) => {
   const { path, query, scene } = router || {}
-  const { id, buildingId, recommender } = query || {}
+  const { id, buildingId, recommender, eventType } = query || {}
 
   const pageInfo = routes.filter(x => path.indexOf(x.page) > -1)[0] || { type: 'other', name: '其他' }
 
   const trackPayload = {
     event: 'start',
-    eventType: pageInfo.type,
+    eventType: eventType || pageInfo.type,
     propertyName: pageInfo.name,
     data: '{}',
     id,