Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev

This commit is contained in:
sean 2017-08-01 16:07:16 +08:00
commit 0a8c8ce6ab
2 changed files with 3 additions and 1 deletions

View File

@ -274,7 +274,7 @@ export default class InterfaceTest extends Component {
const path = e.target.value;
const urlObj = URL.parse(path, true);
this.setState({
query: urlObj.query,
query: this.objToArr(urlObj.query),
pathname: urlObj.pathname
})
}

View File

@ -39,6 +39,7 @@ export default (state = initialState, action) => {
isLogin: true,
loginState: MEMBER_STATUS,
uid: action.payload.data.data.uid,
role: action.payload.data.data.role,
userName: action.payload.data.data.username,
server_ip: action.payload.data.data.server_ip
};
@ -52,6 +53,7 @@ export default (state = initialState, action) => {
isLogin: false,
loginState: GUEST_STATUS,
userName: null,
role: null,
uid: null
}
}