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

src/components/Chart/index.jsx

@@ -1,4 +1,4 @@
-import React, { useEffect, useRef, useMemo } from 'react'
+import React, { useEffect, useState, useMemo } from 'react'
 import * as echarts from '@/native/ec-canvas/echarts';
 
 function initChart(canvas, width, height, dpr) {
@@ -13,22 +13,24 @@ function initChart(canvas, width, height, dpr) {
 
 export default (props) => {
   const { options } = props
-  const chartRef = useRef()
+  
+  const [chart, setChart] = useState()
+
   const ec = useMemo(() => {
     const onInit = (...args) => {
-      const chart = initChart(...args)
-      chartRef.current = chart
-      return chart
+      const t = initChart(...args)
+      setChart(t)
+      return t
     }
 
     return { onInit }
   }, [])
 
   useEffect(() => {
-    if (options && chartRef.current) {
-      chartRef.current.setOption(options);
+    if (options && chart) {
+      chart.setOption(options);
     }
-  }, [options])
+  }, [options, chart])
 
   return (
     <ec-canvas ec={ec} />

src/pages/mine/partnerChannel/hooks/useChart.js

@@ -4,25 +4,22 @@ import { fillTime, cutDays, cutMonths } from '../utils'
 
 const now = new Date()
 
-export default function useReport(buildingId) {
+export default function useReport() {
   const [statType, setStatType] = useState('day')
   const [custType, setCustType] = useState('new')
   const [chartData, setChartData] = useState([])
 
   useEffect(() => {
-    if (buildingId) {
-      const startDate = statType === 'month' ? cutMonths(now, 6) : cutDays(now, 7)
-      getChannelLineChat({
-        buildingId,
-        type: statType,
-        customerType: custType,
-        startDate: fillTime(startDate.toJSON().substring(0, 10), true),
-        endDate: fillTime(now.toJSON().substring(0, 10), false),
-      }).then((res) => {
-        setChartData(res || [])
-      })
-    }
-  }, [buildingId, statType, custType])
+    const startDate = statType === 'month' ? cutMonths(now, 6) : cutDays(now, 7)
+    getChannelLineChat({
+      type: statType,
+      customerType: custType,
+      startDate: fillTime(startDate.toJSON().substring(0, 10), true),
+      endDate: fillTime(now.toJSON().substring(0, 10), false),
+    }).then((res) => {
+      setChartData(res || [])
+    })
+  }, [statType, custType])
 
   return [statType, setStatType, custType, setCustType, chartData]
 }

src/pages/mine/partnerChannel/hooks/useRank.js

@@ -4,22 +4,19 @@ import { fillTime } from '../utils'
 
 const now = new Date()
 
-export default function useRank(buildingId) {
+export default function useRank() {
   const [rankDateRange, setRankDateRange] = useState([now.toJSON().substring(0, 10), now.toJSON().substring(0, 10)])
   const [rankList, setRankList] = useState([])
 
   useEffect(() => {
-    if (buildingId) {
-      const [startDate, endDate] = rankDateRange
-      getChannelRank({
-        buildingId,
-        startDate: fillTime(startDate, true),
-        endDate: fillTime(endDate, false),
-      }).then((res) => {
-        setRankList(res || [])
-      })
-    }
-  }, [buildingId, rankDateRange])
+    const [startDate, endDate] = rankDateRange
+    getChannelRank({
+      startDate: fillTime(startDate, true),
+      endDate: fillTime(endDate, false),
+    }).then((res) => {
+      setRankList(res || [])
+    })
+  }, [rankDateRange])
 
   return [rankDateRange, setRankDateRange, rankList]
 }

src/pages/mine/partnerChannel/hooks/useReport.js

@@ -4,22 +4,19 @@ import { fillTime } from '../utils'
 
 const now = new Date()
 
-export default function useReport(buildingId) {
+export default function useReport() {
   const [reportDateRange, setReportDateRange] = useState([now.toJSON().substring(0, 10), now.toJSON().substring(0, 10)])
   const [reportInfo, setReportInfo] = useState({})
 
   useEffect(() => {
-    if (buildingId) {
-      const [startDate, endDate] = reportDateRange
-      getChannelStatReport({
-        buildingId,
-        startDate: fillTime(startDate, true),
-        endDate: fillTime(endDate, false),
-      }).then((res) => {
-        setReportInfo(res || {})
-      })
-    }
-  }, [buildingId, reportDateRange])
+    const [startDate, endDate] = reportDateRange
+    getChannelStatReport({
+      startDate: fillTime(startDate, true),
+      endDate: fillTime(endDate, false),
+    }).then((res) => {
+      setReportInfo(res || {})
+    })
+  }, [reportDateRange])
 
   return [reportDateRange, setReportDateRange, reportInfo]
 }

src/pages/mine/partnerChannel/index.jsx

@@ -29,11 +29,9 @@ export default withLayout((props) => {
   
   const [showPicker, setShowPicker] = useState(false)
   const pickerTrigger = useRef()
-  const [buildingId, setBuildingId] = useState()
-  const [buildingList, setBuildingList] = useState([])
-  const [,setRankDateRange, rankList] = useRank(buildingId)
-  const [,setReportDateRange, reportInfo] = useReport(buildingId)
-  const [statType, setStatType, custType, setCustType, chartData] = useChart(buildingId)
+  const [,setRankDateRange, rankList] = useRank()
+  const [,setReportDateRange, reportInfo] = useReport()
+  const [statType, setStatType, custType, setCustType, chartData] = useChart()
 
   const handleMore = () => {
     Taro.navigateTo({ url: '/pages/mine/myCustomer/index' })
@@ -59,16 +57,6 @@ export default withLayout((props) => {
     }
   }
 
-  useEffect(() => {
-    fetch({ url: API_GET_AGENT_BUILDINGS }).then((res) => {
-      const buildings = res || []
-      setBuildingList(buildings)
-      if (buildings.length) {
-        setBuildingId(buildings[0].buildingId)
-      }
-    })
-  }, [])
-
   return (
     <view className='Page partnerChannel'>
       <DateRangePicker visable={showPicker} close={() => setShowPicker(false)} change={handlePickerChange} />