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

src/constants/api.js

@@ -274,3 +274,6 @@ export const API_BRAND_INFO = resolvePath('brand')
 //特价房
 export const API_BUILDINGSPECIALROOM_LIST = resolvePath('buildingSpecialRoom')
 export const API_BUILDINGSPECIALROOM_BUILDING_LIST = resolvePath('buildingSpecialRoom/building')
+
+// video
+export const API_VIDEO_DETAIL = resolvePath('detail')

src/pages/mine/addCustomer/index.jsx

@@ -61,6 +61,13 @@ export default withLayout((props) => {
       } else {
         params = { ...FormData, sex: SexId, intention: BuildingId, realtyConsultant: CardId }
       }
+      if(type === 'estateAgent') {
+        params.channelCustomerId = PersonId
+        params.channelId = user.userInfo.person.channelId
+        params.buildingId = BuildingId
+        params.orgId = `${user.userInfo.person.orgId}`
+        params.personId = PersonId
+      }
       fetch({ url, method: 'post', payload: params }).then(() => {
         Taro.showToast({ title: '添加成功', icon: 'none', duration: 2000 })
         setTimeout(() => {

src/pages/mine/tabData.js

@@ -21,7 +21,7 @@ const MineMenuList = {
   ],
   Broker: [ // 经纪人
     [
-      { name: '报备客户', icon: require('../../assets/mine-icon1.png'), router: '/pages/mine/addCustomer/index' },
+      { name: '报备客户', icon: require('../../assets/mine-icon1.png'), router: '/pages/mine/addCustomer/index?type=estateAgent' },
       { name: '合作渠道', icon: require('../../assets/mine-icon3.png'), router: '/pages/mine/partnerChannel/index' }
     ],
     [

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

@@ -1,11 +1,23 @@
+import Taro from '@tarojs/taro'
 import { getImgURL } from '@/utils/image'
 import { Image } from '@tarojs/components'
 import './index.scss'
 
 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{
+      Taro.navigateTo({ url: `/pages/video/liveDetail/index?id=${Data.id}` })
+    }
+    // 
+  }
+  // onClick={()=>{}
   return (
-    <view className='components VideoListItem'>
+    <view className='components VideoListItem' onClick={()=>toDetail()}>
       <view className='Img'>
         <view>
           <Image mode='aspectFill' className='centerLabel' src={getImgURL(Data.images) || null} />

src/pages/video/videoDetail/index.jsx

@@ -1,44 +1,74 @@
+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 getDateFormat from "@/utils/chatDate";
 
-import withLayout from '@/layout'
-import { ScrollView } from '@tarojs/components'
-import '@/assets/css/iconfont.css'
-import './index.scss'
+export default withLayout((props) => {
+  const { id } = props.router.params;
 
-export default withLayout(() => {
+  const [data, setData] = useState({});
+  console.log(id, "queryLiveDetail");
+  const getData = () => {
+    fetch({ url: `${API_VIDEO_DETAIL}/${id}` }).then(res=>{
+      setData(res)
+    });
+  };
+
+  useEffect(() => {
+    if (id) {
+      getData();
+    }
+  }, [id]);
 
   return (
-    <view className='Page videoDetail'>
+    <view className="Page videoDetail">
       <ScrollView scroll-y>
-        <view className='Content'>
-
+        <view className="Content">
           {/* 视频 */}
-          <view className='VideoContainer'>
-            <view>
-
-            </view>
+          <view className="VideoContainer">
+            <video
+              id="myVideo"
+              src={data.videoUrl}
+              // binderror="videoErrorCallback"
+              // danmu-list="{{danmuList}}"
+              // enable-danmu
+              // danmu-btn
+              // show-center-play-btn='{{false}}'
+              // show-play-btn="{{true}}"
+              // controls
+              // picture-in-picture-mode="{{['push', 'pop']}}"
+              // bindenterpictureinpicture='bindVideoEnterPictureInPicture'
+              // bindleavepictureinpicture='bindVideoLeavePictureInPicture'
+            ></video>
           </view>
 
           {/* 视频信息 */}
-          <view className='Info'>
-            <text className='Name'>视频看好房，直播抢优惠！</text>
-            <text className='Time'>时间：2021年7月6日  13:00</text>
+          <view className="Info">
+            <text className="Name">{data.name}</text>
+            <text className="Time">时间：{getDateFormat(
+            new Date(data.createdTime).valueOf(),
+            true,
+            'yyyy年M月d日'
+          )}</text>
           </view>
 
           {/* 详情 */}
-          <view className='Detail'>
-            <view className='Title'>
+          <view className="Detail">
+            <view className="Title">
               <text>视频详情</text>
             </view>
-            <view className='Node'>
-
-            </view>
-            <view className='Share'>
+            <view className="Node"></view>
+            {data.remark}
+            <view className="Share">
               <text>分享好友</text>
             </view>
           </view>
-
         </view>
       </ScrollView>
     </view>
-  )
-})
+  );
+});

src/pages/video/videoDetail/index.scss

@@ -15,7 +15,7 @@
         position: relative;
         overflow: hidden;
         background: #eee;
-        >view {
+        >video {
           width: 100%;
           position: absolute;
           left: 0;