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

src/pages/index/buildingDetail/index.jsx

@@ -53,6 +53,7 @@ export default withLayout((props) => {
         ...trackData,
         event: 'detail',
         eventType: 'building',
+        buildingId: id,
         targetType: 'building'
       })
       addItemUv(id)

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_RECOMMEND_EDIT } from '@/constants/api'
+import { API_RECOMMEND_EDIT, API_GET_CUSTOMER_INFO } 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_RECOMMEND_EDIT}/${Data.customerId}` : API_RECOMMEND_EDIT
+    let url = Data.customerId ? `${API_GET_CUSTOMER_INFO}/${Data.customerId}` : API_GET_CUSTOMER_INFO
     fetch({ url, method: Data.customerId ? 'put' : 'post', payload: params }).then(() => {
       Taro.showToast({ title: '修改成功', icon: 'none', duration: 2000 })
       close()

src/subpackages/pages/channel/partnerChannel/hooks/useReport.js

@@ -5,7 +5,7 @@ import { fillTime } from '../utils'
 const now = new Date()
 
 export default function useReport() {
-  const [reportDateRange, setReportDateRange] = useState([now.toJSON().substring(0, 10), now.toJSON().substring(0, 10)])
+  const [reportDateRange, setReportDateRange] = useState([new Date(Date.now() - 6 * 24 * 60 * 60 * 1000).toJSON().substring(0, 10), now.toJSON().substring(0, 10)])
   const [reportInfo, setReportInfo] = useState({})
 
   useEffect(() => {

src/subpackages/pages/channel/partnerChannel/index.jsx

@@ -11,6 +11,7 @@ import useReport from './hooks/useReport'
 import useChart from './hooks/useChart'
 // import '@/assets/css/iconfont.css'
 import './index.scss'
+import { fillTime, cutDays, cutMonths } from './utils'
 
 const statTypeDicts = [
   {name: '按天', id: 'day'},
@@ -61,6 +62,14 @@ export default withLayout((props) => {
     }
   }
 
+  const SortChange = (e) => {
+    setStatType(e)
+    const num = e === 'month' ? 6 : 7
+    const now = new Date()
+    const startDate = e === 'month' ? cutMonths(now, num) : cutDays(now, num)
+    setReportDateRange([fillTime(startDate.toJSON().substring(0, 10), true), fillTime(now.toJSON().substring(0, 10), false)])
+  }
+
   const [tp1 = {}, tp2 = {}, tp3 = {}] = rankList||[]
 
   return (
@@ -166,7 +175,7 @@ export default withLayout((props) => {
                 <text className='iconfont icon-sanjiaoxingdown'></text>
               </view>
               <view className='Sort'>
-                <Picker kv={['name', 'id']} dicts={statTypeDicts} value={statType} onChange={setStatType} />
+                <Picker kv={['name', 'id']} dicts={statTypeDicts} value={statType} onChange={SortChange} />
                 <text className='iconfont icon-sanjiaoxingdown'></text>
               </view>
             </view>