diff --git a/app.js b/app.js
index f67bdfc..feb6030 100644
--- a/app.js
+++ b/app.js
@@ -10,15 +10,35 @@ App({
     var logs = wx.getStorageSync('logs') || []
     logs.unshift(Date.now())
     wx.setStorageSync('logs', logs)
-
+    // 获取用户信息
+    wx.getSetting({
+      success: res => {
+        if (res.authSetting['scope.userInfo']) {
+          // 已经授权，可以直接调用 getUserInfo 获取头像昵称，不会弹框
+          wx.getUserInfo({
+            success: res => {
+              // 可以将 res 发送给后台解码出 unionId
+              app.globalData.userInfo = res.userInfo
+              // 由于 getUserInfo 是网络请求，可能会在 Page.onLoad 之后才返回
+              // 所以此处加入 callback 以防止这种情况
+              if (app.userInfoReadyCallback) {
+                app.userInfoReadyCallback(res)
+              }
+            }
+          })
+        }
+      }
+    })
     // 登录
     wx.login({
       success: res => {
+        console.log("登陆成功------------")
         var code = res.code;
         this.getSessionKey(code);
         
       }
     })
+    wx.getpho
     this.gw.systemInfo = wx.getSystemInfoSync();
   },
   getSessionKey: function (code) {
diff --git a/pages/login/login.wxml b/pages/login/login.wxml
index e284248..e323f0d 100644
--- a/pages/login/login.wxml
+++ b/pages/login/login.wxml
@@ -19,5 +19,5 @@
       </view>
     </view>
   </view>
-  <button class='subBtn' form-type="submit" open-type='getUserInfo'> 登录 </button> 
+  <button class='subBtn' form-type="submit" open-type='getUserInfo' bindtap='bindFormSubmit'> 登录 </button> 
 </form>  
\ No newline at end of file