静态页面

src/components/ScrollPage/index.css

@@ -0,0 +1,39 @@
+.ScrollPage {
+  width: 100%;
+  height: 100%;
+  position: relative;
+  overflow: hidden;
+}
+.ScrollPage .ScrollPageContent {
+  width: 100%;
+  position: relative;
+  overflow: hidden;
+  min-height: 100%;
+  z-index: 2;
+}
+.ScrollPage .ScrollPageContent > .ScrollPageBottom {
+  width: 100%;
+  height: 80px;
+}
+.ScrollPage .ScrollPageContent > .NoData > text {
+  font-size: 28px;
+  display: block;
+  text-align: center;
+  color: #999;
+}
+.ScrollPage .ScrollPageContent > .NoData > text.iconfont {
+  font-size: 200px;
+  margin-bottom: 40px;
+}
+.ScrollPage .LoadMoreText {
+  width: 100%;
+  display: block;
+  position: relative;
+  overflow: hidden;
+  text-align: center;
+  z-index: 1;
+  font-size: 28px;
+  color: #999;
+  line-height: 80px;
+  margin-top: -80px;
+}

src/components/ScrollPage/index.jsx

@@ -5,19 +5,27 @@ import './index.less'
 
 export default function ScrollPage (props) {
 
-  const { IsPullDown = false, ListRefresh = true, IsPullUp = false, HasMore = true, OnRefresh = () => { }, OnPullUp = () => { }, RefreshBg = 'none' } = props
+  const { IsEmpty = false, IsPullDown = false, ListRefresh = true, IsPullUp = false, HasMore = true, OnRefresh = () => { }, OnPullUp = () => { }, RefreshBg = 'none' } = props
 
   return (
     <view className='ScrollPage'>
       <scroll-view scroll-y='true' style='height: 100%;' refresher-enabled={true} onrefresherrefresh={OnRefresh} onscrolltolower={OnPullUp} refresher-triggered={IsPullDown} refresher-background={RefreshBg}>
         <view className='ScrollPageContent'>
           {
+            !IsEmpty &&
             props.children
           }
+          {
+            IsEmpty &&
+            <view className='NoData centerLabel'>
+              <text className='iconfont iconzanwushuju'></text>
+              <text>暂无数据</text>
+            </view>
+          }
           <view className='ScrollPageBottom'></view>
         </view>
         {
-          ListRefresh &&
+          !IsEmpty && ListRefresh &&
           <text className='LoadMoreText'>{IsPullUp ? '正在加载更多...' : HasMore ? '上拉加载更多' : '已经到底了~'}</text>
         }
       </scroll-view>

src/components/ScrollPage/index.less

@@ -10,10 +10,25 @@
     overflow: hidden;
     min-height: 100%;
     z-index: 2;
+
     >.ScrollPageBottom {
       width: 100%;
       height: 80px;
     }
+
+    >.NoData {
+      >text {
+        font-size: 28px;
+        display: block;
+        text-align: center;
+        color: #999;
+
+        &.iconfont {
+          font-size: 200px;
+          margin-bottom: 40px;
+        }
+      }
+    }
   }
 
   .LoadMoreText {

src/components/ScrollPageRefresh/index.jsx

@@ -7,7 +7,7 @@ import './index.less'
 
 export default function ScrollPageRefresh (props) {
 
-  const { ApiName = '', ListRefresh = true, ListName = 'records', RequestParams = {}, RequestData = null, RequestUrlData = null, PageSize = 10, Refresh = () => { }, Push = () => { }, RefreshBg = 'none' } = props
+  const { IsEmpty = false, ApiName = '', ListRefresh = true, ListName = 'records', RequestParams = {}, RequestData = null, RequestUrlData = null, PageSize = 10, Refresh = () => { }, Push = () => { }, RefreshBg = 'none' } = props
   const [IsPullUp, setIsPullUp] = useState(false)
   const [IsPullDown, setIsPullDown] = useState(false)
   const [HasNextPage, setHasNextPage] = useState(true)
@@ -89,7 +89,7 @@ export default function ScrollPageRefresh (props) {
 
   return (
     <view className='ScrollPageRefresh'>
-      <ScrollPage ListRefresh={ListRefresh} OnRefresh={OnRefresh} IsPullUp={IsPullUp} IsPullDown={IsPullDown} OnPullUp={OnPullUp} HasMore={HasNextPage} RefreshBg={RefreshBg}>
+      <ScrollPage IsEmpty={IsEmpty} ListRefresh={ListRefresh} OnRefresh={OnRefresh} IsPullUp={IsPullUp} IsPullDown={IsPullDown} OnPullUp={OnPullUp} HasMore={HasNextPage} RefreshBg={RefreshBg}>
         {
           props.children
         }

src/components/WuYeBaoXiu/index.jsx

@@ -14,6 +14,7 @@ export default function WuYeBaoXiu () {
   const { user } = useModel('user')
   const [PageList, setPageList] = useState([])
   const [BannerList, setBannerList] = useState([])
+  const [IsEmpty, setIsEmpty] = useState(false)
 
   useEffect(() => {
     GetBanner()
@@ -29,7 +30,12 @@ export default function WuYeBaoXiu () {
   }
 
   const Refresh = (e) => { // 下拉刷新
-    setPageList(e)
+    if (e.length > 0) {
+      setIsEmpty(false)
+      setPageList(e)
+    } else {
+      setIsEmpty(true)
+    }
   }
 
   const Push = (e) => { // 上拉加载
@@ -38,7 +44,7 @@ export default function WuYeBaoXiu () {
 
   return (
     <view className='WuYeBaoXiu'>
-      <ScrollPageRefresh ApiName={`getGongDanList`} ListName={`pagelist`} RequestUrlData={{ orgId: user.orgId }} RequestParams={{ type: 2 }} Refresh={Refresh} Push={Push}>
+      <ScrollPageRefresh IsEmpty={IsEmpty} ApiName={`getGongDanList`} ListName={`pagelist`} RequestUrlData={{ orgId: user.orgId }} RequestParams={{ type: 2 }} Refresh={Refresh} Push={Push}>
 
         {/* 大图 */}
         <view className='BigImg'>

src/components/WuYeFuWu/index.jsx

@@ -14,6 +14,7 @@ export default function WuYeFuWu () {
   const { user } = useModel('user')
   const [PageList, setPageList] = useState([])
   const [BannerList, setBannerList] = useState([])
+  const [IsEmpty, setIsEmpty] = useState(false)
 
   useEffect(() => {
     GetBanner()
@@ -29,7 +30,12 @@ export default function WuYeFuWu () {
   }
 
   const Refresh = (e) => { // 下拉刷新
-    setPageList(e)
+    if (e.length > 0) {
+      setIsEmpty(false)
+      setPageList(e)
+    } else {
+      setIsEmpty(true)
+    }
   }
 
   const Push = (e) => { // 上拉加载
@@ -38,7 +44,7 @@ export default function WuYeFuWu () {
 
   return (
     <view className='WuYeFuWu'>
-      <ScrollPageRefresh ApiName={`getWuYeFuWuList`} Refresh={Refresh} Push={Push}>
+      <ScrollPageRefresh IsEmpty={IsEmpty} ApiName={`getWuYeFuWuList`} Refresh={Refresh} Push={Push}>
         {/* 大图 */}
         <view className='BigImg'>
           {

src/components/WuYeGongGao/index.jsx

@@ -14,6 +14,7 @@ export default function WuYeGongGao () {
   const { user } = useModel('user')
   const [PageList, setPageList] = useState([])
   const [BannerList, setBannerList] = useState([])
+  const [IsEmpty, setIsEmpty] = useState(false)
 
   useEffect(() => {
     GetBanner()
@@ -29,7 +30,12 @@ export default function WuYeGongGao () {
   }
 
   const Refresh = (e) => { // 下拉刷新
-    setPageList(e)
+    if (e.length > 0) {
+      setIsEmpty(false)
+      setPageList(e)
+    } else {
+      setIsEmpty(true)
+    }
   }
 
   const Push = (e) => { // 上拉加载
@@ -38,7 +44,7 @@ export default function WuYeGongGao () {
 
   return (
     <view className='WuYeGongGao'>
-      <ScrollPageRefresh ApiName={`getGongGaoList`} RequestUrlData={{ orgId: user.orgId }} Refresh={Refresh} Push={Push}>
+      <ScrollPageRefresh IsEmpty={IsEmpty} ApiName={`getGongGaoList`} RequestUrlData={{ orgId: user.orgId }} Refresh={Refresh} Push={Push}>
 
         {/* 大图 */}
         <view className='BigImg'>

src/components/WuYeJiaoFei/index.jsx

@@ -59,6 +59,7 @@ export default function WuYeJiaoFei () {
   const [BannerList, setBannerList] = useState([])
   const [checkedIds, setCheckedIds] = useState([])
   const [totalPrice, setTotalPrice] = useState(0)
+  const [IsEmpty, setIsEmpty] = useState(false)
 
   useEffect(() => {
     GetBanner()
@@ -75,9 +76,12 @@ export default function WuYeJiaoFei () {
 
   const Refresh = (e) => { // 下拉刷新
     if (e && e.length) {
+      setIsEmpty(false)
       // 缴费中的不显示
       const list = e.filter(x => x.billStatus !== '3')
       setPageList(list)
+    } else {
+      setIsEmpty(true)
     }
   }
 
@@ -90,13 +94,13 @@ export default function WuYeJiaoFei () {
     setCheckedIds(ids.map(x => x - 0))
   }
 
-  const handlePay = e => {
+  const handlePay = () => {
     Taro.showModal({
       title: '提示',
       content: `确定缴费 ${totalPrice} 元?`,
       success: res => {
         if (res.confirm) {
-          pay(checkedIds).then(res => {
+          pay(checkedIds).then(() => {
             Taro.showToast({
               title: '缴费成功',
               icon: 'success'
@@ -104,7 +108,6 @@ export default function WuYeJiaoFei () {
             // 页面刷新
             // todo
           }).catch(err => {
-            console.log(err)
             Taro.showToast({
               title: (err.message || err.errMsg || err),
               icon: 'none'
@@ -125,13 +128,13 @@ export default function WuYeJiaoFei () {
     <view className='WuYeJiaoFei flex-v'>
       <view className='flex-item'>
         <view>
-          <ScrollPageRefresh ApiName={`getJiaoFeiList`} ListName={`list`} RequestUrlData={{ type: 0 }} Refresh={Refresh} Push={Push}>
+          <ScrollPageRefresh IsEmpty={IsEmpty} ApiName={`getJiaoFeiList`} ListName={`list`} RequestUrlData={{ type: 0 }} Refresh={Refresh} Push={Push}>
 
             {/* 大图 */}
             <view className='BigImg'>
               {
                 BannerList.length > 0 &&
-                <image mode='aspectFill' src={BannerList[0].image} className='centerLabel' onClick={() => nav2detail({type: BannerList[0].contentType, id: BannerList[0].targetId})}></image>
+                <image mode='aspectFill' src={BannerList[0].image} className='centerLabel' onClick={() => nav2detail({ type: BannerList[0].contentType, id: BannerList[0].targetId })}></image>
               }
             </view>
 

src/pages/FuLi/JiFenMingXi/index.jsx

@@ -15,6 +15,7 @@ export default function JiFenMingXi () {
   const [PageList, setPageList] = useState([])
   const [CurrentNavId, setCurrentNavId] = useState(1)
   const [NavList] = useState([{ name: '全部', id: 1 }, { name: '积分收入', id: 2 }, { name: '积分支出', id: 3 }])
+  const [IsEmpty, setIsEmpty] = useState(false)
 
   const CutNav = (target) => {
     return () => {
@@ -23,7 +24,12 @@ export default function JiFenMingXi () {
   }
 
   const Refresh = (e) => { // 下拉刷新
-    setPageList(e)
+    if (e.length > 0) {
+      setIsEmpty(false)
+      setPageList(e)
+    } else {
+      setIsEmpty(true)
+    }
   }
 
   const Push = (e) => { // 上拉加载
@@ -59,7 +65,7 @@ export default function JiFenMingXi () {
           <view>
             {
               CurrentNavId - 0 === 1 &&
-              <ScrollPageRefresh ApiName={`getJiFenRecords`} Refresh={Refresh} Push={Push}>
+              <ScrollPageRefresh IsEmpty={IsEmpty} ApiName={`getJiFenRecords`} Refresh={Refresh} Push={Push}>
                 <view className='List'>
                   {
                     PageList.map((item, index) => (
@@ -77,7 +83,7 @@ export default function JiFenMingXi () {
             }
             {
               CurrentNavId - 0 === 2 &&
-              <ScrollPageRefresh ApiName={`getJiFenRecords`} RequestParams={{ inout: 1 }} Refresh={Refresh} Push={Push}>
+              <ScrollPageRefresh IsEmpty={IsEmpty} ApiName={`getJiFenRecords`} RequestParams={{ inout: 1 }} Refresh={Refresh} Push={Push}>
                 <view className='List'>
                   {
                     PageList.map((item, index) => (
@@ -95,7 +101,7 @@ export default function JiFenMingXi () {
             }
             {
               CurrentNavId - 0 === 3 &&
-              <ScrollPageRefresh ApiName={`getJiFenRecords`} RequestParams={{ inout: -1 }} Refresh={Refresh} Push={Push}>
+              <ScrollPageRefresh IsEmpty={IsEmpty} ApiName={`getJiFenRecords`} RequestParams={{ inout: -1 }} Refresh={Refresh} Push={Push}>
                 <view className='List'>
                   {
                     PageList.map((item, index) => (

src/pages/HuoDong/index.jsx

@@ -15,12 +15,18 @@ export default function HuoDong () {
   const [CurrentNavId, setCurrentNavId] = useState(1)
   const [ActivityList, setActivityList] = useState([])
   const [NewsList, setNewsList] = useState([])
+  const [IsEmpty, setIsEmpty] = useState(false)
 
   const Refresh = (e) => { // 下拉刷新
-    if (CurrentNavId === 1) {
-      setActivityList(e)
+    if (e.length > 0) {
+      setIsEmpty(false)
+      if (CurrentNavId === 1) {
+        setActivityList(e)
+      } else {
+        setNewsList(e)
+      }
     } else {
-      setNewsList(e)
+      setIsEmpty(true)
     }
   }
 
@@ -48,7 +54,7 @@ export default function HuoDong () {
             {/* 活动 */}
             {
               CurrentNavId - 0 === 1 &&
-              <ScrollPageRefresh ApiName={`getActivityList`} ListName={`list`} Refresh={Refresh} Push={Push}>
+              <ScrollPageRefresh IsEmpty={IsEmpty} ApiName={`getActivityList`} ListName={`list`} Refresh={Refresh} Push={Push}>
                 <view className='Content Activity'>
                   {
                     ActivityList.map((item, index) => (
@@ -64,7 +70,7 @@ export default function HuoDong () {
             {/* 资讯 */}
             {
               CurrentNavId - 0 === 2 &&
-              <ScrollPageRefresh ApiName={`getNewsList`} Refresh={Refresh} Push={Push}>
+              <ScrollPageRefresh IsEmpty={IsEmpty} ApiName={`getNewsList`} Refresh={Refresh} Push={Push}>
                 <view className='Content News'>
                   {/* <view className='BigImg'>
                     <image mode='aspectFill' src={null} class='centerLabel'></image>

src/pages/ShouYe/HuoDong/index.jsx

@@ -9,9 +9,15 @@ import './index.less'
 export default function ShouYeHuoDong () {
 
   const [PageList, setPageList] = useState([])
+  const [IsEmpty, setIsEmpty] = useState(false)
 
   const Refresh = (e) => { // 下拉刷新
-    setPageList(e)
+    if (e.length > 0) {
+      setIsEmpty(false)
+      setPageList(e)
+    } else {
+      setIsEmpty(true)
+    }
   }
 
   const Push = (e) => { // 上拉加载
@@ -21,7 +27,7 @@ export default function ShouYeHuoDong () {
   return (
     <Page>
       <view className='ShouYeHuoDong'>
-        <ScrollPageRefresh ApiName={`getActivityList`} ListName={`list`} Refresh={Refresh} Push={Push}>
+        <ScrollPageRefresh IsEmpty={IsEmpty} ApiName={`getActivityList`} ListName={`list`} Refresh={Refresh} Push={Push}>
           <view className='ShouYeHuoDongContent'>
             {
               PageList.map((item, index) => (

src/pages/ShouYe/ZiXun/index.jsx

@@ -9,9 +9,15 @@ import './index.less'
 export default function ShouYeZiXun () {
 
   const [PageList, setPageList] = useState([])
+  const [IsEmpty, setIsEmpty] = useState(false)
 
   const Refresh = (e) => { // 下拉刷新
-    setPageList(e)
+    if (e.length > 0) {
+      setIsEmpty(false)
+      setPageList(e)
+    } else {
+      setIsEmpty(true)
+    }
   }
 
   const Push = (e) => { // 上拉加载
@@ -21,7 +27,7 @@ export default function ShouYeZiXun () {
   return (
     <Page>
       <view className='ShouYeZiXun'>
-        <ScrollPageRefresh ApiName={`getNewsList`} Refresh={Refresh} Push={Push}>
+        <ScrollPageRefresh IsEmpty={IsEmpty} ApiName={`getNewsList`} Refresh={Refresh} Push={Push}>
           <view className='ShouYeHuoDongContent'>
             {
               PageList.map((item, index) => (

src/pages/WoDe/WoDeGongDan/index.jsx

@@ -11,9 +11,15 @@ export default function WoDeGongDan () {
 
   const { user } = useModel('user')
   const [PageList, setPageList] = useState([])
+  const [IsEmpty, setIsEmpty] = useState(false)
 
   const Refresh = (e) => { // 下拉刷新
-    setPageList(e)
+    if (e.length > 0) {
+      setIsEmpty(false)
+      setPageList(e)
+    } else {
+      setIsEmpty(true)
+    }
   }
 
   const Push = (e) => { // 上拉加载
@@ -24,7 +30,7 @@ export default function WoDeGongDan () {
   return (
     <Page>
       <view className='WoDeGongDan'>
-        <ScrollPageRefresh ApiName={`getGongDanList`} ListName={`pagelist`} RequestUrlData={{ orgId: user.orgId }} RequestParams={{ type: 2 }} Refresh={Refresh} Push={Push}>
+        <ScrollPageRefresh IsEmpty={IsEmpty} ApiName={`getGongDanList`} ListName={`pagelist`} RequestUrlData={{ orgId: user.orgId }} RequestParams={{ type: 2 }} Refresh={Refresh} Push={Push}>
           <view className='Content Activity'>
             {
               PageList.map((item, index) => (

src/pages/WoDe/WoDeHuoDong/index.jsx

@@ -9,9 +9,15 @@ import './index.less'
 export default function WoDeHuoDong (props) {
 
   const [PageList, setPageList] = useState([])
+  const [IsEmpty, setIsEmpty] = useState(false)
 
   const Refresh = (e) => { // 下拉刷新
-    setPageList(e)
+    if (e.length > 0) {
+      setIsEmpty(false)
+      setPageList(e)
+    } else {
+      setIsEmpty(true)
+    }
   }
 
   const Push = (e) => { // 上拉加载
@@ -22,7 +28,7 @@ export default function WoDeHuoDong (props) {
   return (
     <Page>
       <view className='WoDeHuoDong'>
-        <ScrollPageRefresh ApiName={`getActivityList`} RequestParams={{ mine: 1 }} Refresh={Refresh} Push={Push}>
+        <ScrollPageRefresh IsEmpty={IsEmpty} ApiName={`getActivityList`} RequestParams={{ mine: 1 }} Refresh={Refresh} Push={Push}>
           <view className='Content Activity'>
             {
               PageList.map((item, index) => (

src/pages/WoDe/WoDeJiaoFei/index.jsx

@@ -9,9 +9,15 @@ import './index.less'
 export default function WoDeJiaoFei () {
 
   const [PageList, setPageList] = useState([])
+  const [IsEmpty, setIsEmpty] = useState(false)
 
   const Refresh = (e) => { // 下拉刷新
-    setPageList(e)
+    if (e.length > 0) {
+      setIsEmpty(false)
+      setPageList(e)
+    } else {
+      setIsEmpty(true)
+    }
   }
 
   const Push = (e) => { // 上拉加载
@@ -22,7 +28,7 @@ export default function WoDeJiaoFei () {
   return (
     <Page>
       <view className='WoDeJiaoFei'>
-        <ScrollPageRefresh ApiName={`getActivityList`} RequestParams={{ mine: 1 }} Refresh={Refresh} Push={Push}>
+        <ScrollPageRefresh IsEmpty={IsEmpty} ApiName={`getJiaoFeiList`} ListName={`list`} RequestUrlData={{ type: 1 }} Refresh={Refresh} Push={Push}>
           <view className='Content Activity'>
             {
               PageList.map((item, index) => (

src/pages/WoDe/WoDeRenZheng/index.jsx

@@ -12,9 +12,15 @@ export default function WoDeRenZheng () {
 
   const [PageList, setPageList] = useState([])
   const [ShowAddLayer, setShowAddLayer] = useState(false)
+  const [IsEmpty, setIsEmpty] = useState(false)
 
   const Refresh = (e) => { // 下拉刷新
-    setPageList(e)
+    if (e.length > 0) {
+      setIsEmpty(false)
+      setPageList(e)
+    } else {
+      setIsEmpty(true)
+    }
   }
 
   const Push = (e) => { // 上拉加载
@@ -25,7 +31,7 @@ export default function WoDeRenZheng () {
   return (
     <Page>
       <view className='WoDeRenZheng'>
-        <ScrollPageRefresh ApiName={`getOwnerVerifyList`} ListName={null} Refresh={Refresh} Push={Push}>
+        <ScrollPageRefresh IsEmpty={IsEmpty} ApiName={`getOwnerVerifyList`} ListName={null} Refresh={Refresh} Push={Push}>
           <view className='Content Activity'>
             {
               PageList.map((item, index) => (