Merge branch 'master' into refacor/style

2017-11-29 10:05:09 +08:00
parent 4feb89c94e 8f2b0c94ba
commit d476e32032
5 changed files with 9 additions and 2 deletions
--- a/src/mock/login.js
+++ b/src/mock/login.js
@@ -27,7 +27,7 @@ export default {
    if (userMap[token]) {
      return userMap[token]
    } else {
-      return Promise.reject('error')
+      return false
    }
  },
  logout: () => 'success'