From 0c7d025e0095dcb60c066e10c99a1bf0c4d9fea4 Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Fri, 24 Sep 2021 15:56:00 +0800
Subject: [PATCH] no message

---
 pages/home/index/index.js | 73 ++++++++++++++++++---------------------
 pages/index/index.js      |  8 ++---
 2 files changed, 35 insertions(+), 46 deletions(-)

diff --git a/pages/home/index/index.js b/pages/home/index/index.js
index ef4f9da..5d9f148 100644
--- a/pages/home/index/index.js
+++ b/pages/home/index/index.js
@@ -36,19 +36,10 @@ Component({
     // resume的处理;
     onRestart: function () {
       if (!this.data.firstShow) {
-        this.setData({
-          height: (app.globalData.safeFragmentHeight + app.globalData.statusBarHeight - 100),
-          CustomBar: app.globalData.CustomBar,
-          userInfo: app.globalData.userInfo
-        })
-        if (app.globalData.userInfo && app.globalData.userInfo.memberExpiredAt) {
-          this.setData({
-            'userInfo.memberExpiredAt': app.globalData.userInfo.memberExpiredAt,
-            userName: app.globalData.userInfo.realName || app.globalData.userInfo.nickname || ''
-          })
-        }
+        this.handUserInfo()
+        this.fetchUserInfo()
       }
-      this.fetchUserInfo()
+      this.fetchOrtherInfo()
       this.data.firstShow = true
     },
     onEvent: function (message) {
@@ -60,39 +51,13 @@ Component({
           messageNumber: 0,
           avatarUrl: '/assets/myinfo/user-icon.png'
         })
+        this.fetchUserInfo()
       }
     },
-    fetchUserInfo: function () {
+    fetchOrtherInfo: function(){
       if (!app.globalData.token) {
         return
       }
-      getBaseInfo().then(result => {
-        app.globalData.userInfo = result.data
-        var nickname = ''
-        if (app.globalData.userInfo.isAuth) {
-          nickname = result.data.realName.substring(0, 14)
-        } else if (!util.isEmpty(result.data.nickname)) {
-          nickname = result.data.nickname.substring(0, 14)
-        } else if (!util.isEmpty(result.data.realName)) {
-          nickname = result.data.realName.substring(0, 14)
-        }
-        app.globalData.userInfo.userName = nickname
-        if (!util.isEmpty(result.data.avatarUrl)) {
-          app.globalData.userInfo.avatarUrl = result.data.avatarUrl
-        }
-        app.globalData.userInfo.isVIP = result.data.isVIP
-        app.globalData.userInfo.hasStore = result.data.hasStore
-        this.setData({
-          avatarUrl: app.globalData.userInfo.avatarUrl,
-          userInfo: app.globalData.userInfo,
-          userName: nickname
-        })
-        if (this.data.userInfo.isVIP == 1) {
-          this.setData({
-            'userInfo.memberExpiredAt': util.formatDate(new Date(app.globalData.userInfo.memberExpiredAt.replace(/\-/g, "/")), 'Y-M-D')
-          })
-        }
-      })
       getBalanceInfo().then(result => {
         this.setData({
           accountMoney: math.minus(result.data.accountMoney, result.data.frozenMoney),
@@ -105,6 +70,34 @@ Component({
         })
       })
     },
+    handUserInfo: function(){
+      var nickname = ''
+      if (app.globalData.userInfo.isAuth) {
+        nickname = app.globalData.userInfo.realName.substring(0, 14)
+      } else if (!util.isEmpty(app.globalData.userInfo.nickname)) {
+        nickname =app.globalData.userInfo.nickname.substring(0, 14)
+      } else if (!util.isEmpty(app.globalData.userInfo.realName)) {
+        nickname = app.globalData.userInfo.realName.substring(0, 14)
+      }
+      app.globalData.userInfo.userName = nickname
+      if (!util.isEmpty(app.globalData.userInfo.avatarUrl)) {
+        app.globalData.userInfo.avatarUrl = app.globalData.userInfo.avatarUrl
+      }
+      if(app.globalData.isVIP == 1 && app.globalData.userInfo.memberExpiredAt){
+        app.globalData.userInfo.memberExpiredAt = util.formatDate(new Date(app.globalData.userInfo.memberExpiredAt.replace(/\-/g, "/")), 'Y-M-D')
+      }
+      this.setData({ height: (app.globalData.safeFragmentHeight + app.globalData.statusBarHeight - 100),
+        CustomBar: app.globalData.CustomBar, avatarUrl: app.globalData.userInfo.avatarUrl, userInfo: app.globalData.userInfo })
+    },
+    fetchUserInfo: function () {
+      if (!app.globalData.token) {
+        return
+      }
+      getBaseInfo().then(result => {
+        app.globalData.userInfo = result.data
+        this.handUserInfo()
+      })
+    },
     toPage: function (e) {
       if (e.currentTarget.id == 'bidding') {
         util.navigateTo('/pages/bidding/index/index')
diff --git a/pages/index/index.js b/pages/index/index.js
index d9a407c..f4d3ad8 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -21,7 +21,6 @@ Page({
     ],
     pageIndex: 0,
     safeBottom: app.globalData.safeBottom,
-    inited: false,
     path: null,
     landInfo: null,
     visible: false,
@@ -51,7 +50,6 @@ Page({
     var minDate = util.formatDate(min, 'Y-M-D')
     var calendar = maxDate
     event.on('EventMessage', this, this.onEvent)
-    this.data.inited = true
     wx.showLoading({ title: '加载中',  mask: true })
     const fheght = (app.globalData.safeFragmentHeight + app.globalData.statusBarHeight) - 100
     this.setData({ fragment: fheght, safeBottom: app.globalData.safeBottom, maxDate, minDate, calendar, cityName: this.data.cityName })
@@ -191,7 +189,7 @@ Page({
   },
   onResume: function () {
     fragments[this.data.pageIndex] = fragments[this.data.pageIndex] || this.selectComponent('#' + this.data.TabList[this.data.pageIndex].value)
-    if (fragments[this.data.pageIndex] && this.data.inited) {
+    if (fragments[this.data.pageIndex]) {
       fragments[this.data.pageIndex].onRestart()
     }
   },
@@ -209,9 +207,7 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    if (this.data.inited) {
-      this.onResume()
-    }
+    this.onResume()
     // 如果定位完成，但是还是没有获取城市信息，那么就要进行城市选择
     if(this.located && util.isEmpty(app.nowCity)){
       wx.navigateTo({url: `/pages/home/city-select/index?type=1` })