静态页面

src/components/ScrollPageRefresh/index.jsx

@@ -7,7 +7,7 @@ import './index.less'
 
 export default function ScrollPageRefresh (props) {
 
-  const { IsEmpty = false, ApiName = '', ListRefresh = true, ListName = 'records', RequestParams = {}, RequestData = null, RequestUrlData = null, PageSize = 10, Refresh = () => { }, Push = () => { }, RefreshBg = 'none' } = props
+  const { KeepChildren = null, SearchKey = null, 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)
@@ -22,6 +22,16 @@ export default function ScrollPageRefresh (props) {
     }
   }, [PageNum])
 
+  useEffect(() => {
+    console.log(props.children)
+  }, [])
+
+  useEffect(() => {
+    if (SearchKey !== null) {
+      OnRefresh()
+    }
+  }, [SearchKey])
+
   const GetPageList = (done = () => { }) => { // 获取列表
     let RequestBody = {
       ...apis[ApiName],
@@ -79,8 +89,6 @@ export default function ScrollPageRefresh (props) {
       })
     }
   }
-  
-  const [Reset] = useState(OnRefresh)
 
   const OnPullUp = () => {
     if (HasNextPage) {
@@ -89,17 +97,12 @@ export default function ScrollPageRefresh (props) {
     }
   }
 
-  useEffect(() => {
-    if (props.onEmit) {
-      props.onEmit(
-        // something
-      )
-    }
-  }, [])
-
   return (
     <view className='ScrollPageRefresh'>
       <ScrollPage IsEmpty={IsEmpty} ListRefresh={ListRefresh} OnRefresh={OnRefresh} IsPullUp={IsPullUp} IsPullDown={IsPullDown} OnPullUp={OnPullUp} HasMore={HasNextPage} RefreshBg={RefreshBg}>
+        {
+          KeepChildren
+        }
         {
           props.children
         }

src/components/WuYeBaoXiu/index.jsx

@@ -44,24 +44,34 @@ export default function WuYeBaoXiu () {
 
   return (
     <view className='WuYeBaoXiu'>
-      <ScrollPageRefresh IsEmpty={IsEmpty} 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}
+        KeepChildren={
+          <view>
+            {/* 大图 */}
+            <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>
+              }
+            </view>
 
-        {/* 大图 */}
-        <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>
-          }
-        </view>
-
-        {/* 我要报修 */}
-        <view className='WoYaoBaoXiu'>
-          <view onClick={() => { Taro.navigateTo({ url: `/pages/WuYe/TianJiaBaoXiu/index` }) }}>
-            <text className='iconfont iconjia'></text>
-            <text>我要报修</text>
+            {/* 我要报修 */}
+            <view className='WoYaoBaoXiu'>
+              <view onClick={() => { Taro.navigateTo({ url: `/pages/WuYe/TianJiaBaoXiu/index` }) }}>
+                <text className='iconfont iconjia'></text>
+                <text>我要报修</text>
+              </view>
+            </view>
           </view>
-        </view>
-
+        }
+      >
         {/* 报修列表 */}
         <view className='List'>
           {
@@ -72,7 +82,6 @@ export default function WuYeBaoXiu () {
             ))
           }
         </view>
-
       </ScrollPageRefresh>
     </view>
   )

src/components/WuYeFuWu/index.jsx

@@ -42,14 +42,14 @@ export default function WuYeFuWu () {
     setPageList(PageList.concat(e))
   }
 
