1002884655 4 gadus atpakaļ
vecāks
revīzija
e11ac8c363

+ 1
- 1
project.config.json Parādīt failu

@@ -27,7 +27,7 @@
27 27
 			"outputPath": ""
28 28
 		},
29 29
 		"useIsolateContext": true,
30
-		"useCompilerModule": false,
30
+		"useCompilerModule": true,
31 31
 		"userConfirmedUseCompilerModuleSwitch": false
32 32
 	},
33 33
 	"compileType": "miniprogram",

+ 75
- 0
src/components/ScrollPageRefresh/index.jsx Parādīt failu

@@ -0,0 +1,75 @@
1
+import React, { useState, useEffect } from 'react'
2
+import request, { apis } from '@/utils/request'
3
+import ScrollPage from '@/components/ScrollPage/index'
4
+import '@/assets/css/reset.less'
5
+import '@/assets/css/iconfont.less'
6
+import './index.less'
7
+
8
+export default function ScrollPageRefresh (props) {
9
+
10
+  const { ApiName = '', ListName = 'records', RequestParams = {}, RequestData = null, RequestUrlData = null, PageSize = 10, Refresh = () => { }, Push = () => { } } = props
11
+  const [IsPullUp, setIsPullUp] = useState(false)
12
+  const [IsPullDown, setIsPullDown] = useState(false)
13
+  const [HasNextPage, setHasNextPage] = useState(true)
14
+  const [PageNum, setPageNum] = useState(1)
15
+
16
+  useEffect(() => {
17
+    GetPageList(() => {
18
+      setIsPullDown(false)
19
+      setIsPullUp(false)
20
+    })
21
+  }, [PageNum])
22
+
23
+  const GetPageList = (done = () => { }) => { // 获取列表
24
+    let RequestBody = {
25
+      ...apis[ApiName],
26
+      params: { ...RequestParams, pageNum: PageNum, pageSize: PageSize }
27
+    }
28
+    if (RequestData !== null) {
29
+      RequestBody.data = { ...RequestData }
30
+    }
31
+    if (RequestUrlData !== null) {
32
+      RequestBody.args = { ...RequestUrlData }
33
+    }
34
+    request({ ...RequestBody }).then((res) => {
35
+      if (PageNum === 1) {
36
+        Refresh([...res[ListName]])
37
+      } else {
38
+        Push([...res[ListName]])
39
+      }
40
+      setHasNextPage(res.current - 0 < res.pages - 0)
41
+      done()
42
+    }).catch(() => {
43
+      done()
44
+    })
45
+  }
46
+
47
+  const OnRefresh = () => { // 页面下拉刷新
48
+    setIsPullDown(true)
49
+    setPageNum(1)
50
+    if (PageNum === 1) {
51
+      GetPageList(() => {
52
+        setIsPullDown(false)
53
+      })
54
+    } else {
55
+      setPageNum(1)
56
+    }
57
+  }
58
+
59
+  const OnPullUp = () => {
60
+    if (HasNextPage) {
61
+      setIsPullUp(true)
62
+      setPageNum(PageNum + 1)
63
+    }
64
+  }
65
+
66
+  return (
67
+    <view className='ScrollPageRefresh'>
68
+      <ScrollPage OnRefresh={OnRefresh} IsPullUp={IsPullUp} IsPullDown={IsPullDown} OnPullUp={OnPullUp} HasMore={HasNextPage}>
69
+        {
70
+          props.children
71
+        }
72
+      </ScrollPage>
73
+    </view>
74
+  )
75
+}

+ 5
- 0
src/components/ScrollPageRefresh/index.less Parādīt failu

@@ -0,0 +1,5 @@
1
+.ScrollPageRefresh {
2
+  width: 100%;
3
+  height: 100%;
4
+  position: relative;
5
+}

+ 8
- 45
src/components/WuYeGongGao/index.jsx Parādīt failu

@@ -1,8 +1,7 @@
1
-import React, { useState, useEffect } from 'react'
2
-import request, { apis } from '@/utils/request'
1
+import React, { useState } from 'react'
3 2
 import { useModel } from '@/store'
4 3
 import WuYeGongGaoItem from '@/components/WuYeGongGaoItem/index'
5
-import ScrollPage from '@/components/ScrollPage/index'
4
+import ScrollPageRefresh from '@/components/ScrollPageRefresh/index'
6 5
 import '@/assets/css/reset.less'
