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:
waliang.wang 2017-07-27 21:10:26 +08:00
commit accf5eef99
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client/containers/AddInterface/InterfaceTest/InterfaceTest.js
View File

@ -239,7 +239,7 @@ export default class InterfaceTest extends Component {
style={{marginLeft: 10}} style={{marginLeft: 10}}
loading={this.state.loading} loading={this.state.loading}
>发送</Button> >发送</Button>
<span style={{fontSize: 12}}>（请求测试真实接口）</span> <span style={{fontSize: 12, color: 'rgba(0, 0, 0, 0.25)'}}>（请求测试真实接口）</span>
</div> </div>
<Card title="HEADERS" noHovering style={{marginTop: 10}} className={Object.keys(headers).length ? '' : 'hidden'}> <Card title="HEADERS" noHovering style={{marginTop: 10}} className={Object.keys(headers).length ? '' : 'hidden'}>
<div className="req-row headers"> <div className="req-row headers">
@ -294,10 +294,9 @@ export default class InterfaceTest extends Component {
<Card title="返回结果" noHovering style={{marginTop: 10}}> <Card title="返回结果" noHovering style={{marginTop: 10}}>
<Spin spinning={this.state.loading}> <Spin spinning={this.state.loading}>
<div className="res-part"> <div className="res-part">
<div> <div style={{padding: 10}}>
<TextArea <TextArea
value={typeof this.state.res === 'object' ? JSON.stringify(this.state.res, null, 2) : this.state.res.toString()} value={typeof this.state.res === 'object' ? JSON.stringify(this.state.res, null, 2) : this.state.res.toString()}
style={{margin: 10}}
autosize={{ minRows: 2, maxRows: 6 }} autosize={{ minRows: 2, maxRows: 6 }}
></TextArea> ></TextArea>
</div> </div>

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: {