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

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"',

project.config.json

@@ -27,7 +27,7 @@
 			"outputPath": ""
 		},
 		"useIsolateContext": true,
-		"useCompilerModule": true,
+		"useCompilerModule": false,
 		"userConfirmedUseCompilerModuleSwitch": false
 	},
 	"compileType": "miniprogram",

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

@@ -35,6 +35,16 @@ export default function LiveSale (props) {
     }
   }
 
+  const toDetail = (item) => {
+    return () => {
+      if(item.type === 'live') {
+        Taro.navigateTo({ url: `/pages/video/liveDetail/index?id=${item.id}&type=${item.type}` })
+      } else {
+        Taro.navigateTo({ url: `/pages/video/videoDetail/index?id=${item.id}` })
+      }
+    }
+  }
+
   return (
     <view className='components LiveSale'>
       <view>
@@ -50,7 +60,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={toDetail(item)} src={`${getImgURL(item.images)}`} />
                 </view>
               ))
             }

src/pages/index/helpToFindHouse/index.jsx

@@ -59,6 +59,7 @@ export default withLayout((props) => {
 
         params.push({ ...item, key: 'minPrice', result: CurrentDemandId === 2 ? min : min * 10000 })
         params.push({ ...item, key: 'maxPrice', result: CurrentDemandId === 2 ? max : max * 10000 })
+        params.push({ ...item, key: 'price', result: CurrentDemandId === 2 ? price : price * 10000 })
       } else {
         if (CurrentDemandId === 1) {
           if (item.key === 'area') {

src/pages/mine/components/EditUserDetailBasicInfo/index.jsx

@@ -1,7 +1,7 @@
 import { useState, useEffect } from 'react'
 import { ScrollView, Input, Picker } from '@tarojs/components'
 import { fetch } from '@/utils/request'
-import { API_SAVE_CUSTOMER_INFO } from '@/constants/api'
+import { API_RECOMMEND_EDIT } from '@/constants/api'
 import Taro from '@tarojs/taro'
 import './index.scss'
 
@@ -37,7 +37,7 @@ export default function EditUserDetailBasicInfo (props) {
 
   const ToSubmit = () => {
     let params = { ...FormData, customerId: CustomerId }
-    let url = Data.customerId ? `${API_SAVE_CUSTOMER_INFO}/${Data.customerId}` : API_SAVE_CUSTOMER_INFO
+    let url = Data.customerId ? `${API_RECOMMEND_EDIT}/${Data.customerId}` : API_RECOMMEND_EDIT
     fetch({ url, method: Data.customerId ? 'put' : 'post', payload: params }).then(() => {
       Taro.showToast({ title: '修改成功', icon: 'none', duration: 2000 })
       close()

src/pages/mine/customerDetail/index.jsx

@@ -85,7 +85,9 @@ export default withLayout((props) => {
     if (CustomerId) {
       UpdateCustomerInfo()
 
-      getCustomerDetail(CustomerId).then((res) => setCustBaseInfo(res || {}))
+      getCustomerDetail(CustomerId).then((res) => {
+        setCustBaseInfo(res || {})
+      })
     }
   }, [CustomerId])
 
@@ -148,7 +150,7 @@ export default withLayout((props) => {
           {/* 基本信息 */}
           {
             CurrentMenuId === 1 &&
-            <UserDetailBasicInfo CustomerId={CustomerId} CustomerInfo={CustomerInfo} AddFollow={AddFollow} Update={UpdateCustomerInfo}></UserDetailBasicInfo>
+            <UserDetailBasicInfo CustomerId={CustomerId} CustomerInfo={{...CustomerInfo, ...custBaseInfo}} AddFollow={AddFollow} Update={UpdateCustomerInfo}></UserDetailBasicInfo>
           }
 
           {/* 访问记录 */}

src/pages/video/index.jsx

@@ -34,11 +34,16 @@ export default withLayout((props) => {
 
 
   const GetLiveList = (params) => {
-    if (['all', 'new'].indexOf(CurrnetMenuId) > -1) {
-      // 全部与新房用的一个接口
+    if (['all'].indexOf(CurrnetMenuId) > -1) {
+      // 全部
       fetch({ url: API_LIVE_LIST, payload: { ...params, cityId: city.id }, spin: true }).then((res) => {
         setPageList(res.records || [])
       })
+    } else if (['new'].indexOf(CurrnetMenuId) > -1) {
+      // 新房
+      fetch({ url: API_LIVE_LIST, payload: { ...params, cityId: city.id, newHouse: true }, spin: true }).then((res) => {
+        setPageList(res.records || [])
+      })
     } else if (['notice', 'live'].indexOf(CurrnetMenuId) > -1) {
       // 预告与直播是虽然是同一个接口, 但是返回值字段不一样
       const process = 'notice' === CurrnetMenuId ? 1 : 2;

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%;
+    }
+  }
 }

src/subpackages/pages/consultant/components/FollowCustomer/index.jsx

@@ -26,7 +26,8 @@ export default function FollowCustomer () {
     { name: '7天未成交', id: 7 },
     { name: '15天未成交', id: 15 }
   ])
-  const [FormData, setFormData] = useState({name: '', status: 0, day: 1})
+  const [TimeMenuId, setTimeMenuId] = useState(1)
+  const [FormData, setFormData] = useState({name: '', status: 0, startReportDate: '', endReportDate: ''})
 
   useEffect(() => {
     GetPageList()
@@ -59,9 +60,23 @@ export default function FollowCustomer () {
     }
   }
 
+  const DateFormat = (date) => {
+      const Year = new Date(date).getFullYear()
+      const Month = new Date(date).getMonth() + 1
+      const Day = new Date(date).getDate()
+      return `${Year}-${Month > 9 ? Month : `0${Month}`}-${Day > 9 ? Day : `0${Day}`}`
+  }
+
   const CutTime = (item) => {
     return () => {
-      setFormData({...FormData, day: item.id})
+      let params = {}
+      if(item.id - 0 !== 1) {
+        params = {...FormData, startReportDate: DateFormat(Date.now() - 1000 * 60 * 60 * 24 * (item.id - 0)), endReportDate: DateFormat(Date.now())}
+      } else {
+        params = {...FormData, startReportDate: '', endReportDate: ''}
+      }
+      setFormData(params)
+      setTimeMenuId(item.id)
     }
   }
 
@@ -120,7 +135,7 @@ export default function FollowCustomer () {
                 <view key={`TimeItem-${index}`} onClick={CutTime(item)}>
                   <text>{item.name}</text>
                   {
-                    FormData.day === item.id &&
+                    TimeMenuId === item.id &&
                     <Image mode='widthFix' src={require('@/assets/findHouse-icon1.png')}></Image>
                   }
                 </view>

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

@@ -2,9 +2,8 @@ import { useState, useEffect } from 'react'
 import withLayout from '@/layout'
 import '@/assets/css/iconfont.css'
 import { ScrollView } from '@tarojs/components'
-import { useSelector } from 'react-redux'
 import { fetch } from '@/utils/request'
-import { API_SEX_INFO, API_ECHERTS_DAILY } from '@/constants/api'
+import { API_SEX_INFO, API_ECHERTS_DAILY, API_ECHERTS_MONTH } from '@/constants/api'
 import LineChart from './components/LineChart'
 // import dayjs from 'dayjs'
 import './index.scss'
@@ -33,13 +32,15 @@ export default withLayout((props) => {
   const [source, setSource] = useState([])
 
   useEffect(() => {
-    setChartList([])
-    GetSexInfo()
-    GetChartInfo()
-  }, [CurrentMenuId])
+    if (CurrentChartMenuId && CurrentMenuId) {
+      setChartList([])
+      GetSexInfo()
+      GetChartInfo()
+    }
+  }, [CurrentChartMenuId, CurrentMenuId])
 
   useEffect(() => {
-    if(!ChartList.length) {
+    if (!ChartList.length) {
       GetChartInfo()
     } else {
       // const chart = echarts.init(canvas, null, { width: '100%', height: '100%' })
@@ -61,7 +62,7 @@ export default withLayout((props) => {
   }
 
   const GetChartInfo = () => {
-    fetch({ url: `${API_ECHERTS_DAILY}/${CurrentMenuId === 1 ? 'new' : CurrentMenuId === 2 ? 'follow' : 'visite'}`, method: 'get' }).then((res) => {
+    fetch({ url: `${CurrentChartMenuId === 1 ? API_ECHERTS_DAILY : API_ECHERTS_MONTH}/${CurrentMenuId === 1 ? 'new' : CurrentMenuId === 2 ? 'follow' : 'visite'}`, method: 'get' }).then((res) => {
       const Arr = (res || []).reverse()
       setChartList(Arr.map(x => ({ name: x.day, value: x.customerNum })))
       setSource(Arr)