信息修改

src/components/ProjectListItem/index.jsx

@@ -11,7 +11,7 @@ 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}` })
     } else { // 楼盘

src/pages/index/activityDetail/index.jsx

@@ -28,29 +28,6 @@ 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;
@@ -231,7 +208,7 @@ export default withLayout((props) => {
         <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>

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/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/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/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,