Merge branch 'passport'

src/store/userAction.js

@@ -57,9 +57,18 @@ const logout = () => dispatch => {
 }
 
 
+const UPDATE_USER = 'UPDATE_USER'
+const updateUser = payload => ({
+    type: UPDATE_USER,
+    payload
+})
+
 export {
     accountLogin,
     SET_CURRENT_USER,
     setCurrentUser,
-    quickLogin
+    quickLogin,
+    logout,
+    UPDATE_USER,
+    updateUser
 }
\ No newline at end of file

src/store/userReducer.js

-import { SET_CURRENT_USER } from '@/store/userAction';
+import { SET_CURRENT_USER, UPDATE_USER } from '@/store/userAction';
+import { merge } from 'lodash'
 
 
 const initialState = {
@@ -15,11 +16,12 @@ const initialState = {
 }
 
 
-
 export default function (state = initialState, action) {
     switch (action.type) {
         case SET_CURRENT_USER:
             return action.payload
+        case UPDATE_USER:
+            return merge({}, state, action.payload)
         default:
             return state
     }