xcx преди 4 години
родител
ревизия
f397b0d391

+ 5
- 2
src/assets/css/iconfont.css
Файловите разлики са ограничени, защото са твърде много
Целия файл


+ 10
- 6
src/assets/css/iconfont.less
Файловите разлики са ограничени, защото са твърде много
Целия файл


+ 39
- 0
src/components/ScrollPage/index.css Целия файл

1
+.ScrollPage {
2
+  width: 100%;
3
+  height: 100%;
4
+  position: relative;
5
+  overflow: hidden;
6
+}
7
+.ScrollPage .ScrollPageContent {
8
+  width: 100%;
9
+  position: relative;
10
+  overflow: hidden;
11
+  min-height: 100%;
12
+  z-index: 2;
13
+}
14
+.ScrollPage .ScrollPageContent > .ScrollPageBottom {
15
+  width: 100%;
16
+  height: 80px;
17
+}
18
+.ScrollPage .ScrollPageContent > .NoData > text {
19
+  font-size: 28px;
20
+  display: block;
21
+  text-align: center;
22
+  color: #999;
23
+}
24
+.ScrollPage .ScrollPageContent > .NoData > text.iconfont {
25
+  font-size: 200px;
26
+  margin-bottom: 40px;
27
+}
28
+.ScrollPage .LoadMoreText {
29
+  width: 100%;
30
+  display: block;
31
+  position: relative;
32
+  overflow: hidden;
33
+  text-align: center;
34
+  z-index: 1;
35
+  font-size: 28px;
36
+  color: #999;
37
+  line-height: 80px;
38
+  margin-top: -80px;
39
+}

+ 10
- 2
src/components/ScrollPage/index.jsx Целия файл

5
 
5
 
