From a7b64fa2daa408fdaf35dc99c5519f43ef446173 Mon Sep 17 00:00:00 2001
From: huziyuan <huziyuan@qniao.cn>
Date: Wed, 3 Feb 2021 13:11:59 +0800
Subject: [PATCH] --------

---
 app.js                      | 2 +-
 pages/home/index/index.js   | 3 ++-
 pages/home/index/index.wxml | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app.js b/app.js
index 6ddae6a..9ab2972 100644
--- a/app.js
+++ b/app.js
@@ -1,7 +1,7 @@
  //app.js
 App({
    //----------------------------------------------globalData--------------------------------------
-   evn: 1,//0:开发环境，1：测试环境，2：生产环境
+   evn: 2,//0:开发环境，1：测试环境，2：生产环境
    tmplIds: ['SUjEgwDopCv9xkkSZ4KbS0L7XbAiVQor6GmPg14K760'],
    agentMsgIds: ['kG8DErWDpyzBHCFaLlSKYMF7xVy8UpgogCwV_WSNt10', 'oLbv-IyJOia2tenh64_Lc8xeAzwgzu3gh1vFJ1Se-ME'],
    version: 152,
diff --git a/pages/home/index/index.js b/pages/home/index/index.js
index d2e2413..4074f5f 100644
--- a/pages/home/index/index.js
+++ b/pages/home/index/index.js
@@ -48,7 +48,8 @@ Component({
         console.log(this.data.height)
         if (app.globalData.userInfo && app.globalData.userInfo.memberExpiredAt) {
           this.setData({
-            'userInfo.memberExpiredAt': app.globalData.userInfo.memberExpiredAt
+            'userInfo.memberExpiredAt': app.globalData.userInfo.memberExpiredAt,
+            userName:app.globalData.userInfo.realName||app.globalData.userInfo.nickname||''
           })
         }
       }
diff --git a/pages/home/index/index.wxml b/pages/home/index/index.wxml
index 386fdb0..d8caec2 100644
--- a/pages/home/index/index.wxml
+++ b/pages/home/index/index.wxml
@@ -9,7 +9,7 @@
 			<view class="topText" bindtap="toUserInfo">
 				<view wx:if="{{userInfo}}" style="height:158rpx">
 					<view>
-						<text class="textType1">{{userInfo.realName}}</text>
+						<text class="textType1">{{userInfo.userName}}</text>
 						<image class="img-auth2" src="{{userInfo.isAuth == 1 ? '/assets/myinfo/ysmicon.png' : '/assets/myinfo/wsmicon.png'}}">
 						</image>
 					</view>