|
@@ -61,19 +61,14 @@ export default function user(state = INITIAL_STATE, action) {
|
61
|
61
|
// }
|
62
|
62
|
case UPDATE_USER_INFO: {
|
63
|
63
|
// debugger
|
64
|
|
- // const { person, extraInfo, miniApp = {} } = state.userInfo
|
65
|
|
- const { person, extraInfo, miniApp } = action.payload || {}
|
66
|
|
- const newPerson = mergeNotNull(state.userInfo.person, person)
|
|
64
|
+ const { person, extraInfo, miniApp = {} } = state.userInfo
|
|
65
|
+ const newPerson = mergeNotNull(person, action.payload)
|
67
|
66
|
|
68
|
67
|
return {
|
69
|
68
|
...state,
|
70
|
69
|
userInfo: {
|
71
|
70
|
extraInfo,
|
72
|
|
- person: {
|
73
|
|
- ...state.userInfo,
|
74
|
|
- ...action.payload,
|
75
|
|
- person: newPerson,
|
76
|
|
- },
|
|
71
|
+ person: newPerson,
|
77
|
72
|
miniApp,
|
78
|
73
|
}
|
79
|
74
|
}
|