7 6
 import '@/assets/css/iconfont.less'
8 7
 import './index.less'
@@ -10,55 +9,19 @@ import './index.less'
10 9
 export default function WuYeGongGao () {
11 10
 
12 11
   const { user } = useModel('user')
13
-  const [IsPullUp, setIsPullUp] = useState(false)
14
-  const [IsPullDown, setIsPullDown] = useState(false)
15
-  const [HasNextPage, setHasNextPage] = useState(true)
16
-  const [PageNum, setPageNum] = useState(1)
17 12
   const [PageList, setPageList] = useState([])
18 13
 
19
-  useEffect(() => {
20
-    GetPageList(() => {
21
-      setIsPullUp(false)
22
-    })
23
-  }, [PageNum])
24
-
25
-  const GetPageList = (done = () => { }) => { // 获取列表
26
-    request({ ...apis.getGongGaoList, args: { orgId: user.orgId }, params: { pageNum: PageNum, pageSize: 10 } }).then((res) => {
27
-      if (PageNum === 1) {
28
-        setPageList([...res.records])
29
-      } else {
30
-        setPageList(PageList.concat([...res.records]))
31
-      }
32
-      setHasNextPage(res.current - 0 < res.pages - 0)
33
-      done()
34
-    }).catch(() => {
35
-      done()
36
-    })
37
-  }
38
-
39
-  const OnRefresh = () => { // 页面下拉刷新
40
-    setIsPullDown(true)
41
-    setHasNextPage(true)
42
-    setPageNum(1)
43
-    if (PageNum === 1) {
44
-      GetPageList(() => {
45
-        setIsPullDown(false)
46
-      })
47
-    } else {
48
-      setPageNum(1)
49
-    }
14
+  const Refresh = (e) => { // 下拉刷新
15
+    setPageList(e)
50 16
   }
51 17
 
52
-  const OnPullUp = () => {
53
-    if (HasNextPage) {
54
-      setIsPullUp(true)
55
-      setPageNum(PageNum + 1)
56
-    }
18
+  const Push = (e) => { // 上拉加载
19
+    setPageList(PageList.concat(e))
57 20
   }
58 21
 
59 22
   return (
60 23
     <view className='WuYeGongGao'>
61
-      <ScrollPage IsPullDown={IsPullDown} IsPullUp={IsPullUp} HasMore={HasNextPage} OnRefresh={OnRefresh} OnPullUp={OnPullUp}>
24
+      <ScrollPageRefresh ApiName={`getGongGaoList`} RequestUrlData={{ orgId: user.orgId }} Refresh={Refresh} Push={Push}>
62 25
 
63 26
         {/* 大图 */}
64 27
         <view className='BigImg'>
@@ -76,7 +39,7 @@ export default function WuYeGongGao () {
76 39
           }
77 40
         </view>
78 41
 
79
-      </ScrollPage>
42
+      </ScrollPageRefresh>
80 43
     </view>
81 44
   )
82 45
 }

+ 23
- 31
src/components/WuYeGongGaoItem/index.jsx Parādīt failu

@@ -1,39 +1,31 @@
1
-import React, { Component } from 'react'
1
+import React, { useState } from 'react'
2 2
 import Taro from '@tarojs/taro'
3
-import '../../assets/css/reset.less'
4
-import '../../assets/css/iconfont.less'
3
+import toolclass from '@/utils/toolclass.js'
4
+import { RichText } from '@tarojs/components'
5
+import '@/assets/css/reset.less'
6
+import '@/assets/css/iconfont.less'
5 7
 import './index.less'
6 8
 
7
-export default class WuYeGongGaoItem extends Component {
9
+export default function WuYeGongGaoItem (props) {
8 10
 
9
-  componentWillMount () { }
11
+  const { Data = {} } = props
10 12
 
11
-  componentDidMount () { }
12
-
13
-  componentWillUnmount () { }
14
-
15
-  componentDidShow () { }
16
-
17
-  componentDidHide () { }
18
-
19
-  render () {
20
-    return (
21
-      <view className='WuYeGongGaoItem' onClick={() => { Taro.navigateTo({ url: '/pages/WuYe/GongGaoDetail/index?id=1' }) }}>
22
-        <view className='Title flex-h'>
23
-          <text className='flex-item'>处理绿化带种菜公告</text>
24
-          <text>2020/06/08</text>
25
-        </view>
26
-        <view className='GaoItemContent'>
27
-          <text>为了小区能有一个舒适、温馨、绿化美好的居住环境,请各位业主不要在绿化带内种菜。对于这种种树种花...</text>
28
-          <view className='flex-h'>
29
-            <text>孙琪琪</text>
30
-            <text>物业</text>
31
-            <view className='flex-item'></view>
32
-            <text className='iconfont iconguankan'></text>
33
-            <text>1234人观看</text>
34
-          </view>
13
+  return (
14
+    <view className='WuYeGongGaoItem' onClick={() => { Taro.navigateTo({ url: `/pages/WuYe/GongGaoDetail/index?id=${Data.id}` }) }}>
15
+      <view className='Title flex-h'>
16
+        <text className='flex-item'>{Data.announcementTitle}</text>
17
+        <text>{toolclass.FormatDate(Data.createDate, 'YY:MM:DD')}</text>
18
+      </view>
19
+      <view className='GaoItemContent'>
20
+        <RichText nodes={Data.announcementContent}></RichText>
21
+        <view className='flex-h'>
22
+          <text>{Data.createUser}</text>
23
+          <text>物业</text>
24
+          <view className='flex-item'></view>
25
+          <text className='iconfont iconguankan'></text>
26
+          <text>{Data.viewCount}人观看</text>
35 27
         </view>
36 28
       </view>
37
-    )
38
-  }
29
+    </view>
30
+  )
39 31
 }

+ 2
- 0
src/components/WuYeGongGaoItem/index.less Parādīt failu

@@ -40,6 +40,8 @@
40 40
     >.flex-h {
41 41
       align-items: center;
42 42
       margin-top: 20px;
43
+      position: relative;
44
+      overflow: hidden;
43 45
 
44 46
       >text {
45 47
         font-size: 24px;

+ 2
- 1
src/pages/HuoDong/ZiXunDetail/index.jsx Parādīt failu

@@ -2,6 +2,7 @@ import React, { useState, useEffect } from 'react'
2 2
 import Taro, { Current } from '@tarojs/taro'
3 3
 import request, { apis } from '@/utils/request'
4 4
 import { RichText } from '@tarojs/components'
5
+import toolclass from '@/utils/toolclass.js'
5 6
 import '@/assets/css/reset.less'
6 7
 import '@/assets/css/iconfont.less'
7 8
 import './index.less'
@@ -35,7 +36,7 @@ export default function ZiXunDetail (props) {
35 36
             <text>{NewsDetail.newsName}</text>
36 37
           </view>
37 38
           <view className='flex-h'>
38
-            <text className='flex-item'>{NewsDetail.createDate}</text>
39
+            <text className='flex-item'>{toolclass.FormatDate(NewsDetail.createDate)}</text>
39 40
             <text className='iconfont iconguankan'></text>
40 41
             <text>{NewsDetail.pvNum || 0}</text>
41 42
           </view>

+ 26
- 91
src/pages/HuoDong/index.jsx Parādīt failu

@@ -1,106 +1,39 @@
1
-import React, { useState, useEffect } from 'react'
1
+import React, { useState } from 'react'
2 2
 import TabPageCutNav from '@/components/TabPageCutNav/index'
3 3
 import NavHeader from '@/components/NavHeader/index'
4 4
 import ActivityListItem from '@/components/ActivityListItem/index'
5 5
 import NewsListItem from '@/components/NewsListItem/index'
6
-import ScrollPage from '@/components/ScrollPage/index'
7
-import request, { apis } from '@/utils/request'
6
+import ScrollPageRefresh from '@/components/ScrollPageRefresh/index'
8 7
 import '@/assets/css/reset.less'
9 8
 import '@/assets/css/iconfont.less'
10 9
 import './index.less'
11 10
 
12
-export default function HuoDong (props) {
11
+export default function HuoDong () {
13 12
 
14 13
   const [NavList] = useState([{ name: '活动', id: 1 }, { name: '资讯', id: 2 }])
15 14
   const [CurrentNavId, setCurrentNavId] = useState(1)
16
-  const [IsPullDown, setIsPullDown] = useState(false)
17
-  const [IsPullUp, setIsPullUp] = useState(false)
18
-  const [HasNextPage, setHasNextPage] = useState(true)
19
-  const [PageNum, setPageNum] = useState(1)
20 15
   const [ActivityList, setActivityList] = useState([])
21
-  const [ActivityTotal, setActivityTotal] = useState(1)
22 16
   const [NewsList, setNewsList] = useState([])
23 17
 
24
-  useEffect(() => {
25
-    if (CurrentNavId === 1) { // 活动
26
-      GetActivityList(() => {
27
-        setIsPullUp(false)
28
-      })
29
-    } else if (CurrentNavId === 2) { // 资讯
30
-      GetNewsList(() => {
31
-        setIsPullUp(false)
32
-      })
18
+  const Refresh = (e) => { // 下拉刷新
19
+    if (CurrentNavId === 1) {
20
+      setActivityList(e)
21
+    } else {
22
+      setNewsList(e)
33 23
     }
34
-  }, [PageNum])
35
-
36
-  useEffect(() => {
37
-    setHasNextPage(ActivityTotal > ActivityList.length)
38
-  }, [ActivityList])
39
-
40
-  useEffect(() => {
41
-    OnRefresh()
42
-  }, [CurrentNavId])
43
-
44
-  const GetActivityList = (done = () => { }) => { // 获取活动列表
45
-    request({ ...apis.getActivityList, params: { pageNum: PageNum, pageSize: 6 } }).then((res) => {
46
-      setActivityTotal(res.total)
47
-      if (PageNum === 1) {
48
-        setActivityList([...res.list])
49
-      } else {
50
-        setActivityList(NewsList.concat([...res.list]))
51
-      }
52
-      done()
53
-    }).catch(() => {
54
-      done()
55
-    })
56 24
   }
57 25
 
58
-  const GetNewsList = (done = () => { }) => { // 获取资讯列表
59
-    request({ ...apis.getNewsList, params: { pageNum: PageNum, pageSize: 6 } }).then((res) => {
60
-      if (PageNum === 1) {
61
-        setNewsList([...res.records])
62
-      } else {
63
-        setNewsList(NewsList.concat([...res.records]))
64
-      }
65
-      setHasNextPage(res.current - 0 < res.pages - 0)
66
-      done()
67
-    }).catch(() => {
68
-      done()
69
-    })
26
+  const Push = (e) => { // 上拉加载
27
+    if (CurrentNavId === 1) {
28
+      setActivityList(ActivityList.concat(e))
29
+    } else {
30
+      setNewsList(NewsList.concat(e))
31
+    }
70 32
   }
71 33
 
72 34
   const NavChange = (e) => { // nav切换
73 35
     return () => {
74 36
       setCurrentNavId(e.id)
75
-      setHasNextPage(true)
76
-      setIsPullDown(false)
77
-      setIsPullUp(false)
78
-      setPageNum(1)
79
-    }
80
-  }
81
-
82
-  const OnRefresh = () => { // 下拉刷新
83
-    setIsPullDown(true)
84
-    setHasNextPage(true)
85
-    if (PageNum === 1) {
86
-      if (CurrentNavId === 1) {
87
-        GetActivityList(() => {
88
-          setIsPullDown(false)
89
-        })
90
-      } else if (CurrentNavId === 2) {
91
-        GetNewsList(() => {
92
-          setIsPullDown(false)
93
-        })
94
-      }
95
-    } else {
96
-      setPageNum(1)
97
-    }
98
-  }
99
-
100
-  const OnPullUp = () => { // 上拉加载
101
-    if (HasNextPage) {
102
-      setIsPullUp(true)
103
-      setPageNum(PageNum + 1)
104 37
     }
105 38
   }
106 39
 
@@ -110,10 +43,10 @@ export default function HuoDong (props) {
110 43
       <TabPageCutNav List={NavList} CurrentNavId={CurrentNavId} NavChange={NavChange}></TabPageCutNav>
111 44
       <view className='flex-item'>
112 45
         <view>
113
-          <ScrollPage OnRefresh={OnRefresh} IsPullDown={IsPullDown} OnPullUp={OnPullUp} IsPullUp={IsPullUp} HasMore={HasNextPage}>
114
-            {/* 活动 */}
115
-            {
116
-              CurrentNavId - 0 === 1 &&
46
+          {/* 活动 */}
47
+          {
48
+            CurrentNavId - 0 === 1 &&
49
+            <ScrollPageRefresh ApiName={`getActivityList`} ListName={`list`} Refresh={Refresh} Push={Push}>
117 50
               <view className='Content Activity'>
118 51
                 {
119 52
                   ActivityList.map((item, index) => (
@@ -123,11 +56,13 @@ export default function HuoDong (props) {
123 56
                   ))
124 57
                 }
125 58
               </view>
126
-            }
59
+            </ScrollPageRefresh>
60
+          }
127 61
 
128
-            {/* 资讯 */}
129
-            {
130
-              CurrentNavId - 0 === 2 &&
62
+          {/* 资讯 */}
63
+          {
64
+            CurrentNavId - 0 === 2 &&
65
+            <ScrollPageRefresh ApiName={`getNewsList`} Refresh={Refresh} Push={Push}>
131 66
               <view className='Content News'>
132 67
                 <view className='BigImg'>
133 68
                   <image mode='aspectFill' src={null} class='centerLabel'></image>
@@ -142,8 +77,8 @@ export default function HuoDong (props) {
142 77
                   }
143 78
                 </view>
144 79
               </view>
145
-            }
146
-          </ScrollPage>
80
+            </ScrollPageRefresh>
81
+          }
147 82
         </view>
148 83
       </view>
149 84
     </view>

+ 8
- 45
src/pages/ShouYe/HuoDong/index.jsx Parādīt failu

@@ -1,62 +1,25 @@
1
-import React, { useState, useEffect } from 'react'
2
-import request, { apis } from '@/utils/request'
1
+import React, { useState } from 'react'
3 2
 import ActivityListItem from '@/components/ActivityListItem/index'
4
-import ScrollPage from '@/components/ScrollPage/index'
3
+import ScrollPageRefresh from '@/components/ScrollPageRefresh/index'
5 4
 import '@/assets/css/reset.less'
6 5
 import '@/assets/css/iconfont.less'
7 6
 import './index.less'
8 7
 
9 8
 export default function ShouYeHuoDong () {
10 9
 
11
-  const [IsPullUp, setIsPullUp] = useState(false)
12
-  const [IsPullDown, setIsPullDown] = useState(false)
13
-  const [HasNextPage, setHasNextPage] = useState(true)
14
-  const [PageNum, setPageNum] = useState(1)
15 10
   const [PageList, setPageList] = useState([])
16 11
 
17
-  useEffect(() => {
18
-    GetPageList(() => {
19
-      setIsPullUp(false)
20
-    })
21
-  }, [PageNum])
22
-
23
-  const GetPageList = (done = () => { }) => { // 获取列表
24
-    request({ ...apis.getActivityList, params: { pageNum: PageNum, pageSize: 6 } }).then((res) => {
25
-      if (PageNum === 1) {
26
-        setPageList([...res.list])
27
-      } else {
28
-        setPageList(PageList.concat([...res.list]))
29
-      }
30
-      setHasNextPage(res.current - 0 < res.pages - 0)
31
-      done()
32
-    }).catch(() => {
33
-      done()
34
-    })
35
-  }
36
-
37
-  const OnRefresh = () => { // 页面下拉刷新
38
-    setIsPullDown(true)
39
-    setHasNextPage(true)
40
-    setPageNum(1)
41
-    if (PageNum === 1) {
42
-      GetPageList(() => {
43
-        setIsPullDown(false)
44
-      })
45
-    } else {
46
-      setPageNum(1)
47
-    }
12
+  const Refresh = (e) => { // 下拉刷新
13
+    setPageList(e)
48 14
   }
49 15
 
50
-  const OnPullUp = () => {
51
-    if (HasNextPage) {
52
-      setIsPullUp(true)
53
-      setPageNum(PageNum + 1)
54
-    }
16
+  const Push = (e) => { // 上拉加载
17
+    setPageList(PageList.concat(e))
55 18
   }
56 19
 
57 20
   return (
58 21
     <view className='ShouYeHuoDong'>
59
-      <ScrollPage IsPullDown={IsPullDown} IsPullUp={IsPullUp} HasMore={HasNextPage} OnRefresh={OnRefresh} OnPullUp={OnPullUp}>
22
+      <ScrollPageRefresh ApiName={`getActivityList`} ListName={`list`} Refresh={Refresh} Push={Push}>
60 23
         <view className='ShouYeHuoDongContent'>
61 24
           {
62 25
             PageList.map((item, index) => (
@@ -66,7 +29,7 @@ export default function ShouYeHuoDong () {
66 29
             ))
67 30
           }
68 31
         </view>
69
-      </ScrollPage>
32
+      </ScrollPageRefresh>
70 33
     </view >
71 34
   )
72 35
 }

+ 11
- 48
src/pages/ShouYe/ZiXun/index.jsx Parādīt failu

@@ -1,72 +1,35 @@
1
-import React, { useState, useEffect } from 'react'
2
-import request, { apis } from '@/utils/request'
1
+import React, { useState } from 'react'
3 2
 import NewsListItem from '@/components/NewsListItem/index'
4
-import ScrollPage from '@/components/ScrollPage/index'
3
+import ScrollPageRefresh from '@/components/ScrollPageRefresh/index'
5 4
 import '@/assets/css/reset.less'
6 5
 import '@/assets/css/iconfont.less'
7 6
 import './index.less'
8 7
 
9
-export default function ShouYeZiXun (props) {
8
+export default function ShouYeZiXun () {
10 9
 
11
-  const [IsPullUp, setIsPullUp] = useState(false)
12
-  const [IsPullDown, setIsPullDown] = useState(false)
13
-  const [HasNextPage, setHasNextPage] = useState(true)
14
-  const [PageNum, setPageNum] = useState(1)
15
-  const [NewsList, setNewsList] = useState([])
10
+  const [PageList, setPageList] = useState([])
16 11
 
17
-  useEffect(() => {
18
-    GetNewsList(() => {
19
-      setIsPullUp(false)
20
-    })
21
-  }, [PageNum])
22
-
23
-  const GetNewsList = (done = () => { }) => { // 获取资讯列表
24
-    request({ ...apis.getNewsList, params: { pageNum: PageNum, pageSize: 6 } }).then((res) => {
25
-      if (PageNum === 1) {
26
-        setNewsList([...res.records])
27
-      } else {
28
-        setNewsList(NewsList.concat([...res.records]))
29
-      }
30
-      setHasNextPage(res.current - 0 < res.pages - 0)
31
-      done()
32
-    }).catch(() => {
33
-      done()
34
-    })
35
-  }
36
-
37
-  const OnRefresh = () => { // 页面下拉刷新
38
-    setIsPullDown(true)
39
-    setHasNextPage(true)
40
-    setPageNum(1)
41
-    if (PageNum === 1) {
42
-      GetNewsList(() => {
43
-        setIsPullDown(false)
44
-      })
45
-    } else {
46
-      setPageNum(1)
47
-    }
12
+  const Refresh = (e) => { // 下拉刷新
13
+    setPageList(e)
48 14
   }
49 15
 
50
-  const OnPullUp = () => {
51
-    if (HasNextPage) {
52
-      setIsPullUp(true)
53
-      setPageNum(PageNum + 1)
54
-    }
16
+  const Push = (e) => { // 上拉加载
17
+    setPageList(PageList.concat(e))
55 18
   }
56 19
 
57 20
   return (
58 21
     <view className='ShouYeZiXun'>
59
-      <ScrollPage OnRefresh={OnRefresh} IsPullUp={IsPullUp} IsPullDown={IsPullDown} OnPullUp={OnPullUp} HasMore={HasNextPage}>
22
+      <ScrollPageRefresh ApiName={`getNewsList`} Refresh={Refresh} Push={Push}>
60 23
         <view className='ShouYeHuoDongContent'>
61 24
           {
62
-            NewsList.map((item, index) => (
25
+            PageList.map((item, index) => (
63 26
               <view className='ListItem' key={`ActivityItem-${index}`}>
64 27
                 <NewsListItem Data={item} ShowTips={index === 0}></NewsListItem>
65 28
               </view>
66 29
             ))
67 30
           }
68 31
         </view>
69
-      </ScrollPage>
32
+      </ScrollPageRefresh>
70 33
     </view >
71 34
   )
72 35
 }

+ 10
- 46
src/pages/WoDe/WoDeHuoDong/index.jsx Parādīt failu

@@ -1,62 +1,26 @@
1
-import React, { useState, useEffect } from 'react'
2
-import request, { apis } from '@/utils/request'
1
+import React, { useState } from 'react'
3 2
 import ActivityListItem from '@/components/ActivityListItem/index'
4
-import ScrollPage from '@/components/ScrollPage/index'
3
+import ScrollPageRefresh from '@/components/ScrollPageRefresh/index'
5 4
 import '@/assets/css/reset.less'
6 5
 import '@/assets/css/iconfont.less'
7 6
 import './index.less'
8 7
 
9 8
 export default function WoDeHuoDong (props) {
10
-  
11
-  const [IsPullUp, setIsPullUp] = useState(false)
12
-  const [IsPullDown, setIsPullDown] = useState(false)
13
-  const [HasNextPage, setHasNextPage] = useState(true)
14
-  const [PageNum, setPageNum] = useState(1)
15
-  const [PageList, setPageList] = useState([])
16
-
17
-  useEffect(() => {
18
-    GetPageList(() => {
19
-      setIsPullUp(false)
20
-    })
21
-  }, [PageNum])
22 9
 
23
-  const GetPageList = (done = () => { }) => { // 获取列表
24
-    request({ ...apis.getActivityList, params: { pageNum: PageNum, pageSize: 6, mine: '1' } }).then((res) => {
25
-      if (PageNum === 1) {
26
-        setPageList([...res.records])
27
-      } else {
28
-        setPageList(PageList.concat([...res.records]))
29
-      }
30
-      setHasNextPage(res.current - 0 < res.pages - 0)
31
-      done()
32
-    }).catch(() => {
33
-      done()
34
-    })
35
-  }
10
+  const [PageList, setPageList] = useState([])
36 11
 
37
-  const OnRefresh = () => { // 页面下拉刷新
38
-    setIsPullDown(true)
39
-    setHasNextPage(true)
40
-    setPageNum(1)
41
-    if (PageNum === 1) {
42
-      GetPageList(() => {
43
-        setIsPullDown(false)
44
-      })
45
-    } else {
46
-      setPageNum(1)
47
-    }
12
+  const Refresh = (e) => { // 下拉刷新
13
+    setPageList(e)
48 14
   }
49 15
 
50
-  const OnPullUp = () => {
51
-    if (HasNextPage) {
52
-      setIsPullUp(true)
53
-      setPageNum(PageNum + 1)
54
-    }
16
+  const Push = (e) => { // 上拉加载
17
+    setPageList(PageList.concat(e))
55 18
   }
19
+  
56 20
 
57 21
   return (
58 22
     <view className='WoDeHuoDong'>
59
-      <ScrollPage OnRefresh={OnRefresh} IsPullUp={IsPullUp} IsPullDown={IsPullDown} OnPullUp={OnPullUp} HasMore={HasNextPage}>
23
+      <ScrollPageRefresh ApiName={`getActivityList`} RequestParams={{ mine: 1 }} Refresh={Refresh} Push={Push}>
60 24
         <view className='Content Activity'>
61 25
           {
62 26
             PageList.map((item, index) => (
@@ -66,7 +30,7 @@ export default function WoDeHuoDong (props) {
66 30
             ))
67 31
           }
68 32
         </view>
69
-      </ScrollPage>
33
+      </ScrollPageRefresh>
70 34
     </view>
71 35
   )
72 36
 }

+ 1
- 0
src/pages/WuYe/index.less Parādīt failu

@@ -15,6 +15,7 @@
15 15
 
16 16
       .Content {
17 17
         width: 100%;
18
+        height: 100%;
18 19
         position: relative;
19 20
         overflow: hidden;
20 21
       }

+ 7
- 1
src/utils/toolclass.js Parādīt failu

@@ -1,5 +1,5 @@
1 1
 const toolclass = {
2
-  FormatDate: (date = null) => { // 格式化时间
2
+  FormatDate: (date = null, format = 'YY:MM:DD hh:mm:ss') => { // 格式化时间
3 3
     if (date !== null) {
4 4
       date = new Date(date)
5 5
       let YY = date.getFullYear()
@@ -8,6 +8,12 @@ const toolclass = {
8 8
       let hh = date.getHours()
9 9
       let mm = date.getMinutes()
10 10
       let ss = date.getSeconds()
11
+      if (format === 'YY:MM:DD') {
12
+        return `${YY}-${MM > 9 ? MM : `0${MM}`}-${DD > 9 ? DD : `0${DD}`}`
13
+      }
14
+      if (format === 'hh:mm:ss') {
15
+        return `${hh > 9 ? hh : `0${hh}`}:${mm > 9 ? mm : `0${mm}`}:${ss > 9 ? ss : `0${ss}`}`
16
+      }
11 17
       return `${YY}-${MM > 9 ? MM : `0${MM}`}-${DD > 9 ? DD : `0${DD}`} ${hh > 9 ? hh : `0${hh}`}:${mm > 9 ? mm : `0${mm}`}:${ss > 9 ? ss : `0${ss}`}`
12 18
     } else {
13 19
       return ''