feats

config/dev.js

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

src/constants/api.js

@@ -94,7 +94,8 @@ export const API_NOTICE_INFO = resolvePath('getNoticeInfo')
 export const API_SALES_BATCH = resolvePath('taSalesBatch')
 export const API_ADDLIVE_NUM = resolvePath('addVisitNum')
 export const API_LIVE_LIST = resolvePath('taLiveActivity')
-// /wx/location/city?location=lon,lat
+export const API_VIDEO_LIST = resolvePath('videoActiveList')
+
 
 //sign
 export const API_CONTRACT_USER = resolvePath('contract/user/add')

src/pages/video/index.jsx

@@ -3,63 +3,56 @@ import { ScrollView } from '@tarojs/components'
 import withLayout from '@/layout'
 import { useSelector } from 'react-redux'
 import { fetch } from '@/utils/request'
-import { API_LIVE_LIST } from '@/constants/api'
+import { API_LIVE_LIST, API_VIDEO_LIST } from '@/constants/api'
 import './index.scss'
 import '@/assets/css/iconfont.css'
 import VideoListItem from './components/VideoListItem/index'
 
-export default withLayout(() => {
+export default withLayout((props) => {
+  const { city } = props
 
-  const city = useSelector(state => state.city)
   const [IsPull, setPull] = useState(false)
-  const [CurrnetMenuId, setCurrnetMenuId] = useState(null)
+  const [CurrnetMenuId, setCurrnetMenuId] = useState('all')
   const [MenuList] = useState([
     { name: '全部', id: 'all' },
     { name: '预告', id: 'notice' },
     { name: '直播中', id: 'live' },
-    { name: '新房推荐', id: 'new' }
+    { name: '新房推荐', id: 'new' },
+    { name: '视频', id: 'video' }
   ])
   const [PullTimer, setPullTimer] = useState(null)
-  const [OriginList, setOriginList] = useState([])
-  const [PageList, setPageList] = useState([])
+  // 全部或者新房的列表
+  const [activityList, setActivityList] = useState([])
+  // 预告与直播的列表
+  const [liveList, setLiveList] = useState([])
+  // 视频的列表
+  const [videoList, setVideoList] = useState([])
 
   useEffect(() => {
-    if (city.curCity.name) {
-      setOriginList([])
+    if (city?.id) {
       GetLiveList()
     }
-  }, [city])
+  }, [city?.id, CurrnetMenuId])
 
-  useEffect(() => {
-    if(OriginList.length && CurrnetMenuId === null) {
-      setCurrnetMenuId('all')
-    }
-  }, [OriginList])
 
-  useEffect(() => {
-    if (CurrnetMenuId === 'all') {
-      setPageList([...OriginList])
+  const GetLiveList = (params) => {
+    if (['all', 'new'].indexOf(CurrnetMenuId) > -1) {
+      // 全部与新房用的一个接口
+      fetch({ url: API_LIVE_LIST, payload: { ...params, cityId: city.id }, spin: true }).then((res) => {
+        setActivityList(res.records || [])
+      })
+    } else if (['notice', 'live'].indexOf(CurrnetMenuId) > -1) {
+      // 预告与直播是虽然是同一个接口, 但是返回值字段不一样
+      const process = 'notice' === CurrnetMenuId ? 1 : 2;
+      fetch({ url: API_LIVE_LIST, payload: { ...params, cityId: city.id, process }, spin: true}).then((res) => {
+        setLiveList(res.records || [])
+      })
     } else {
-      let Arr = []
-      OriginList.map((item) => {
-        if (CurrnetMenuId === 'new') {
-          if(item.kind !== 'notice') {
-            Arr.push({...item})
-          }
-        } else {
-          if(item.kind === CurrnetMenuId) {
-            Arr.push({...item})
-          }
-        }
+      // 视频另外一个接口
+      fetch({ url: API_VIDEO_LIST, payload: { ...params, cityId: city.id }, spin: true }).then((res) => {
+        setVideoList(res.records || [])
       })
-      setPageList([...Arr])
     }
-  }, [CurrnetMenuId])
-
-  const GetLiveList = () => {
-    fetch({ url: API_LIVE_LIST, method: 'get', payload: { cityId: city.curCity.id, pageNum: 1, pageSize: 10000 } }).then((res) => {
-      setOriginList(res.records || [])
-    })
   }
 
   const PageRefresh = () => { // 页面下拉刷新回调
@@ -110,7 +103,32 @@ export default withLayout(() => {
           <ScrollView scroll-y refresher-enabled refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} refresher-background='#f8f8f8'>
             <view className='PageContent'>
               {
-                PageList.map((item, index) => (
+                /* 全部 与 新房 */
+                ['all', 'new'].indexOf(CurrnetMenuId) > -1 && activityList.map((item, index) => (
+                  <view className='ListItem' key={`List-${index}`}>
+                    <view>
+                      <view>
+                        <VideoListItem Data={item}></VideoListItem>
+                      </view>
+                    </view>
+                  </view>
+                ))
+              }
+              {
+                /* 预告 与 直播 */
+                ['notice', 'live'].indexOf(CurrnetMenuId) > -1 && activityList.map((item, index) => (
+                  <view className='ListItem' key={`List-${index}`}>
+                    <view>
+                      <view>
+                        <VideoListItem Data={item}></VideoListItem>
+                      </view>
+                    </view>
+                  </view>
+                ))
+              }
+              {
+                /* 视频 */
+                'video' === CurrnetMenuId && activityList.map((item, index) => (
                   <view className='ListItem' key={`List-${index}`}>
                     <view>
                       <view>

src/pages/video/liveDetail/index.config.js

@@ -1,3 +1,4 @@
 export default {
-  navigationBarTitleText: '直播活动'
+  navigationBarTitleText: '直播活动',
+  enableShareAppMessage: true
 }

src/pages/video/liveDetail/index.jsx

@@ -1,35 +1,38 @@
 import { useState, useEffect } from "react";
 import Taro, { useDidShow, useReady } from "@tarojs/taro";
 import withLayout from "@/layout";
-import {
-  Text,
-  View,
-  Picker,
-  Input,
-  ScrollView,
-  Image,
-  RichText,
-} from "@tarojs/components";
+import { Image } from "@tarojs/components";
+import { queryLiveDetail } from "@/services/item";
+import useParams from "@/utils/hooks/useParams";
+import useShare from "@/utils/hooks/useShare";
+import { getImgURL } from "@/utils/image";
 import "@/assets/css/iconfont.css";
 import "./index.scss";
-import {
-  // addActivityShareNum,
-  signupActivity,
-  favorActivity,
-  cancelFavorActivity,
-  queryActivityDetail,
-} from "@/services/activity";
-import {
-    queryLiveDetail
-  } from "@/services/item";
-
-import { getImgURL } from "@/utils/image";
 
 export default withLayout((props) => {
-  const { id } = props.router.params;
+  const { router, shareContent, trackData, person, page } = props;
+  const { id } = router.params;
 
   const [data,setData] = useState({})
-console.log(id,'queryLiveDetail')
+  
+  // 本页面分享或者海报参数
+  const paramsRef = useParams({
+    id,
+    buildingId: data.buildingId,
+    person,
+    from: `${page.type}_share`,
+  });
+  const fullTrackData = { ...trackData, buildingId: data.buildingId };
+  
+  useShare(
+    {
+      title: shareContent.shareContentTitle || data?.name,
+      path: `${router.path}?${paramsRef.current}`,
+      image: shareContent.shareContentImg || getImgURL(data?.vide_img),
+    },
+    fullTrackData
+  );
+
   const getData = () => {
     queryLiveDetail(id).then(res=>{
         setData(res)
@@ -47,7 +50,7 @@ console.log(id,'queryLiveDetail')
        <view className='liveDetail-menu'>
            <view onClick={()=>{Taro.navigateTo({ url: `/pages/index/buildingDetail/index?id=${data.buildingId}` })}}><text className="iconfont icon-fenxiang"></text><text>查看楼盘</text></view>
            <view><text className="iconfont icon-camera"></text><text>观看直播</text></view>
-           <view><text className="iconfont icon-fenxiang"></text><text>分享好友</text></view>
+           <button openType="share"><text className="iconfont icon-fenxiang"></text><text>分享好友</text></button>
        </view></>}
   </view>;
 });

src/pages/video/videoDetail/index.config.js

@@ -1,3 +1,4 @@
 export default {
-  navigationBarTitleText: '视频详情'
+  navigationBarTitleText: '视频详情',
+  enableShareAppMessage: true
 }

src/pages/video/videoDetail/index.jsx

@@ -1,17 +1,39 @@
 import { useState, useEffect } from "react";
 import withLayout from "@/layout";
 import { ScrollView } from "@tarojs/components";
-import "@/assets/css/iconfont.css";
-import "./index.scss";
 import { fetch } from "@/utils/request";
 import { API_VIDEO_DETAIL } from "@/constants/api";
 import { formatDate } from "@/utils/chatDate";
+import { getImgURL } from '@/utils/image'
+import useParams from "@/utils/hooks/useParams";
+import useShare from "@/utils/hooks/useShare";
+import "@/assets/css/iconfont.css";
+import "./index.scss";
 
 export default withLayout((props) => {
-  const { id } = props.router.params;
+  const { router, shareContent, trackData, person, page } = props;
+  const { id } = router.params;
 
   const [data, setData] = useState({});
-  console.log(id, "queryLiveDetail");
+  
+  // 本页面分享或者海报参数
+  const paramsRef = useParams({
+    id,
+    buildingId: data.buildingId,
+    person,
+    from: `${page.type}_share`,
+  });
+  const fullTrackData = { ...trackData, buildingId: data.buildingId };
+  
+  useShare(
+    {
+      title: shareContent.shareContentTitle || data?.name,
+      path: `${router.path}?${paramsRef.current}`,
+      image: shareContent.shareContentImg || getImgURL(data?.vide_img),
+    },
+    fullTrackData
+  );
+
   const getData = () => {
     fetch({ url: `${API_VIDEO_DETAIL}/${id}` }).then(res=>{
       setData(res)
@@ -61,9 +83,9 @@ export default withLayout((props) => {
             </view>
             <view className="Node"></view>
             {data.remark}
-            <view className="Share">
+            <button className="Share" openType="share">
               <text>分享好友</text>
-            </view>
+            </button>
           </view>
         </view>
       </ScrollView>