-  return (
-    <view className='WuYeFuWu'>
-      <ScrollPageRefresh IsEmpty={IsEmpty} ApiName={`getWuYeFuWuList`} Refresh={Refresh} Push={Push}>
+  const KeepChildren = () => {
+    return (
+      <view>
         {/* 大图 */}
         <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>
 
@@ -65,7 +65,43 @@ export default function WuYeFuWu () {
             </view>
           </view>
         </view>
+      </view>
+    )
+  }
+
+  return (
+    <view className='WuYeFuWu'>
+      <ScrollPageRefresh
+        KeepChildren
+        IsEmpty={IsEmpty}
+        ApiName={`getWuYeFuWuList`}
+        Refresh={Refresh}
+        Push={Push}
+        KeepChildren={
+          <view>
+            {/* 大图 */}
+            <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>
+              }
+            </view>
 
+            {/* 物业办事指南 */}
+            <view className='BanShiZhiNan'>
+              <text>物业办事指南</text>
+              <view className='flex-h'>
+                <view className='Line'><view></view></view>
+                <view className='flex-item'>
+                  <text>1、业主收楼手续办理</text>
+                  <text>2、物业转名手续办理</text>
+                  <text>3、业主卡、住户卡办理</text>
+                </view>
+              </view>
+            </view>
+          </view>
+        }
+      >
         {/* 服务列表 */}
         <view className='List'>
           {

src/components/WuYeGongGao/index.jsx

@@ -44,16 +44,24 @@ export default function WuYeGongGao () {
 
   return (
     <view className='WuYeGongGao'>
-      <ScrollPageRefresh IsEmpty={IsEmpty} ApiName={`getGongGaoList`} RequestUrlData={{ orgId: user.orgId }} 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>
-          }
-        </view>
-
+      <ScrollPageRefresh
+        IsEmpty={IsEmpty}
+        ApiName={`getGongGaoList`}
+        RequestUrlData={{ orgId: user.orgId }}
+        Refresh={Refresh}
+        Push={Push}
+        KeepChildren={
+          <view>
+            {/* 大图 */}
+            <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>
+              }
+            </view>
+          </view>
+        }
+      >
         {/* 列表 */}
         <view className='List'>
           {
@@ -64,7 +72,6 @@ export default function WuYeGongGao () {
             ))
           }
         </view>
-
       </ScrollPageRefresh>
     </view>
   )

src/components/WuYeJiaoFei/index.jsx

@@ -128,16 +128,25 @@ export default function WuYeJiaoFei () {
     <view className='WuYeJiaoFei flex-v'>
       <view className='flex-item'>
         <view>
-          <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>
-              }
-            </view>
-
+          <ScrollPageRefresh
+            IsEmpty={IsEmpty}
+            ApiName={`getJiaoFeiList`}
+            ListName={`list`}
+            RequestUrlData={{ type: 0 }}
+            Refresh={Refresh}
+            Push={Push}
+            KeepChildren={
+              <view>
+                {/* 大图 */}
+                <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>
+                  }
+                </view>
+              </view>
+            }
+          >
             {/* 缴费列表 */}
             <view className='List'>
               <CheckboxGroup onChange={handleGroupChange}>
@@ -154,7 +163,6 @@ export default function WuYeJiaoFei () {
                 }
               </CheckboxGroup>
             </view>
-
           </ScrollPageRefresh>
         </view>
       </view>

src/pages/FuLi/ShangPinFilter/index.jsx

