mirror/yapi
2
0
Fork 0
mirror of https://github.com/YMFE/yapi.git synced 2024-12-21 05:19:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/containers/AddInterface/AddInterface.js
View File

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

2
client/reducer/Login/login.js
View File

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

2
client/reducer/login/login.js
View File

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