commit

src/app.js

@@ -315,6 +315,8 @@ class App extends Component {
           Taro.removeStorageSync('activityPageIndex')
           Taro.removeStorageSync('newsPageIndex')
           Taro.removeStorageSync('buildingPageIndex')
+          Taro.removeStorageSync('followPageIndex')
+          Taro.removeStorageSync('clinchPageIndex')
 
           // 获取未读消息
           const { person: { personId } } = res

src/useless/pages/person/customerAnalysis/followUpCustomer/index.js

@@ -44,25 +44,35 @@ export default class followUpCustomer extends Taro.Component {
   }
   componentDidShow() {
     Taro.showLoading()
-    this.loadList(1)
+    const pageSize = (Taro.getStorageSync('followPageIndex') || 1) * 10
+    this.loadList(1, pageSize)
 
   }
+  componentDidHide() {
+    const { pageIndex } = this.state;
+    Taro.setStorageSync('followPageIndex', pageIndex)
+  }
 
-  loadList(pageNumber) {
+  loadList(page = 0, pageSize = 10) {
+    const currentPage = page || this.state.pageIndex
     const payload = {
       type: 'follow',
-      pageNumber,
-      pageSize: 10
+      pageSize,
+      pageNumber: currentPage,
     }
+
     queryCustomerList(payload.type, payload).then(res => {
-      const { records, list, total, current, pages } = res || {}
+      const { records, list, total, current, pages, size } = res || {}
       const _list = records || list || []
       const newList = current <= 1 ? _list : this.state.customerList.concat(_list)
+      const pageNum = Math.max(Taro.getStorageSync('followPageIndex'), current)
       this.setState({
         customerList: newList,
         isEmpty: total == 0,
-        hasMore: current < pages,
-        pageIndex: current >= pages ? pages : current
+        hasMore: current * size < total,
+        pageIndex: pageNum,
+        // hasMore: current < pages,
+        // pageIndex: current >= pages ? pages : current
       })
       Taro.hideLoading()
     })
@@ -97,9 +107,10 @@ export default class followUpCustomer extends Taro.Component {
   // 筛查跟进客户
   filterCustomerList() {
 
+
     const payload = {
       type: 'follow',
-      pageNumber: 0,
+      pageNumber: 1,
       pageSize: 9999,
       name: this.state.inputValue,
       status: (this.state.statusIndex == 0 || this.state.statusIndex == -1) ? '' : this.state.statusIndex,
@@ -109,9 +120,13 @@ export default class followUpCustomer extends Taro.Component {
       endReportDate: this.state.endReportDate,
     }
     queryCustomerList(payload.type, payload).then(res => {
-
+      const { records, total, current, pages, size } = res || {}
       this.setState({
-        customerList: res.records || []
+
+        customerList: records || [],
+        isEmpty: total == 0,
+        hasMore: current * size < total,
+        pageIndex: pageNum,
       })
       Taro.hideLoading()
     })

src/useless/pages/person/customerAnalysis/transactionCustomer/index.js

@@ -29,24 +29,33 @@ export default class transactionCustomer extends Taro.Component {
 
   componentDidShow() {
     Taro.showLoading()
-    this.loadList(1)
-
+    const pageSize = (Taro.getStorageSync('clinchPageIndex') || 1) * 10
+    this.loadList(1, pageSize)
   }
-  loadList(pageNumber) {
+  componentDidHide() {
+    const { pageIndex } = this.state;
+    Taro.setStorageSync('clinchPageIndex', pageIndex)
+  }
+
+  loadList(page = 0, pageSize = 10) {
+    const currentPage = page || this.state.pageIndex
     const payload = {
       type: 'clinch',
-      pageNumber,
-      pageSize: 9999
+      pageSize,
+      pageNumber: currentPage,
     }
     queryCustomerList(payload.type, payload).then(res => {
-      const { records, list, total, current, pages } = res || {}
+      const { records, list, total, current, pages, size } = res || {}
       const _list = records || list || []
       const newList = current <= 1 ? _list : this.state.customerList.concat(_list)
+      const pageNum = Math.max(Taro.getStorageSync('clinchPageIndex'), current)
       this.setState({
         customerList: newList,
         isEmpty: total == 0,
-        hasMore: current < pages,
-        pageIndex: current >= pages ? pages : current
+        hasMore: current * size < total,
+        pageIndex: pageNum,
+        // hasMore: current < pages,
+        // pageIndex: current >= pages ? pages : current
       })
       Taro.hideLoading()
     })