Simplify logout

fanfoujs · Oct 17, 2017 · 9e902bc · 9e902bc
1 parent a1789ec
commit 9e902bc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 17 deletions.
diff --git a/src/pages/home/home.js b/src/pages/home/home.js
@@ -8,10 +8,6 @@ const network = require('../../mixins/network')
 
 Page(extend({}, tap, {
   onLoad () {
-    if (!getApp().globalData.account) {
-      wx.redirectTo({url: '/pages/login/login'})
-      return
-    }
     fm.load(this)
     network.listen(this)
   },

diff --git a/src/pages/login/login.js b/src/pages/login/login.js
@@ -58,22 +58,19 @@ Page({
       itemList: ['退出登录'],
       success (res) {
         if (!res.cancel) {
-          const {id} = e.currentTarget.dataset
-          let index = -1
-          for (let i = 0; i < accounts.length; i++) {
-            if (accounts[i].id === id) {
-              index = i
+          for (const [i, account] of accounts.entries()) {
+            if (account.id === e.currentTarget.dataset.id) {
+              accounts.splice(i, 1)
+              wx.setStorageSync('accounts', accounts)
+              getApp().globalData.account = accounts[0]
+              if (accounts.length === 0) {
+                wx.reLaunch({url: '/pages/login/login'})
+              } else if (i === 0) {
+                wx.reLaunch({url: '/pages/home/home'})
+              }
               break
             }
           }
-          if (index >= 0) {
-            accounts.splice(index, 1)
-            wx.setStorageSync('accounts', accounts)
-            getApp().globalData.account = accounts[0]
-            if (index === 0) {
-              wx.reLaunch({url: '/pages/home/home'})
-            }
-          }
           page.setData({accounts})
         }
       }