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

This commit is contained in:
zwjamnsss 2017-07-27 20:59:58 +08:00
commit 1aad3096c8
3 changed files with 2 additions and 3 deletions

View File

@ -100,7 +100,6 @@ class AddInterface extends Component {
props.getResParams('')
props.addReqHeader(initData)
}
document.querySelector('.w-e-text-container').style.height = '200px'
}
getInterfaceId () {

View File

@ -27,7 +27,7 @@ export default (state = initialState, action) => {
loginState: (action.payload.data.errcode == 0)?MEMBER_STATUS:GUEST_STATUS,
userName: action.payload.data.data ? action.payload.data.data.username : null,
uid: action.payload.data.data ? action.payload.data.data._id : null,
server_ip: action.payload.data.data.server_ip
server_ip: action.payload.data.data ? action.payload.data.data.server_ip:null
};
}
case LOGIN: {

View File

@ -27,7 +27,7 @@ export default (state = initialState, action) => {
loginState: (action.payload.data.errcode == 0)?MEMBER_STATUS:GUEST_STATUS,
userName: action.payload.data.data ? action.payload.data.data.username : null,
uid: action.payload.data.data ? action.payload.data.data._id : null,
server_ip: action.payload.data.data.server_ip
server_ip: action.payload.data.data ? action.payload.data.data.server_ip:null
};
}
case LOGIN: {