diff --git a/src/main.js b/src/main.js
index 1175231..369623e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -30,6 +30,8 @@ if (process.env.NODE_ENV === 'production') {
 
 // set ElementUI lang to EN
 Vue.use(ElementUI, { locale })
+// 如果想要中文版 element-ui，按如下方式声明
+// Vue.use(ElementUI)
 
 Vue.config.productionTip = false
 
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 702f39a..bff5ac5 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -2,14 +2,21 @@ import { login, logout, getInfo } from '@/api/user'
 import { getToken, setToken, removeToken } from '@/utils/auth'
 import { resetRouter } from '@/router'
 
-const state = {
-  token: getToken(),
-  name: '',
-  avatar: '',
-  roles: []
+const getDefaultState = () => {
+  return {
+    token: getToken(),
+    name: '',
+    avatar: '',
+    roles: []
+  }
 }
 
+const state = getDefaultState()
+
 const mutations = {
+  RESET_STATE: (state) => {
+    Object.assign(state, getDefaultState())
+  },
   SET_TOKEN: (state, token) => {
     state.token = token
   },
@@ -71,9 +78,8 @@ const actions = {
   logout({ commit, state }) {
     return new Promise((resolve, reject) => {
       logout(state.token).then(() => {
-        commit('SET_TOKEN', '')
-        commit('SET_ROLES', [])
-        removeToken()
+        removeToken() // must remove token first
+        commit('RESET_STATE')
         resetRouter()
         resolve()
       }).catch(error => {
@@ -85,9 +91,8 @@ const actions = {
   // remove token
   resetToken({ commit }) {
     return new Promise(resolve => {
-      commit('SET_TOKEN', '')
-      commit('SET_ROLES', [])
-      removeToken()
+      removeToken() // must remove token first
+      commit('RESET_STATE')
       resolve()
     })
   }
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 6af3bfd..0062411 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -42,3 +42,8 @@
     display: block
   }
 }
+
+// to fix el-date-picker css style
+.el-range-separator {
+  box-sizing: content-box;
+}