6
 export default function ScrollPage (props) {
6
 export default function ScrollPage (props) {
7
 
7
 
8
-  const { IsPullDown = false, ListRefresh = true, IsPullUp = false, HasMore = true, OnRefresh = () => { }, OnPullUp = () => { }, RefreshBg = 'none' } = props
8
+  const { IsEmpty = false, IsPullDown = false, ListRefresh = true, IsPullUp = false, HasMore = true, OnRefresh = () => { }, OnPullUp = () => { }, RefreshBg = 'none' } = props
9
 
9
 
10
   return (
10
   return (
11
     <view className='ScrollPage'>
11
     <view className='ScrollPage'>
12
       <scroll-view scroll-y='true' style='height: 100%;' refresher-enabled={true} onrefresherrefresh={OnRefresh} onscrolltolower={OnPullUp} refresher-triggered={IsPullDown} refresher-background={RefreshBg}>
12
       <scroll-view scroll-y='true' style='height: 100%;' refresher-enabled={true} onrefresherrefresh={OnRefresh} onscrolltolower={OnPullUp} refresher-triggered={IsPullDown} refresher-background={RefreshBg}>
13
         <view className='ScrollPageContent'>
13
         <view className='ScrollPageContent'>
14
           {
14
           {
15
+            !IsEmpty &&
15
             props.children
16
             props.children
16
           }
17
           }
18
+          {
19
+            IsEmpty &&
20
+            <view className='NoData centerLabel'>
21
+              <text className='iconfont iconzanwushuju'></text>
22
+              <text>暂无数据</text>
23
+            </view>
24
+          }
17
           <view className='ScrollPageBottom'></view>
25
           <view className='ScrollPageBottom'></view>
18
         </view>
26
         </view>
19
         {
27
         {
20
-          ListRefresh &&
28
+          !IsEmpty && ListRefresh &&
21
           <text className='LoadMoreText'>{IsPullUp ? '正在加载更多...' : HasMore ? '上拉加载更多' : '已经到底了~'}</text>
29
           <text className='LoadMoreText'>{IsPullUp ? '正在加载更多...' : HasMore ? '上拉加载更多' : '已经到底了~'}</text>
22
         }
30
         }
23
       </scroll-view>
31
       </scroll-view>

+ 15
- 0
src/components/ScrollPage/index.less Целия файл

10
     overflow: hidden;
10
     overflow: hidden;
11
     min-height: 100%;
11
     min-height: 100%;
12
     z-index: 2;
12
     z-index: 2;
13
+
13
     >.ScrollPageBottom {
14
     >.ScrollPageBottom {
14
       width: 100%;
15
       width: 100%;
15
       height: 80px;
16
       height: 80px;
16
     }
17
     }
18
+
19
+    >.NoData {
20
+      >text {
21
+        font-size: 28px;
22
+        display: block;
23
+        text-align: center;
24
+        color: #999;
25
+
26
+        &.iconfont {
27
+          font-size: 200px;
28
+          margin-bottom: 40px;
29
+        }
30
+      }
31
+    }
17
   }
32
   }
18
 
33
 
19
   .LoadMoreText {
34
   .LoadMoreText {

+ 2
- 2
src/components/ScrollPageRefresh/index.jsx Целия файл

7
 
7
 
8
 export default function ScrollPageRefresh (props) {
8
 export default function ScrollPageRefresh (props) {
9
 
9
 
10
-  const { ApiName = '', ListRefresh = true, ListName = 'records', RequestParams = {}, RequestData = null, RequestUrlData = null, PageSize = 10, Refresh = () => { }, Push = () => { }, RefreshBg = 'none' } = props
10
+  const { IsEmpty = false, ApiName = '', ListRefresh = true, ListName = 'records', RequestParams = {}, RequestData = null, RequestUrlData = null, PageSize = 10, Refresh = () => { }, Push = () => { }, RefreshBg = 'none' } = props
11
   const [IsPullUp, setIsPullUp] = useState(false)
11
   const [IsPullUp, setIsPullUp] = useState(false)
12
   const [IsPullDown, setIsPullDown] = useState(false)
12
   const [IsPullDown, setIsPullDown] = useState(false)
13
   const [HasNextPage, setHasNextPage] = useState(true)
13
   const [HasNextPage, setHasNextPage] = useState(true)
89
 
89
 
90
   return (
90
   return (
91
     <view className='ScrollPageRefresh'>
91
     <view className='ScrollPageRefresh'>
92
-      <ScrollPage ListRefresh={ListRefresh} OnRefresh={OnRefresh} IsPullUp={IsPullUp} IsPullDown={IsPullDown} OnPullUp={OnPullUp} HasMore={HasNextPage} RefreshBg={RefreshBg}>
92
+      <ScrollPage IsEmpty={IsEmpty} ListRefresh={ListRefresh} OnRefresh={OnRefresh} IsPullUp={IsPullUp} IsPullDown={IsPullDown} OnPullUp={OnPullUp} HasMore={HasNextPage} RefreshBg={RefreshBg}>
93
         {
93
         {
94
           props.children
94
           props.children
95
         }
95
         }

+ 8
- 2
src/components/WuYeBaoXiu/index.jsx Целия файл

14
   const { user } = useModel('user')
14
   const { user } = useModel('user')
15
   const [PageList, setPageList] = useState([])
15
   const [PageList, setPageList] = useState([])
16
   const [BannerList, setBannerList] = useState([])
16
   const [BannerList, setBannerList] = useState([])
17
+  const [IsEmpty, setIsEmpty] = useState(false)
17
 
18
 
18
   useEffect(() => {
19
   useEffect(() => {
19
     GetBanner()
20
     GetBanner()
29
   }
30
   }
30
 
31
 
31
   const Refresh = (e) => { // 下拉刷新
32
   const Refresh = (e) => { // 下拉刷新
32
-    setPageList(e)
33
+    if (e.length > 0) {
34
+      setIsEmpty(false)
35
+      setPageList(e)
36
+    } else {
37
+      setIsEmpty(true)
38
+    }
33
   }
39
   }
34
 
40
 
35
   const Push = (e) => { // 上拉加载
41
   const Push = (e) => { // 上拉加载
38
 
44
 
39
   return (
45
   return (
40
     <view className='WuYeBaoXiu'>
46
     <view className='WuYeBaoXiu'>
41
-      <ScrollPageRefresh ApiName={`getGongDanList`} ListName={`pagelist`} RequestUrlData={{ orgId: user.orgId }} RequestParams={{ type: 2 }} Refresh={Refresh} Push={Push}>
47
+      <ScrollPageRefresh IsEmpty={IsEmpty} ApiName={`getGongDanList`} ListName={`pagelist`} RequestUrlData={{ orgId: user.orgId }} RequestParams={{ type: 2 }} Refresh={Refresh} Push={Push}>
42
 
48
 
43
         {/* 大图 */}
49
         {/* 大图 */}
44
         <view className='BigImg'>
50
         <view className='BigImg'>

+ 8
- 2
src/components/WuYeFuWu/index.jsx Целия файл

14
   const { user } = useModel('user')
14
   const { user } = useModel('user')
15
   const [PageList, setPageList] = useState([])
15
   const [PageList, setPageList] = useState([])
16
   const [BannerList, setBannerList] = useState([])
16
   const [BannerList, setBannerList] = useState([])
17
+  const [IsEmpty, setIsEmpty] = useState(false)
17
 
18
 
18
   useEffect(() => {
19
   useEffect(() => {
19
     GetBanner()
20
     GetBanner()
29
   }
30
   }
30
 
31
 
31
   const Refresh = (e) => { // 下拉刷新
32
   const Refresh = (e) => { // 下拉刷新
32
-    setPageList(e)
33
+    if (e.length > 0) {
34
+      setIsEmpty(false)
35
+      setPageList(e)
36
+    } else {
37
+      setIsEmpty(true)
38
+    }
33
   }
39
   }
34
 
40
 
35
   const Push = (e) => { // 上拉加载
41
   const Push = (e) => { // 上拉加载
38
 
44
 
39
   return (
45
   return (
40
     <view className='WuYeFuWu'>
46
     <view className='WuYeFuWu'>
41
-      <ScrollPageRefresh ApiName={`getWuYeFuWuList`} Refresh={Refresh} Push={Push}>
47
+      <ScrollPageRefresh IsEmpty={IsEmpty} ApiName={`getWuYeFuWuList`} Refresh={Refresh} Push={Push}>
42
         {/* 大图 */}
48
         {/* 大图 */}
43
         <view className='BigImg'>
49
         <view className='BigImg'>
44
           {
50
           {

+ 8
- 2
src/components/WuYeGongGao/index.jsx Целия файл

14
   const { user } = useModel('user')
14
   const { user } = useModel('user')
15
   const [PageList, setPageList] = useState([])
15
   const [PageList, setPageList] = useState([])
16
   const [BannerList, setBannerList] = useState([])
16
   const [BannerList, setBannerList] = useState([])
17
+  const [IsEmpty, setIsEmpty] = useState(false)
17
 
18
 
18
   useEffect(() => {
19
   useEffect(() => {
19
     GetBanner()
20
     GetBanner()
29
   }
30
   }
30
 
31
 
31
   const Refresh = (e) => { // 下拉刷新
32
   const Refresh = (e) => { // 下拉刷新
32
-    setPageList(e)
33
+    if (e.length > 0) {
34
+      setIsEmpty(false)
35
+      setPageList(e)
36
+    } else {
37
+      setIsEmpty(true)
38
+    }
33
   }
39
   }
34
 
40
 
35
   const Push = (e) => { // 上拉加载
41
   const Push = (e) => { // 上拉加载
38
 
44
 
39
   return (
45
   return (
40
     <view className='WuYeGongGao'>
46
     <view className='WuYeGongGao'>
41
-      <ScrollPageRefresh ApiName={`getGongGaoList`} RequestUrlData={{ orgId: user.orgId }} Refresh={Refresh} Push={Push}>
47
+      <ScrollPageRefresh IsEmpty={IsEmpty} ApiName={`getGongGaoList`} RequestUrlData={{ orgId: user.orgId }} Refresh={Refresh} Push={Push}>
42
 
48
 
43
         {/* 大图 */}
49
         {/* 大图 */}
44
         <view className='BigImg'>
50
         <view className='BigImg'>

+ 8
- 5
src/components/WuYeJiaoFei/index.jsx Целия файл

59
   const [BannerList, setBannerList] = useState([])
59
   const [BannerList, setBannerList] = useState([])
60
   const [checkedIds, setCheckedIds] = useState([])
60
   const [checkedIds, setCheckedIds] = useState([])
61
   const [totalPrice, setTotalPrice] = useState(0)
61
   const [totalPrice, setTotalPrice] = useState(0)
62
+  const [IsEmpty, setIsEmpty] = useState(false)
62
 
63
 
63
   useEffect(() => {
64
   useEffect(() => {
64
     GetBanner()
65
     GetBanner()
75
 
76
 
76
   const Refresh = (e) => { // 下拉刷新
77
   const Refresh = (e) => { // 下拉刷新
77
     if (e && e.length) {
78
     if (e && e.length) {
79
+      setIsEmpty(false)
78
       // 缴费中的不显示
80
       // 缴费中的不显示
79
       const list = e.filter(x => x.billStatus !== '3')
81
       const list = e.filter(x => x.billStatus !== '3')
80
       setPageList(list)
82
       setPageList(list)
83
+    } else {
84
+      setIsEmpty(true)
81
     }
85
     }
82
   }
86
   }
83
 
87
 
90
     setCheckedIds(ids.map(x => x - 0))
94
     setCheckedIds(ids.map(x => x - 0))
91
   }
95
   }
92
 
96
 
93
-  const handlePay = e => {
97
+  const handlePay = () => {
94
     Taro.showModal({
98
     Taro.showModal({
95
       title: '提示',
99
       title: '提示',
96
       content: `确定缴费 ${totalPrice} 元?`,
100
       content: `确定缴费 ${totalPrice} 元?`,
97
       success: res => {
101
       success: res => {
98
         if (res.confirm) {
102
         if (res.confirm) {
99
-          pay(checkedIds).then(res => {
103
+          pay(checkedIds).then(() => {
100
             Taro.showToast({
104
             Taro.showToast({
101
               title: '缴费成功',
105
               title: '缴费成功',
102
               icon: 'success'
106
               icon: 'success'
104
             // 页面刷新
108
             // 页面刷新
105
             // todo
109
             // todo
106
           }).catch(err => {
110
           }).catch(err => {
107
-            console.log(err)
108
             Taro.showToast({
111
             Taro.showToast({
109
               title: (err.message || err.errMsg || err),
112
               title: (err.message || err.errMsg || err),
110
               icon: 'none'
113
               icon: 'none'
125
     <view className='WuYeJiaoFei flex-v'>
128
     <view className='WuYeJiaoFei flex-v'>
126
       <view className='flex-item'>
129
       <view className='flex-item'>
127
         <view>
130
         <view>
128
-          <ScrollPageRefresh ApiName={`getJiaoFeiList`} ListName={`list`} RequestUrlData={{ type: 0 }} Refresh={Refresh} Push={Push}>
131
+          <ScrollPageRefresh IsEmpty={IsEmpty} ApiName={`getJiaoFeiList`} ListName={`list`} RequestUrlData={{ type: 0 }} Refresh={Refresh} Push={Push}>
129
 
132
 
130
             {/* 大图 */}
133
             {/* 大图 */}
131
             <view className='BigImg'>
134
             <view className='BigImg'>
132
               {
135
               {
133
                 BannerList.length > 0 &&
136
                 BannerList.length > 0 &&
134
-                <image mode='aspectFill' src={BannerList[0].image} className='centerLabel' onClick={() => nav2detail({type: BannerList[0].contentType, id: BannerList[0].targetId})}></image>
137
+                <image mode='aspectFill' src={BannerList[0].image} className='centerLabel' onClick={() => nav2detail({ type: BannerList[0].contentType, id: BannerList[0].targetId })}></image>
135
               }
138
               }
136
             </view>
139
             </view>
137
 
140
 

+ 10
- 4
src/pages/FuLi/JiFenMingXi/index.jsx Целия файл

15
   const [PageList, setPageList] = useState([])
15
   const [PageList, setPageList] = useState([])
16
   const [CurrentNavId, setCurrentNavId] = useState(1)
16
   const [CurrentNavId, setCurrentNavId] = useState(1)
17
   const [NavList] = useState([{ name: '全部', id: 1 }, { name: '积分收入', id: 2 }, { name: '积分支出', id: 3 }])
17
   const [NavList] = useState([{ name: '全部', id: 1 }, { name: '积分收入', id: 2 }, { name: '积分支出', id: 3 }])
18
+  const [IsEmpty, setIsEmpty] = useState(false)
18
 
19
 
19
   const CutNav = (target) => {
20
   const CutNav = (target) => {
20
     return () => {
21
     return () => {
23
   }
24
   }
24
 
25
 
25
   const Refresh = (e) => { // 下拉刷新
26
   const Refresh = (e) => { // 下拉刷新
26
-    setPageList(e)
27
+    if (e.length > 0) {
28
+      setIsEmpty(false)
29
+      setPageList(e)
30
+    } else {
31
+      setIsEmpty(true)
32
+    }
27
   }
33
   }
28
 
34
 
29
   const Push = (e) => { // 上拉加载
35
   const Push = (e) => { // 上拉加载
59
           <view>
65
           <view>
60
             {
66
             {
61
               CurrentNavId - 0 === 1 &&
67
               CurrentNavId - 0 === 1 &&
62
-              <ScrollPageRefresh ApiName={`getJiFenRecords`} Refresh={Refresh} Push={Push}>
68
+              <ScrollPageRefresh IsEmpty={IsEmpty} ApiName={`getJiFenRecords`} Refresh={Refresh} Push={Push}>
63
                 <view className='List'>
69
                 <view className='List'>
64
                   {
70
                   {
65
                     PageList.map((item, index) => (
71
                     PageList.map((item, index) => (
77
             }
83
             }
78
             {
84
             {
79
               CurrentNavId - 0 === 2 &&
85
               CurrentNavId - 0 === 2 &&
80
-              <ScrollPageRefresh ApiName={`getJiFenRecords`} RequestParams={{ inout: 1 }} Refresh={Refresh} Push={Push}>
86
+              <ScrollPageRefresh IsEmpty={IsEmpty} ApiName={`getJiFenRecords`} RequestParams={{ inout: 1 }} Refresh={Refresh} Push={Push}>
81
                 <view className='List'>
87
                 <view className='List'>
82
                   {
88
                   {
83
                     PageList.map((item, index) => (
89
                     PageList.map((item, index) => (
95
             }
101
             }
96
             {
102
             {
97
               CurrentNavId - 0 === 3 &&
103
               CurrentNavId - 0 === 3 &&
98
-              <ScrollPageRefresh ApiName={`getJiFenRecords`} RequestParams={{ inout: -1 }} Refresh={Refresh} Push={Push}>
104
+              <ScrollPageRefresh IsEmpty={IsEmpty} ApiName={`getJiFenRecords`} RequestParams={{ inout: -1 }} Refresh={Refresh} Push={Push}>
99
                 <view className='List'>
105
                 <view className='List'>
100
                   {
106
                   {
101
                     PageList.map((item, index) => (
107
                     PageList.map((item, index) => (

+ 11
- 5
src/pages/HuoDong/index.jsx Целия файл

15
   const [CurrentNavId, setCurrentNavId] = useState(1)
15
   const [CurrentNavId, setCurrentNavId] = useState(1)
16
   const [ActivityList, setActivityList] = useState([])
16
   const [ActivityList, setActivityList] = useState([])
17
   const [NewsList, setNewsList] = useState([])
17
   const [NewsList, setNewsList] = useState([])
18
+  const [IsEmpty, setIsEmpty] = useState(false)
18
 
19
 
19
   const Refresh = (e) => { // 下拉刷新
20
   const Refresh = (e) => { // 下拉刷新
20
-    if (CurrentNavId === 1) {
21
-      setActivityList(e)
21
+    if (e.length > 0) {
22
+      setIsEmpty(false)
23
+      if (CurrentNavId === 1) {
24
+        setActivityList(e)
25
+      } else {
26
+        setNewsList(e)
27
+      }
22
     } else {
28
     } else {
23
-      setNewsList(e)
29
+      setIsEmpty(true)
24
     }
30
     }
25
   }
31
   }
26
 
32
 
48
             {/* 活动 */}
54
             {/* 活动 */}
49
             {
55
             {
50
               CurrentNavId - 0 === 1 &&
56
               CurrentNavId - 0 === 1 &&
51
-              <ScrollPageRefresh ApiName={`getActivityList`} ListName={`list`} Refresh={Refresh} Push={Push}>
57
+              <ScrollPageRefresh IsEmpty={IsEmpty} ApiName={`getActivityList`} ListName={`list`} Refresh={Refresh} Push={Push}>
52
                 <view className='Content Activity'>
58
                 <view className='Content Activity'>
53
                   {
59
                   {
54
                     ActivityList.map((item, index) => (
60
                     ActivityList.map((item, index) => (
64
             {/* 资讯 */}
70
             {/* 资讯 */}
65
             {
71
             {
66
               CurrentNavId - 0 === 2 &&
72
               CurrentNavId - 0 === 2 &&
67
-              <ScrollPageRefresh ApiName={`getNewsList`} Refresh={Refresh} Push={Push}>
73
+              <ScrollPageRefresh IsEmpty={IsEmpty} ApiName={`getNewsList`} Refresh={Refresh} Push={Push}>
68
                 <view className='Content News'>
74
                 <view className='Content News'>
69
                   {/* <view className='BigImg'>
75
                   {/* <view className='BigImg'>
70
                     <image mode='aspectFill' src={null} class='centerLabel'></image>
76
                     <image mode='aspectFill' src={null} class='centerLabel'></image>

+ 8
- 2
src/pages/ShouYe/HuoDong/index.jsx Целия файл

9
 export default function ShouYeHuoDong () {
9
 export default function ShouYeHuoDong () {
10
 
10
 
11
   const [PageList, setPageList] = useState([])
11
   const [PageList, setPageList] = useState([])
12
+  const [IsEmpty, setIsEmpty] = useState(false)
12
 
13
 
13
   const Refresh = (e) => { // 下拉刷新
14
   const Refresh = (e) => { // 下拉刷新
14
-    setPageList(e)
15
+    if (e.length > 0) {
16
+      setIsEmpty(false)
17
+      setPageList(e)
18
+    } else {
19
+      setIsEmpty(true)
20
+    }
15
   }
21
   }
16
 
22
 
17
   const Push = (e) => { // 上拉加载
23
   const Push = (e) => { // 上拉加载
21
   return (
27
   return (
22
     <Page>
28
     <Page>
23
       <view className='ShouYeHuoDong'>
29
       <view className='ShouYeHuoDong'>
24
-        <ScrollPageRefresh ApiName={`getActivityList`} ListName={`list`} Refresh={Refresh} Push={Push}>
30
+        <ScrollPageRefresh IsEmpty={IsEmpty} ApiName={`getActivityList`} ListName={`list`} Refresh={Refresh} Push={Push}>
25
           <view className='ShouYeHuoDongContent'>
31
           <view className='ShouYeHuoDongContent'>
26
             {
32
             {
27
               PageList.map((item, index) => (
33
               PageList.map((item, index) => (

+ 8
- 2
src/pages/ShouYe/ZiXun/index.jsx Целия файл

9
 export default function ShouYeZiXun () {
9
 export default function ShouYeZiXun () {
10
 
10
 
11
   const [PageList, setPageList] = useState([])
11
   const [PageList, setPageList] = useState([])
12
+  const [IsEmpty, setIsEmpty] = useState(false)
12
 
13
 
13
   const Refresh = (e) => { // 下拉刷新
14
   const Refresh = (e) => { // 下拉刷新
14
-    setPageList(e)
15
+    if (e.length > 0) {
16
+      setIsEmpty(false)
17
+      setPageList(e)
18
+    } else {
19
+      setIsEmpty(true)
20
+    }
15
   }
21
   }
16
 
22
 
17
   const Push = (e) => { // 上拉加载
23
   const Push = (e) => { // 上拉加载
21
   return (
27
   return (
22
     <Page>
28
     <Page>
23
       <view className='ShouYeZiXun'>
29
       <view className='ShouYeZiXun'>
24
-        <ScrollPageRefresh ApiName={`getNewsList`} Refresh={Refresh} Push={Push}>
30
+        <ScrollPageRefresh IsEmpty={IsEmpty} ApiName={`getNewsList`} Refresh={Refresh} Push={Push}>
25
           <view className='ShouYeHuoDongContent'>
31
           <view className='ShouYeHuoDongContent'>
26
             {
32
             {
27
               PageList.map((item, index) => (
33
               PageList.map((item, index) => (

+ 8
- 2
src/pages/WoDe/WoDeGongDan/index.jsx Целия файл

11
 
11
 
12
   const { user } = useModel('user')
12
   const { user } = useModel('user')
13
   const [PageList, setPageList] = useState([])
13
   const [PageList, setPageList] = useState([])
14
+  const [IsEmpty, setIsEmpty] = useState(false)
14
 
15
 
15
   const Refresh = (e) => { // 下拉刷新
16
   const Refresh = (e) => { // 下拉刷新
16
-    setPageList(e)
17
+    if (e.length > 0) {
18
+      setIsEmpty(false)
19
+      setPageList(e)
20
+    } else {
21
+      setIsEmpty(true)
22
+    }
17
   }
23
   }
18
 
24
 
19
   const Push = (e) => { // 上拉加载
25
   const Push = (e) => { // 上拉加载
24
   return (
30
   return (
25
     <Page>
31
     <Page>
26
       <view className='WoDeGongDan'>
32
       <view className='WoDeGongDan'>
27
-        <ScrollPageRefresh ApiName={`getGongDanList`} ListName={`pagelist`} RequestUrlData={{ orgId: user.orgId }} RequestParams={{ type: 2 }} Refresh={Refresh} Push={Push}>
33
+        <ScrollPageRefresh IsEmpty={IsEmpty} ApiName={`getGongDanList`} ListName={`pagelist`} RequestUrlData={{ orgId: user.orgId }} RequestParams={{ type: 2 }} Refresh={Refresh} Push={Push}>
28
           <view className='Content Activity'>
34
           <view className='Content Activity'>
29
             {
35
             {
30
               PageList.map((item, index) => (
36
               PageList.map((item, index) => (

+ 8
- 2
src/pages/WoDe/WoDeHuoDong/index.jsx Целия файл

9
 export default function WoDeHuoDong (props) {
9
 export default function WoDeHuoDong (props) {
10
 
10
 
11
   const [PageList, setPageList] = useState([])
11
   const [PageList, setPageList] = useState([])
12
+  const [IsEmpty, setIsEmpty] = useState(false)
12
 
13
 
13
   const Refresh = (e) => { // 下拉刷新
14
   const Refresh = (e) => { // 下拉刷新
14
-    setPageList(e)
15
+    if (e.length > 0) {
16
+      setIsEmpty(false)
17
+      setPageList(e)
18
+    } else {
19
+      setIsEmpty(true)
20
+    }
15
   }
21
   }
16
 
22
 
17
   const Push = (e) => { // 上拉加载
23
   const Push = (e) => { // 上拉加载
22
   return (
28
   return (
23
     <Page>
29
     <Page>
24
       <view className='WoDeHuoDong'>
30
       <view className='WoDeHuoDong'>
25
-        <ScrollPageRefresh ApiName={`getActivityList`} RequestParams={{ mine: 1 }} Refresh={Refresh} Push={Push}>
31
+        <ScrollPageRefresh IsEmpty={IsEmpty} ApiName={`getActivityList`} RequestParams={{ mine: 1 }} Refresh={Refresh} Push={Push}>
26
           <view className='Content Activity'>
32
           <view className='Content Activity'>
27
             {
33
             {
28
               PageList.map((item, index) => (
34
               PageList.map((item, index) => (

+ 8
- 2
src/pages/WoDe/WoDeJiaoFei/index.jsx Целия файл

9
 export default function WoDeJiaoFei () {
9
 export default function WoDeJiaoFei () {
10
 
10
 
11
   const [PageList, setPageList] = useState([])
11
   const [PageList, setPageList] = useState([])
12
+  const [IsEmpty, setIsEmpty] = useState(false)
12
 
13
 
13
   const Refresh = (e) => { // 下拉刷新
14
   const Refresh = (e) => { // 下拉刷新
14
-    setPageList(e)
15
+    if (e.length > 0) {
16
+      setIsEmpty(false)
17
+      setPageList(e)
18
+    } else {
19
+      setIsEmpty(true)
20
+    }
15
   }
21
   }
16
 
22
 
17
   const Push = (e) => { // 上拉加载
23
   const Push = (e) => { // 上拉加载
22
   return (
28
   return (
23
     <Page>
29
     <Page>
24
       <view className='WoDeJiaoFei'>
30
       <view className='WoDeJiaoFei'>
25
-        <ScrollPageRefresh ApiName={`getActivityList`} RequestParams={{ mine: 1 }} Refresh={Refresh} Push={Push}>
31
+        <ScrollPageRefresh IsEmpty={IsEmpty} ApiName={`getJiaoFeiList`} ListName={`list`} RequestUrlData={{ type: 1 }} Refresh={Refresh} Push={Push}>
26
           <view className='Content Activity'>
32
           <view className='Content Activity'>
27
             {
33
             {
28
               PageList.map((item, index) => (
34
               PageList.map((item, index) => (

+ 8
- 2
src/pages/WoDe/WoDeRenZheng/index.jsx Целия файл

12
 
12
 
13
   const [PageList, setPageList] = useState([])
13
   const [PageList, setPageList] = useState([])
14
   const [ShowAddLayer, setShowAddLayer] = useState(false)
14
   const [ShowAddLayer, setShowAddLayer] = useState(false)
15
+  const [IsEmpty, setIsEmpty] = useState(false)
15
 
16
 
16
   const Refresh = (e) => { // 下拉刷新
17
   const Refresh = (e) => { // 下拉刷新
17
-    setPageList(e)
18
+    if (e.length > 0) {
19
+      setIsEmpty(false)
20
+      setPageList(e)
21
+    } else {
22
+      setIsEmpty(true)
23
+    }
18
   }
24
   }
19
 
25
 
20
   const Push = (e) => { // 上拉加载
26
   const Push = (e) => { // 上拉加载
25
   return (
31
   return (
26
     <Page>
32
     <Page>
27
       <view className='WoDeRenZheng'>
33
       <view className='WoDeRenZheng'>
28
-        <ScrollPageRefresh ApiName={`getOwnerVerifyList`} ListName={null} Refresh={Refresh} Push={Push}>
34
+        <ScrollPageRefresh IsEmpty={IsEmpty} ApiName={`getOwnerVerifyList`} ListName={null} Refresh={Refresh} Push={Push}>
29
           <view className='Content Activity'>
35
           <view className='Content Activity'>
30
             {
36
             {
31
               PageList.map((item, index) => (
37
               PageList.map((item, index) => (