信息修改

config/dev.js

@@ -3,8 +3,8 @@ module.exports = {
     NODE_ENV: '"development"'
   },
   defineConstants: {
-    HOST: '"https://xlk.njyz.tech"',
-    // HOST: '"https://www.newhousehold.cn"',
+    // HOST: '"https://xlk.njyz.tech"',
+    HOST: '"https://www.newhousehold.cn"',
     // HOST: '"http://127.0.0.1:8567"',
     WSS_HOST: '"wss://www.newhousehold.cn"',
     // WSS_HOST: '"wss://xlk.njyz.tech"',

src/pages/index/buildingList/index.jsx

@@ -147,7 +147,6 @@ export default withLayout((props) => {
     for (let key in e) {
       Data[key] = e[key]
     }
-    console.log(Data)
     setFilterData({...Data})
   }
 

src/pages/index/components/LiveSale/index.jsx

@@ -50,7 +50,7 @@ export default function LiveSale (props) {
             {
               PageList.map((item, index) => (
                 <view className='ListItem' key={`List-${index}`} style={{display: CurrentId === 1 || (CurrentId === 2 && item.kind === 'notice') || (CurrentId === 3 && item.kind === 'live')  || (CurrentId === 4 && item.kind !== 'notice') ? 'inline-block' : 'none'}}>
-                  <Image mode='aspectFill' className='centerLabel' onClick={()=>{Taro.navigateTo({ url: `/pages/video/liveDetail/index?id=${item.id}` })}} src={`${getImgURL(item.images)}`} />
+                  <Image mode='aspectFill' className='centerLabel' onClick={()=>{Taro.navigateTo({ url: `/pages/video/liveDetail/index?id=${item.id}&type=${item.type}` })}} src={`${getImgURL(item.images)}`} />
                 </view>
               ))
             }

src/pages/video/liveDetail/index.jsx

@@ -4,6 +4,8 @@ import { savePoint } from '@/services/common'
 import withLayout from "@/layout";
 import { Image } from "@tarojs/components";
 import { queryLiveDetail } from "@/services/item";
+import { fetch } from '@/utils/request'
+import { API_VIDEO_DETAIL } from '@/constants/api'
 import useParams from "@/utils/hooks/useParams";
 import useShare from "@/utils/hooks/useShare";
 import { getImgURL } from "@/utils/image";
@@ -13,9 +15,10 @@ import "./index.scss";
 
 export default withLayout((props) => {
   const { router, shareContent, trackData, person, page, setNavigationBarTitle } = props;
-  const { id } = router.params;
+  const { id, type } = router.params;
 
   const [data, setData] = useState({})
+  const [CanPlay, setCanPlay] = useState(false)
   // 直播间信息
   const livingRef = useRef()
 
@@ -38,16 +41,24 @@ export default withLayout((props) => {
   );
 
   const getData = () => {
-    queryLiveDetail(id).then(res => {
-      setData(res||{})
-      setNavigationBarTitle(res?.name)
-      if (res?.liveRoomParam) {
-        const { livingid } = JSON.parse(res.liveRoomParam)
-        getLivingCode(livingid).then((liveInfo) => {
-          livingRef.current = liveInfo
-        })
-      }
-    })
+    if(type === 'live') { // 直播
+      queryLiveDetail(id).then(res => {
+        setData(res||{})
+        setNavigationBarTitle(res?.name)
+        if (res?.liveRoomParam) {
+          const { livingid } = JSON.parse(res.liveRoomParam)
+          getLivingCode(livingid).then((liveInfo) => {
+            livingRef.current = liveInfo
+          })
+        }
+      })
+    } else { // 视频
+      fetch({url: `${API_VIDEO_DETAIL}/${id}`, method: 'get'}).then((res) => {
+        setData(res||{})
+        setNavigationBarTitle(res?.name)
+        livingRef.current = res
+      })
+    }
   };
 
   useEffect(() => {
@@ -61,36 +72,46 @@ export default withLayout((props) => {
     }
   }, [trackData, data])
 
-  const handleLive = () => {
-    if (!livingRef.current) {
-      Taro.showToast({
-        title: '查询直播凭证失败, 请退出重试',
-        icon: 'none',
-      })
-      return;
+  const ended = () => {
+    return () => {
+      setCanPlay(false)
     }
+  }
 
-    // https://work.weixin.qq.com/api/doc/90000/90135/93635
-    const { livingCode, status } = livingRef.current
-
-    //
-    if (status >= 3) {
-      Taro.showToast({
-        title: `直播活动已${status === 3 ? '过期' : '取消'}`,
-        icon: 'none',
+  const handleLive = () => {
+    if(type === 'live') {
+      if (!livingRef.current) {
+        Taro.showToast({
+          title: '查询直播凭证失败, 请退出重试',
+          icon: 'none',
+        })
+        return;
+      }
+  
+      // https://work.weixin.qq.com/api/doc/90000/90135/93635
+      const { livingCode, status } = livingRef.current
+  
+      //
+      if (status >= 3) {
+        Taro.showToast({
+          title: `直播活动已${status === 3 ? '过期' : '取消'}`,
+          icon: 'none',
+        })
+        return;
+      }
+  
+      // 如果已经结束的则播放回放
+      const replay = status === 2 ? '&replay=1' : ''
+  
+      // 跳转到直播
+      Taro.navigateToMiniProgram({
+        // 固定跳转到微信企业直播
+        appId: 'wx7424030d69bde86e',
+        path: `pages/watch/index?living_code=${encodeURIComponent(livingCode)}${replay}`,
       })
-      return;
+    } else {
+      setCanPlay(true)
     }
-
-    // 如果已经结束的则播放回放
-    const replay = status === 2 ? '&replay=1' : ''
-
-    // 跳转到直播
-    Taro.navigateToMiniProgram({
-      // 固定跳转到微信企业直播
-      appId: 'wx7424030d69bde86e',
-      path: `pages/watch/index?living_code=${encodeURIComponent(livingCode)}${replay}`,
-    })
   }
 
   useEffect(() => {
@@ -100,13 +121,30 @@ export default withLayout((props) => {
   }, [id]);
   //   
   return <view className="liveDetail">
-    {data.liveActivityId && <><Image mode='aspectFill' src={getImgURL(data.detailTypeImg)} className='liveImg'></Image>
+    {
+      type === 'video' && data.videoUrl && CanPlay &&
+      <view className="myVideo">
+        <video 
+          src={data.videoUrl}
+          enable-danmu 
+          danmu-btn 
+          show-center-play-btn={false}
+          show-play-btn
+          controls
+          autoplay
+          onended={ended()}
+          picture-in-picture-mode={['push', 'pop']}
+          object-fit='contain'
+        ></video>
+      </view>
+    }
+    {(data.liveActivityId || data.videoId) && <><Image mode='aspectFill' src={getImgURL(data.detailTypeImg || data.videImg)} className='liveImg'></Image>
       <view className='liveDetail-menu flex-h'>
         <view className='flex-item'>
           <view onClick={() => { Taro.navigateTo({ url: `/pages/index/buildingDetail/index?id=${data.buildingId}` }) }}><text className="iconfont icon-fenxiang"></text><text>查看楼盘</text></view>
         </view>
         <view className='flex-item'>
-          <view onClick={handleLive}><text className="iconfont icon-camera"></text><text>观看直播</text></view>
+          <view onClick={handleLive}><text className="iconfont icon-camera"></text><text>观看{type === 'live' ? '直播' : '视频'}</text></view>
         </view>
         <view className='flex-item'>
           <button openType="share"><text className="iconfont icon-fenxiang"></text><text>分享好友</text></button>

src/pages/video/liveDetail/index.scss

@@ -40,4 +40,18 @@
       }
     }
   }
+  >.myVideo{
+    width: 100vw;
+    height: 100vh;
+    position: fixed;
+    left: 0;
+    top: 0;
+    bottom: 0;
+    display: block;
+    z-index: 100;
+    >video {
+      width: 100%;
+      height: 100%;
+    }
+  }
 }