Browse Source

'fix:login-bug'

chinadelu 5 years ago
parent
commit
18211ac06d
3 changed files with 6 additions and 16 deletions
  1. 0 1
      app.js
  2. 3 10
      pages/collection/collection.js
  3. 3 5
      pages/user/user.js

+ 0 - 1
app.js

@@ -44,7 +44,6 @@ App({
   },
   globalData: {
     userInfo: null,
-    login:true,
     phoneHeight:height
   }
 })

+ 3 - 10
pages/collection/collection.js

@@ -1,9 +1,6 @@
 // pages/collection/collection.js
-
 const app = getApp()
-
 let userInfo = app.globalData.userInfo;
-let login = app.globalData.login
 
 Page({
 
@@ -25,16 +22,13 @@ Page({
    */
   onLoad: function (options) {
     var that = this;
-    // console.log(app)
-    // console.log("userInfo" +userInfo)
     if (app.globalData.userInfo === null){
       that.setData({
-        login:login
+        login:true
       })
     }else{
-      console.log("login:" + app.globalData.login)
       that.setData({
-        login: app.globalData.login
+        login: false
       })
     }
   },
@@ -59,10 +53,9 @@ Page({
     wx.getUserInfo({
       success: function (res) {
         app.globalData.userInfo = e.detail.userInfo;
-        app.globalData.login = false;
         console.log(e.detail.userInfo);
         that.setData({
-          login: app.globalData.login,
+          login: false,
         })
       }
     })

+ 3 - 5
pages/user/user.js

@@ -1,7 +1,6 @@
 // pages/user/user.js
 const app = getApp()
 let userInfo = app.globalData.userInfo;
-let login = app.globalData.login;
 Page({
 
   /**
@@ -25,11 +24,11 @@ Page({
     // 查看是否授权
     if (app.globalData.userInfo === null) {
       that.setData({
-        login: login
+        login: true
       })
     } else {
       that.setData({
-        login: app.globalData.login,
+        login: false,
         avatarUrl: app.globalData.userInfo.avatarUrl,
         nickName: app.globalData.userInfo.nickName
       })
@@ -42,9 +41,8 @@ Page({
       success: function(res) {
         console.log(e.detail.userInfo);
         app.globalData.userInfo = e.detail.userInfo;
-        app.globalData.login = false;
         that.setData({
-          login: app.globalData.login,
+          login: false,
           avatarUrl: e.detail.userInfo.avatarUrl,
           nickName: e.detail.userInfo.nickName
         })