diff --git a/pages/moment/attention/index.js b/pages/moment/attention/index.js
index fe46955..a3b9a4d 100644
--- a/pages/moment/attention/index.js
+++ b/pages/moment/attention/index.js
@@ -21,6 +21,8 @@ Component({
     },
     loading: true,
     requesting: false,
+    token: true,
+    finished: false,
     orderList: []
   },
   lifetimes: {
@@ -37,23 +39,29 @@ Component({
         var min = new Date()
         min.setHours(0, 0, 0)
         this.data.form.date = util.formatDate(min, 'Y-M-D')
-        this.fetchList()
+        var token = app.globalData.userInfo ? true : false
+        if(!app.globalData.userInfo){
+          this.setData({ loading: false, token })
+        } else {
+          this.fetchList()
+        }
       }
       this.firstShow = true
     },
     onEvent: function (message) {
       if(message.what == 888){
         if(!app.globalData.userInfo){
-          this.setData({ orderList: [], ['form.pageNum']: 1, finished: false })
+          this.setData({ orderList: [], ['form.pageNum']: 1, finished: false, token: false, loading: false })
         } else {
+          this.data.token = true
           this.onRefreshList()
         }
-      } else if(message.what == 444 && this.firstShow){
+      } else if(message.what == 444 && this.firstShow && app.globalData.userInfo){
         this.onRefreshList()
       }
     },
     onRefreshList: function(){
-      if (this.data.requesting) {
+      if(!app.globalData.userInfo || this.data.requesting){
         return
       }
       this.setData({ orderList: [], ['form.pageNum']: 1, finished: false, loading: true })
@@ -72,11 +80,11 @@ 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 })
+          
+          this.setData({ finished: true, requesting: false, loading: false, token: this.data.token })
         }
       }).catch(err => {
-        console.log(err)
-        this.setData({ requesting: false, loading: false })
+        this.setData({ requesting: false, loading: false, token: this.data.token })
         util.showToast(err)
       })
     }
diff --git a/pages/moment/attention/index.wxml b/pages/moment/attention/index.wxml
index 4db9905..4063bec 100644
--- a/pages/moment/attention/index.wxml
+++ b/pages/moment/attention/index.wxml
@@ -7,7 +7,7 @@
 	</wux-skeleton>
 	<view class="bg-white list-empty" style="height:{{height}}rpx" bindtap="onRefreshList" wx:elif="{{!orderList.length && !loading}}">
 		<image class="img-empty" src="/assets/image/list_empty.png"></image>
-		<view class="text-empty">暂无数据，点击加载</view>
+		<view class="text-empty">{{ token ? '暂无数据，点击重新加载' : '请登录后加载'}}</view>
 	</view>
 	<view wx:else>
 		<view wx:for-item="pageItem" wx:for-index="pageIndex" wx:for="{{orderList}}" wx:key="pageIndex">
diff --git a/pages/moment/moment-item/index.js b/pages/moment/moment-item/index.js
index 3265640..d68acdd 100644
--- a/pages/moment/moment-item/index.js
+++ b/pages/moment/moment-item/index.js
@@ -2,6 +2,7 @@
 const util = require('../../../utils/util')
 import { userPushFollowMill } from "../../../api/ztb"
 import { getMillPaperList } from "../../../api/moment"
+const app = getApp()
 var requesting = false
 
 Component({
@@ -29,6 +30,10 @@ Component({
       if (this.data.loading) {
         return
       }
+      if(!app.globalData.userInfo){
+        util.navigateTo('/pages/login/index')
+        return
+      }
       this.setData({ loading: true })
       userPushFollowMill({ paperMillId: 1, follow: true }).then(result => {
         this.setData({ loading: false })