fix: login auth fail

xu-f123 · Apr 21, 2019 · 877782a · 877782a
1 parent 9bd0ac0
commit 877782a
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 17 deletions.
diff --git a/src/pages/setting.wpy b/src/pages/setting.wpy
@@ -195,7 +195,7 @@
       async getUserInfo (e) {
         if(e.detail.errMsg != 'getUserInfo:ok') return false
         const userInfo = e.detail.userInfo
-        await wxRequest.Put('users/update_user', { user: userInfo })
+        await wxRequest.Put('users/update_user', { user: userInfo, already_login: true })
         this.getCurrentUser()
         this.$apply()
       },
@@ -213,21 +213,14 @@
         path: '/pages/index',
         imageUrl: 'https://xiaoyounger.com/covers/default-11.jpeg',
         success: async function (res) {
-          console.log(res)
           tip.toast('感谢支持')
           await wxRequest.Post('settings/recommend', { ticket: res['shareTickets'][0] })
         }
       }
     }
 
     async getCurrentUser () {
-      const cacheData = Session.get('user_load_cache')
-      if (cacheData) {
-        this.user = cacheData.user
-        this.version = cacheData.version
-        this.$apply()  
-      }
-
+      this.loadByCache()
       const data = await wxRequest.Get('settings')
       Session.set('user_load_cache', data)
       if (data.user) {
@@ -236,6 +229,15 @@
       this.version = data.version
       this.$apply()
     }
+
+    loadByCache() {
+      const cacheData = Session.get('user_load_cache')
+      if (cacheData) {
+        this.user = cacheData.user
+        this.version = cacheData.version
+        this.$apply()
+      }
+    }
   }
 </script>
 <style lang="scss" src="../public/styles/setting.scss"></style>
diff --git a/src/pages/settings/user_info.wpy b/src/pages/settings/user_info.wpy
@@ -22,6 +22,8 @@
         </view>
       </view>
     </view>
+
+    <div class="cancel-login-btn" @tap="cancelLoginStatus()">退出登录</div>
   </view>
 </template>
 
@@ -46,14 +48,6 @@
     }
 
     methods = {
-      logout () {
-        let key = Session.key.alreadyLogin
-        Session.clear(key)
-        this.alreadyLogin = false
-        wx.navigateBack({
-          delta: 1
-        })
-      },
       async uploadUserAvatar () {
         const choseImages = await wepy.chooseImage({
           count: 1,
@@ -82,6 +76,12 @@
       async changeRemind ({detail}) {
         this.user.remind = detail.value
         await wxRequest.Put('users/update_remind', { remind: detail.value ? 1 : 0 })
+      },
+      async cancelLoginStatus() {
+        await wxRequest.Put('users/cancel_login_status')
+        wx.navigateBack({
+          delta: 1
+        })
       }
     }
 
@@ -118,4 +118,11 @@
       color: #ccc;
     }
   }
+  .cancel-login-btn {
+    font-size: 14px;
+    text-align: center;
+    margin: 21px;
+    display: block;
+    color: blue;
+  }
 </style>