From bf6f33946e7acd3848dc99c2638f04be7066d10f Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Thu, 7 Oct 2021 15:52:21 +0800
Subject: [PATCH] no message

---
 pages/home/tab2/index.js          |  1 -
 pages/moment/attention/index.js   |  1 -
 pages/moment/fragment/index.js    | 10 +++++-----
 pages/moment/information/index.js | 31 ++++++++++++++++++++++++++++---
 pages/moment/theall/index.js      |  5 +++--
 5 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/pages/home/tab2/index.js b/pages/home/tab2/index.js
index 2aa3f65..1a1cb0a 100644
--- a/pages/home/tab2/index.js
+++ b/pages/home/tab2/index.js
@@ -23,7 +23,6 @@ Page({
     focus: false,
     picking: false
   },
-
   /**
    * 生命周期函数--监听页面加载
    */
diff --git a/pages/moment/attention/index.js b/pages/moment/attention/index.js
index 79156cd..fa3e139 100644
--- a/pages/moment/attention/index.js
+++ b/pages/moment/attention/index.js
@@ -79,7 +79,6 @@ Component({
           var finished = this.data.form.pageNum >= result.data.pages
           this.setData({ [nowList]: respList, ['form.pageNum']: (num + 1), finished, requesting: false, loading: false })
         } else {
-          
           this.setData({ finished: true, requesting: false, loading: false, token: this.data.token })
         }
       }).catch(err => {
diff --git a/pages/moment/fragment/index.js b/pages/moment/fragment/index.js
index 7afd314..15daec6 100644
--- a/pages/moment/fragment/index.js
+++ b/pages/moment/fragment/index.js
@@ -39,7 +39,7 @@ Component({
     onRestart: function () {
       if(!this.data.firstShow){
         setTimeout(() => {
-          this.setData({ tabIndex: 0, tabList: [ '推荐', '关注', '全部' , '资讯'] }) 
+          this.setData({ tabIndex: this.data.tabIndex, tabList: [ '推荐', '关注', '全部' , '资讯'] }) 
         }, 100)
         params.date = util.formatDate(new Date(), 'Y-M-D')
       }
@@ -64,10 +64,10 @@ Component({
       this.triggerEvent("picker", {type: 1})
     },
     onCalendarChange: function(date){
-     var fragment = this.selectComponent('#recommend')
-     if(fragment && fragment.calendarChange){
-      fragment.calendarChange(date)
-     }
+      var fragment = this.selectComponent('#recommend')
+      if(fragment && fragment.calendarChange){
+        fragment.calendarChange(date)
+      }
     },
     chooseCity: function(){
       wx.navigateTo({url: `/pages/home/city-select/index?type=1` })
diff --git a/pages/moment/information/index.js b/pages/moment/information/index.js
index 22e0e80..13adc68 100644
--- a/pages/moment/information/index.js
+++ b/pages/moment/information/index.js
@@ -1,4 +1,5 @@
 // pages/message/index.js
+import { getInformationList } from "../../../api/moment"
 const util = require('../../../utils/util')
 const app = getApp()
 
@@ -11,17 +12,41 @@ Component({
     height: { type: Number, value: 0 }
   },
   data: {
-    orderList: [12, 14]
+    form: {
+      pageNum: 1,
+      pageSize: 10
+    },
+    loading: true,
+    requesting: false,
+    finished: false,
+    orderList: []
   },
   methods: {
     onRestart: function () {
       if(!this.firstShow){
-        this.fetchList()
+        // this.fetchList()
       }
       this.firstShow = true
     },
     fetchList: function(){
-
+      if (this.data.requesting) {
+        return
+      }
+      this.data.requesting = true
+      getInformationList(this.data.form).then(result => {
+        if (result.data && result.data.records.length) {
+          var respList = result.data.records
+          let nowList = `orderList[${this.data.orderList.length}]`
+          var num = this.data.form.pageNum
+          var finished = this.data.form.pageNum >= result.data.pages
+          this.setData({ [nowList]: respList, ['form.pageNum']: (num + 1), finished, requesting: false, loading: false })
+        } else {
+          this.setData({ finished: true, requesting: false, loading: false })
+        }
+      }).catch(err => {
+        this.setData({ requesting: false, loading: false })
+        util.showToast(err)
+      })
     }
   }
 
diff --git a/pages/moment/theall/index.js b/pages/moment/theall/index.js
index efe9bf5..7f51268 100644
--- a/pages/moment/theall/index.js
+++ b/pages/moment/theall/index.js
@@ -13,7 +13,7 @@ Component({
     height: { type: Number, value: 0 }
   },
   data: {
-    tabList: [ '全部', '华东', '华中', '华南', '西部', '北部'],
+    tabList: ['全部', '华东', '华中', '华南', '西部', '北部'],
     tabIndex: 0,
     proviceList: [],
     pIndex: 0,
@@ -53,7 +53,8 @@ Component({
       }
       this.data.tabIndex = Number(detail.index)
       this.data.form.proviceId = area.list[this.data.tabIndex].data[this.data.pIndex].code
-      this.setData({ pIndex: 0, proviceList: this.getProviceListByIndex(this.data.tabIndex), orderList: [], ['form.pageNum']: 1, finished: false, loading: true })
+      var proviceList = this.getProviceListByIndex(this.data.tabIndex)
+      this.setData({ pIndex: 0, proviceList, orderList: [], ['form.pageNum']: 1, finished: false, loading: true })
       this.fetchList()
     },
     onProviceChange: function({ detail }){