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

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

@@ -1,6 +1,9 @@
 import React, { useState, useEffect } from 'react'
-import './index.scss'
+import { getImgURL } from '@/utils/image'
 import Taro from '@tarojs/taro'
+import { Image } from '@tarojs/components'
+import { formatDate } from '@/utils/chatDate'
+import './index.scss'
 
 export default function MyActivityListItem (props) {
   const { Data = {} } = props
@@ -8,15 +11,12 @@ export default function MyActivityListItem (props) {
   return (
     <view className='components MyActivityListItem' onClick={() => { Taro.navigateTo({ url: `/pages/index/activityDetail/index?id=${Data.id}` }) }}>
       <view className='Img'>
-        {
-          Data.img &&
-          <Image mode='aspectFill' className='centerLabel' src={Data.img || null} />
-        }
+        <Image mode='aspectFill' className='centerLabel' src={getImgURL(Data.listImgUrl) || null} />
       </view>
       <view className='Info'>
-        <text className='Name'>5D沉浸式剧场</text>
-        <text className='Address'>江宁禄口云熙99路号（诚信大道）</text>
-        <text className='Time'>活动时间：2019/10/20 10:00 - 2019/10/22 10:00</text>
+        <text className='Name'>{Data.title}</text>
+        <text className='Address'>{Data.address}</text>
+        <text className='Time'>活动时间：{formatDate(Data.startDate, 'yyyy-MM-dd hh:mm:ss')} - {formatDate(Data.endDate, 'yyyy-MM-dd hh:mm:ss')}</text>
       </view>
     </view>
   )

src/pages/mine/myActivity/index.jsx

@@ -4,7 +4,7 @@ import { ScrollView } from '@tarojs/components'
 import '@/assets/css/iconfont.css'
 import { useSelector } from 'react-redux'
 import { fetch } from '@/utils/request'
-import { API_ACTIVITY_LIST_CUSTOMER } from '@/constants/api'
+import { API_ACTIVITY_LIST } from '@/constants/api'
 import './index.scss'
 import MyActivityListItem from '../components/MyActivityListItem/index'
 
@@ -24,10 +24,8 @@ export default withLayout(() => {
   }, [user])
 
   useEffect(() => {
-    if(PersonId) {
-      GetPageList()
-    }
-  }, [pageNumber, PersonId])
+    GetPageList()
+  }, [pageNumber])
 
   const PageRefresh = () => { // 页面下拉刷新回调
     setPull(true)
@@ -35,7 +33,7 @@ export default withLayout(() => {
 
   const GetPageList = () => {
     setHasNextPage(false)
-    fetch({ url: API_ACTIVITY_LIST_CUSTOMER, method: 'get', payload: { customerId: PersonId, pageNumber, pageSize: 10 } }).then((res) => {
+    fetch({ url: API_ACTIVITY_LIST, method: 'get', payload: { mine: true, pageNumber, pageSize: 10 } }).then((res) => {
       setPageList(pageNumber === 1 ? res.records || [] : PageList.concat(res.records || []))
       setHasNextPage(res.current < res.pages)
       setPull(false)
@@ -67,7 +65,7 @@ export default withLayout(() => {
             {
               PageList.map((item, index) => (
                 <view>
-                  <text>2021-05-23 12:00</text>
+                  {/* <text>2021-05-23 12:00</text> */}
                   <MyActivityListItem Data={item} key={`MyActivityListItem-${index}`}></MyActivityListItem>
                 </view>
               ))

src/subpackages/pages/marketing/residentManager/index.jsx

@@ -113,7 +113,7 @@ export default withLayout((props) => {
       <view className='Search flex-h'>
         <view className='flex-item'>
           <text className='iconfont icon-sousuo'></text>
-          <Input confirm-type='search' placeholder='请输入关键字搜索' onConfirm={SearchConfirm} onscrolltolower={PageLoadMore}></Input>
+          <Input confirm-type='search' placeholder='请输入关键字搜索' onConfirm={SearchConfirm}></Input>
         </view>
         <text>{CurrentBuildingName}</text>
         <picker value={0} range-key='name' onChange={PickerChange} range={BuildingIds}>
@@ -123,7 +123,7 @@ export default withLayout((props) => {
 
       <view className='flex-item'>
         <view>
-          <ScrollView scroll-y refresher-enabled refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} refresher-background='#fff'>
+          <ScrollView scroll-y refresher-enabled refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} onscrolltolower={PageLoadMore} refresher-background='#fff'>
             <view className='PageContent'>
 
               {/* <view className='Filter'>