修复 UFO 401 消息列表展示不正确的问题

@@ -8,7 +8,7 @@ import * as globalData from './actions/globalData';
 import udid from './utils/udid';
 import './app.scss'
 import event from './utils/event';
-import { loginAction, checkUidAndSessionKey } from './libs/login/login.js';
+import { loginAction, checkUidAndSessionKey, getGlobalData } from './libs/login/login.js';
 import { app_report } from './libs/services/appReport';
 import {WeToast} from './vendors/toast/wetoast';
 import {getYHStorageSync} from './utils/util'
@@ -199,6 +199,24 @@ class App extends Component {
             Taro.setStorageSync('WXThird_session', '');
             Taro.setStorageSync('unionid', '');
             Taro.setStorageSync('user_union_type', '');
+            getGlobalData().userInfo = {};
+            let userInfo = Taro.getStorageSync('userInfo');
+            if (userInfo && userInfo.uid && userInfo.session_key) {
+              if (loginedCallBack) {
+                loginedCallBack();
+              }
+            } else {
+              event.on('my-user-login-success', () => {
+                event.off('my-user-login-success');
+                if (loginSuccess) {
+                  loginSuccess();
+                }
+              })
+              Taro.navigateTo({
+                url: '/pages/nativeLogin/nativeLogin'
+              });
+            }
+          } else {
             let userInfo = Taro.getStorageSync('userInfo');
             if (userInfo && userInfo.uid && userInfo.session_key) {
               if (loginedCallBack) {
@@ -236,33 +254,73 @@ class App extends Component {
           }
         });
       } else {
-        if (userInfo && userInfo.uid && userInfo.session_key) {
-          if (loginedCallBack) {
-            loginedCallBack();
+        event.on('my-user-login-success', () => {
+          event.off('my-user-login-success');
+          if (loginSuccess) {
+            loginSuccess();
           }
-        } else {
-          event.on('my-user-login-success', () => {
-            event.off('my-user-login-success');
-            if (loginSuccess) {
-              loginSuccess();
-            }
-          })
-          Taro.navigateTo({
-            url: '/pages/nativeLogin/nativeLogin'
-          });
-        }
+        })
+        Taro.navigateTo({
+          url: '/pages/nativeLogin/nativeLogin'
+        });
       }
 		});
 
     event.on('judge-user-is-login', (isLogined, isLoginCallback) => {
       let userInfo = Taro.getStorageSync('userInfo');
-      if (userInfo && userInfo.uid && userInfo.session_key) {
-        if (isLogined) {
-          isLogined(true);
-				}
-				if (isLoginCallback) {
-					isLoginCallback();
-				}
+      if (userInfo && userInfo.uid) {
+        checkUidAndSessionKey(userInfo.uid, userInfo.session_key).then(result => {
+          if (result.statusCode === 200) {
+            console.log('session_key 未过期');
+            if (userInfo && userInfo.uid && userInfo.session_key) {
+              if (isLogined) {
+                isLogined(true);
+              }
+              if (isLoginCallback) {
+                isLoginCallback();
+              }
+            } else {
+              if (isLogined) {
+                isLogined(false);
+              }
+            }
+          } else if (result.statusCode === 401) {
+            Taro.setStorageSync('session_key', '');
+            Taro.setStorageSync('userInfo', '');
+            Taro.setStorageSync('unionID', '');
+            Taro.setStorageSync('WXThird_session', '');
+            Taro.setStorageSync('unionid', '');
+            Taro.setStorageSync('user_union_type', '');
+            let userInfo = Taro.getStorageSync('userInfo');
+            getGlobalData().userInfo = {};
+            if (userInfo && userInfo.uid && userInfo.session_key) {
+              if (isLogined) {
+                isLogined(true);
+              }
+              if (isLoginCallback) {
+                isLoginCallback();
+              }
+            } else {
+              if (isLogined) {
+                isLogined(false);
+              }
+            }
+          } else {
+            let userInfo = Taro.getStorageSync('userInfo');
+            if (userInfo && userInfo.uid && userInfo.session_key) {
+              if (isLogined) {
+                isLogined(true);
+              }
+              if (isLoginCallback) {
+                isLoginCallback();
+              }
+            } else {
+              if (isLogined) {
+                isLogined(false);
+              }
+            }
+          }
+        });
       } else {
         if (isLogined) {
           isLogined(false);

@@ -187,7 +187,8 @@ export default class UserCenter extends Component {
   showUserInfo() {
     this.props.reloadSessionkey();
     this.props.reloadUserInfo();
-    let uid = this.props.globalData.userInfo.uid;
+    // let uid = this.props.globalData.userInfo.uid;
+    let uid = wx.getStorageSync('userInfo').uid;
     let globalData = this.props.globalData
     if (uid) {
       let userInfo = globalData.testUser;