From 0c0f768cd72bd288812316fc8e0ef49545b1516e Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Thu, 14 Oct 2021 19:40:32 +0800
Subject: [PATCH] event

---
 pages/moment/attention/index.js |  8 ++++++--
 pages/moment/recommend/index.js | 15 ++++++++-------
 pages/moment/theall/index.js    | 17 +++++++++++++++++
 3 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/pages/moment/attention/index.js b/pages/moment/attention/index.js
index 9b73844..998e966 100644
--- a/pages/moment/attention/index.js
+++ b/pages/moment/attention/index.js
@@ -69,8 +69,12 @@ Component({
     onAttention: function({detail}){
       this.onRefreshList()
     },
-    onRefreshList: function(){
-      if(!app.globalData.userInfo || this.data.requesting){
+    onRefreshList: function(e){
+      if(!app.globalData.userInfo && e){
+        wx.navigateTo({ url: '/pages/login/index' })
+        return
+      }
+      if(this.data.requesting){
         return
       }
       this.data.dataIndex = 0
diff --git a/pages/moment/recommend/index.js b/pages/moment/recommend/index.js
index 84eb670..056c7f5 100644
--- a/pages/moment/recommend/index.js
+++ b/pages/moment/recommend/index.js
@@ -17,9 +17,8 @@ Component({
       pageNum: 1,
       pageSize: 10
     },
-    loading: false,
+    loading: true,
     requesting: false,
-    token: true,
     finished: false,
     dataIndex: 0,
     orderList: []
@@ -37,7 +36,6 @@ Component({
       if(!this.firstShow){
         var min = new Date()
         min.setHours(0, 0, 0)
-        this.data.token = app.globalData.userInfo ? true : false
         this.data.form.date = util.formatDate(min, 'Y-M-D')
         if(app.nowCity){
           this.data.form.cityId = app.nowCity.cityCode
@@ -47,8 +45,11 @@ Component({
       this.firstShow = true
     },
     onEvent: function (message) {
+      if(!this.firstShow){
+        return
+      }
       if(message.what == 888){
-        this.setData({ token: app.globalData.userInfo ? true : false })
+        this.onRefreshList()
       } else if(message.what == 444 && this.firstShow){
         this.data.form.cityId = app.nowCity.cityCode
         this.onRefreshList()
@@ -107,13 +108,13 @@ Component({
           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, token: this.data.token })
+          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 })
+          this.setData({ finished: true, requesting: false, loading: false })
         }
       }).catch(err => {
         console.log(err)
-        this.setData({ requesting: false, loading: false, token: this.data.token })
+        this.setData({ requesting: false, loading: false })
         util.showToast(err)
       })
     }
diff --git a/pages/moment/theall/index.js b/pages/moment/theall/index.js
index eb304e1..066acd1 100644
--- a/pages/moment/theall/index.js
+++ b/pages/moment/theall/index.js
@@ -2,6 +2,7 @@
 import { getInformationList } from "../../../api/moment"
 const util = require('../../../utils/util')
 const area = require("../../../const/area.js")
+const event = require('../../../utils/event')
 const app = getApp()
 
 Component({
@@ -29,6 +30,14 @@ Component({
     finished: false,
     orderList: []
   },
+  lifetimes: {
+    attached: function () {
+      event.on('EventMessage', this, this.onEvent)
+    },
+    detached: function () {
+      event.remove('EventMessage', this)
+    }
+  },
   methods: {
     onRestart: function () {
       if(!this.data.firstShow){
@@ -41,6 +50,14 @@ Component({
         this.fetchList()
       }
     },
+    onEvent: function (message) {
+      if(!this.data.firstShow){
+        return
+      }
+      if(message.what == 888){
+        this.onRefreshList()
+      }
+    },
     getProviceListByIndex: function(tabIndex){
       var proviceList = []
       for (let index = 0; index < area.list[tabIndex].data.length; index++) {