|
@@ -30,14 +30,18 @@ export default function user(state = INITIAL_STATE, action) {
|
30
|
30
|
}
|
31
|
31
|
}
|
32
|
32
|
} else {
|
33
|
|
- const { person } = action.payload || {}
|
|
33
|
+ const { person, extraInfo, miniApp } = action.payload || {}
|
34
|
34
|
const newPerson = mergeNotNull(state.userInfo.person, person)
|
|
35
|
+ const newExtraInfo = mergeNotNull(state.userInfo.extraInfo, extraInfo)
|
|
36
|
+ const newMiniApp = mergeNotNull(state.userInfo.miniApp, miniApp)
|
35
|
37
|
return {
|
36
|
38
|
...state,
|
37
|
39
|
userInfo: {
|
38
|
40
|
...state.userInfo,
|
39
|
41
|
...action.payload,
|
40
|
42
|
person: newPerson,
|
|
43
|
+ extraInfo: newExtraInfo,
|
|
44
|
+ miniApp: newMiniApp,
|
41
|
45
|
}
|
42
|
46
|
}
|
43
|
47
|
}
|