From e5dc9dd5e2524f0058235ba6247890fbdf205630 Mon Sep 17 00:00:00 2001
From: d_f_w123 <d_f_w123@126.com>
Date: Thu, 12 Dec 2019 17:38:31 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E8=8E=B7=E5=8F=96=E6=98=B5?=
 =?UTF-8?q?=E7=A7=B0=E5=A4=B4=E5=83=8F=E6=8E=88=E6=9D=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/my/my.js   |  9 +++++++++
 pages/my/my.wxml | 16 +++++++++++-----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/pages/my/my.js b/pages/my/my.js
index 00986b5..751e48c 100644
--- a/pages/my/my.js
+++ b/pages/my/my.js
@@ -53,7 +53,16 @@ Page({
         });
         app.doLogin(that.getUserInfo);
     },
+    /**
+     *  获取用户昵称，头像等信息
+     * @param {*} e 
+     */
+    onGotUserInfo: function (e) {
+        console.log(e.detail.userInfo);
+        console.log(e.detail.rawData)
 
+        // TODO 调用api更新
+    },
     /**
      * 跳转已购书籍页面
      */
diff --git a/pages/my/my.wxml b/pages/my/my.wxml
index b6901d8..6bb933d 100644
--- a/pages/my/my.wxml
+++ b/pages/my/my.wxml
@@ -3,14 +3,20 @@
     
     <view class="userinfo">
         
-        <block wx:if="{{!hasLogin}}">
-            <image class="userinfo-avatar" src="../../images/login.png" background-size="cover" catchtap="doLogin"></image>
-            <text class="userinfo-nickname">点击登录</text>
+        <block wx:if="{{!userInfo.nickName}}">
+            <image class="userinfo-avatar" src="../../images/login.png" background-size="cover" ></image>
+            <button  class="userinfo-nickname" open-type="getUserInfo" lang="zh_CN" bindgetuserinfo="onGotUserInfo">点击获取昵称</button>
         </block>
         
         <block wx:else>
-            <image class="userinfo-avatar" src="{{userInfo.avatarUrl}}" background-size="cover"></image>
-            <text class="userinfo-nickname">{{userInfo.nickName}}</text>
+            <view class="userinfo-avatar"  >
+                <open-data type="userAvatarUrl"   lang="zh_CN"/>
+            </view>
+            <view  class="userinfo-nickname">
+                <open-data  type="userNickName"  lang="zh_CN" />
+            </view>
+            <!-- <image class="userinfo-avatar" src="{{userInfo.avatarUrl}}" background-size="cover"></image>
+            <text class="userinfo-nickname">{{userInfo.nickName}}</text> -->
         </block>
 
     </view>