@@ -14,7 +14,7 @@ export default function ShangPinFilter () {
   const { user } = useModel('user')
   const [Key, setKey] = useState('')
   const [PageList, setPageList] = useState([])
-  const [Child, setChild] = useState(null)
+  const [SearchKey, setSearchKey] = useState('')
 
   const Refresh = (e) => { // 下拉刷新
     setPageList(e)
@@ -29,11 +29,7 @@ export default function ShangPinFilter () {
   }
 
   const SearchConfirm = () => {
-    console.log(Key)
-  }
-
-  const handleEvt = (...evts) => {
-    // 这里可以接受 evts
+    setSearchKey(Key)
   }
 
   return (
@@ -48,7 +44,7 @@ export default function ShangPinFilter () {
           </view>
         </view>
         <view className='flex-item'>
-          <ScrollPageRefresh ApiName={`getGoodsList`} Refresh={Refresh} Push={Push} onEmit={handleEvt}>
+          <ScrollPageRefresh SearchKey={SearchKey} RequestParams={{key: SearchKey}} ApiName={`getGoodsList`} Refresh={Refresh} Push={Push}>
             <view className='PirzeList'>
               {
                 PageList.map((item, index) => (

src/pages/FuLi/index.jsx

@@ -60,49 +60,55 @@ export default function FuLi () {
         {/* 正文 */}
         <view className='flex-item'>
           <view>
-            <ScrollPageRefresh ApiName={`getGoodsList`} Refresh={Refresh} Push={Push}>
-              <view className='FuLiContent'>
-
-                {/* 用户面板 */}
-                <view className='UserTab'>
-                  <view>
-                    <view className='Info flex-h'>
-                      <view className='Icon'>
+            <ScrollPageRefresh
+              ApiName={`getGoodsList`}
+              Refresh={Refresh}
+              Push={Push}
+              KeepChildren={
+                <view className='FuLiContent'>
+                  {/* 用户面板 */}
+                  <view className='UserTab'>
+                    <view>
+                      <view className='Info flex-h'>
+                        <view className='Icon'>
+                          {
+                            user !== null &&
+                            <image mode='aspectFill' src={user.avatarurl} class='centerLabel'></image>
+                          }
+                        </view>
+                        <view className='flex-item'>
+                          <text>{user === null ? '未登录' : user.nickname || '未授权用户信息'}</text>
+                          <text>积分{user === null ? '-' : user.points || 0}</text>
+                        </view>
                         {
-                          user !== null &&
-                          <image mode='aspectFill' src={user.avatarurl} class='centerLabel'></image>
+                          user.havaSigned !== undefined &&
+                          <text className={user.havaSigned - 0 === 1 ? '' : 'active'} onClick={ToSign}>{user.havaSigned - 0 === 1 ? '已签到' : '签到'}</text>
                         }
                       </view>
-                      <view className='flex-item'>
-                        <text>{user === null ? '未登录' : user.nickname || '未授权用户信息'}</text>
-                        <text>积分{user === null ? '-' : user.points || 0}</text>
-                      </view>
-                      {
-                        user.havaSigned !== undefined &&
-                        <text className={user.havaSigned - 0 === 1 ? '' : 'active'} onClick={ToSign}>{user.havaSigned - 0 === 1 ? '已签到' : '签到'}</text>
-                      }
-                    </view>
-                    <view className='Rule flex-h'>
-                      <view className='flex-item' onClick={() => { Taro.navigateTo({ url: '/pages/FuLi/JiFenGuiZe/index' }) }}>
-                        <text className='iconfont iconjifen'></text>
-                        <text>积分规则</text>
-                      </view>
-                      <view className='flex-item' onClick={() => { Taro.navigateTo({ url: '/pages/FuLi/JiFenMingXi/index' }) }}>
-                        <text className='iconfont iconjifenguize'></text>
-                        <text>积分明细</text>
+                      <view className='Rule flex-h'>
+                        <view className='flex-item' onClick={() => { Taro.navigateTo({ url: '/pages/FuLi/JiFenGuiZe/index' }) }}>
+                          <text className='iconfont iconjifen'></text>
+                          <text>积分规则</text>
+                        </view>
+                        <view className='flex-item' onClick={() => { Taro.navigateTo({ url: '/pages/FuLi/JiFenMingXi/index' }) }}>
+                          <text className='iconfont iconjifenguize'></text>
+                          <text>积分明细</text>
+                        </view>
                       </view>
                     </view>
                   </view>
-                </view>
 
-                {/* 搜索框 */}
-                <view className='SearchContainer'>
-                  <view onClick={() => { Taro.navigateTo({ url: `/pages/FuLi/ShangPinFilter/index` }) }}>
-                    <text className='iconfont iconsousuo'></text>
-                    <text>附近热搜：火锅</text>
+                  {/* 搜索框 */}
+                  <view className='SearchContainer'>
+                    <view onClick={() => { Taro.navigateTo({ url: `/pages/FuLi/ShangPinFilter/index` }) }}>
+                      <text className='iconfont iconsousuo'></text>
+                      <text>附近热搜：火锅</text>
+                    </view>
                   </view>
                 </view>
-
+              }
+            >
+              <view className='FuLiContent'>
                 {/* 积分礼品列表 */}
                 <view className='PirzeList'>
                   {
@@ -115,7 +121,6 @@ export default function FuLi () {
                     ))
                   }
                 </view>
-
               </view>
             </ScrollPageRefresh>
           </view>