静态页面

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

@@ -1,4 +1,4 @@
-import { useState } from 'react'
+import { useState, useEffect } from 'react'
 import Taro from '@tarojs/taro'
 import { Video } from '@tarojs/components'
 import { getImgURL } from '@/utils/image'
@@ -17,15 +17,25 @@ export default function BuildingDetailBanner (props) {
   const shwoVideoBtn = !!videoUrl
 
   // JS 中 true + true = 2
-  const showBtns = (showPicBtn + showVRBtn + shwoVideoBtn) > 1
+  // const showBtns = (showPicBtn + showVRBtn + shwoVideoBtn) > 1
 
-  const [NavList] = useState([
-    { name: 'VR', id: 1 },
-    { name: '视频', id: 2 },
-    { name: '图片', id: 3 }
-  ])
+  const [NavList, setNavList] = useState([])
   const [CurrentNavId, setCurrentNavId] = useState(3)
 
+  useEffect(() => {
+    let Arr = []
+    if (showVRBtn) {
+      Arr.push({ name: 'VR', id: 1 })
+    }
+    if (shwoVideoBtn) {
+      Arr.push({ name: '视频', id: 2 })
+    }
+    if (showPicBtn) {
+      Arr.push({ name: '图片', id: 3 })
+    }
+    setNavList(Arr)
+  }, [])
+
   const CutNavId = (id) => {
     return () => {
       setCurrentNavId(id)
@@ -56,17 +66,16 @@ export default function BuildingDetailBanner (props) {
 
       {/* 切换 */}
       {
-        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>
+        !!NavList.length &&
+        <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 */}

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

@@ -48,6 +48,9 @@
     z-index: 1;
     overflow: hidden;
   }
+  >.Video {
+    height: 71.5vw;
+  }
   > .Picture {
     > swiper {
       width: 100%;

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

@@ -15,7 +15,13 @@ export default function LivingActivity (props) {
     })
   }
 
-  const gotoDetail = () => {}
+  const gotoDetail = (item) => {
+    if(item.type=='video'){
+      Taro.navigateTo({ url: `/pages/video/videoDetail/index?id=${item.liveActivityId}` })
+    }else{
+      Taro.navigateTo({ url: `/pages/video/liveDetail/index?id=${item.liveActivityId}` })
+    }
+  }
 
   return List.length > 0 ? (
     <view className='components LivingActivity'>

src/pages/video/components/VideoListItem/index.jsx

@@ -7,7 +7,6 @@ export default function VideoListItem (props) {
   const { Data = {} } = props
 
   const toDetail=()=>{
-    console.log(Data,'------------')
     if(Data.type=='video'){
       Taro.navigateTo({ url: `/pages/video/videoDetail/index?id=${Data.id}` })
     }else{

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

@@ -5,12 +5,15 @@ import { ScrollView, Image } from '@tarojs/components'
 import ProjectListItem from '@/components/ProjectListItem/index'
 import { useSelector } from 'react-redux'
 import { fetch } from '@/utils/request'
-import { API_AGENT_CURRENT, API_ITEMS_DETAIL } from '@/constants/api'
+import { API_AGENT_CURRENT, API_ITEMS_DETAIL, API_QUERY_USERINFO_BYID } from '@/constants/api'
 import { getImgURL } from '@/utils/image'
 import '@/assets/css/iconfont.css'
 import './index.scss'
 
-export default withLayout(() => {
+export default withLayout((props) => {
+
+  const { router } = props
+  const { id } = router.params
   
   const [IsPull, setPull] = useState(false)
   const [ShowPopup, setShowPopup] = useState(false)
@@ -23,7 +26,13 @@ export default withLayout(() => {
 
   useEffect(() => {
     if (PersonId !== user.userInfo.person.personId) {
-      setPersonId(user.userInfo.person.personId)
+      if(id) {
+        fetch({ url: `${API_QUERY_USERINFO_BYID}/${id}`, method: 'get' }).then((res) => {
+          setUserInfo(res)
+        })
+      } else {
+        setPersonId(user.userInfo.person.personId)
+      }
     }
   }, [user])
 
@@ -39,6 +48,10 @@ export default withLayout(() => {
     }
   }, [UserInfo])
 
+  const Liked = () => {
+
+  }
+
   const GetUserInfo = () => {
     fetch({ url: API_AGENT_CURRENT, method: 'get' }).then((res) => {
       setUserInfo(res)
@@ -81,7 +94,7 @@ export default withLayout(() => {
                     <text>{UserInfo.nickname} {UserInfo.phone}</text>
                   </view>
                   <text className='iconfont icon-dianzan'></text>
-                  <text>{UserInfo.likeNum || 0}赞</text>
+                  <text onClick={Liked}>{UserInfo.likeNum || 0}赞</text>
                 </view>
                 <view className='Tag'>
                   <view>
@@ -116,7 +129,7 @@ export default withLayout(() => {
                 }
               </view>
               <text className='iconfont icon-renqi'></text>
-              <text>人气值{UserInfo.hotNum || 0}</text>
+              <text>人气值{UserInfo.hotNum || 999}</text>
             </view>
           </view>