bug fix

src/pages/activity/index.js

@@ -39,7 +39,9 @@ export default class Index extends Component {
   }
  
   componentDidShow () {
-    this.onPullDownRefresh()
+    // // this.onPullDownRefresh()
+    // console.log('----', this)
+    this.loadData(1)
   }
   
   componentWillUnmount() {
@@ -88,19 +90,13 @@ export default class Index extends Component {
     }
   }
 
-  onListPullDownRefresh = async (rest) => {
+  onPullDownRefresh = (rest) => {
     // debugger
     if (this.refreshing) return
     this.refreshing = true
 
-    const { records, list, total } = await this.loadList(1);
-    const _list = records || list || []
-    this.setState({
-      list: _list,
-      isEmpty: total == 0,
-      hasMore: _list.length >= total ? false : true,
-      pageIndex: 1
-    })
+    this.loadData(1)
+
     // debugger
     rest && rest()
     
@@ -108,19 +104,26 @@ export default class Index extends Component {
   }
 
   onScrollToLower = async (fn) => {
-    const { list } = this.state;
-
-    const { records, list: list1, total, current } = await this.loadList(this.state.pageIndex + 1);
-    const _list = records || list1 || []
-    const newList = list.concat(_list)
-    this.setState({
-      list: newList,
-      hasMore: newList.length >= total ? false : true,
-      pageIndex: current,
-    });
+    const { pageIndex } = this.state;
+    this.loadData(pageIndex + 1)
     fn && fn();
   }
 
+  loadData = (page) => {
+    this.loadList(page).then(res => {
+      const {records, list, total, current, pages} = res || {}
+      const _list = records || list || []
+      const newList = current <= 1 ? _list: this.state.list.concat(_list)
+
+      this.setState({
+        list: newList,
+        isEmpty: total == 0,
+        hasMore: current < pages,
+        pageIndex: current >= pages ? pages : current
+      })
+    })
+  }
+
   render() {
     const { isEmpty, hasMore, list } = this.state
     return (
@@ -130,7 +133,7 @@ export default class Index extends Component {
         isEmpty={isEmpty}
         emptyText="暂无活动~"
         hasMore={hasMore}
-        onPullDownRefresh={fn => this.onListPullDownRefresh(fn)}
+        onPullDownRefresh={fn => this.onPullDownRefresh(fn)}
         onScrollToLower={fn => this.onScrollToLower(fn)}
       >
         <View className="list">