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

src/pages/video/liveDetail/index.jsx

 
 export default withLayout((props) => {
   const { id } = props.router.params;
+
+  const [data,setData] = useState({})
 console.log(id,'queryLiveDetail')
   const getData = () => {
-    // queryLiveDetail(id)
+    queryLiveDetail(id).then(res=>{
+        setData(res)
+    })
   };
 
   useEffect(() => {
   }, [id]);
 //   
   return <view className="liveDetail">
-       <Image mode='aspectFill' src={getImgURL('/file/20210708/7b268641-9990-4a62-ba1f-0e02d067d524.jpg')} className='liveImg'></Image>
+       {data.liveActivityId&&<><Image mode='aspectFill' src={getImgURL(data.detailTypeImg)} className='liveImg'></Image>
        <view className='liveDetail-menu'>
-           <view><text className="iconfont icon-fenxiang"></text><text>查看楼盘</text></view>
+           <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>
-       </view>
+       </view></>}
   </view>;
 });

src/services/item.js

   API_GOODS_BUILDING,
   API_GOODS_LIST,
   API_LIVE_DEATIL,
-  API_ADDLIVE_NUM
+  API_ADDLIVE_NUM,
+  API_LIVE_LIST,
 } from '@/constants/api'
 
 /**
  * 直播页详情
  * @param {*} id 
  */
-export const queryLiveDetail = (id, payload, header) => fetch({ url: `${API_LIVE_DEATIL}/${id}`, payload, header })
+export const queryLiveDetail = (id, payload, header) => fetch({ url: `${API_LIVE_LIST}/${id}`, payload, header })
 
 /**
  * 项目详情直播列表