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

This commit is contained in:
zwjamnsss 2017-07-27 21:15:54 +08:00
commit d951d5e17d
3 changed files with 12 additions and 4 deletions

View File

@ -31,7 +31,6 @@ const success = () => {
@connect(
state => {
console.log(state)
return {
reqParams: state.addInterface.reqParams,
resParams: state.addInterface.resParams,
@ -245,7 +244,7 @@ class AddInterface extends Component {
const TabPane = Tabs.TabPane
const { server_ip } = this.props
const { isLoading, isSave, mockJson='', mockURL } = this.state
return (
<section className="add-interface-box">
<div className="content">

View File

@ -209,19 +209,28 @@
clear: both;
padding: 10px 0 0 0;
margin: 10px 0 0 90px;
zoom: 1;
overflow: hidden;
.title {
float: left;
line-height: 35px;
}
p {
width: 52.8%;
height: 35px;
line-height: 35px;
border: 1px #DDD solid;
display: inline-block;
vertical-align: -4px;
margin: 0 10px 0 8px;
padding: 0 0 0 10px;
float: left;
}
.host {
margin: 10px 0 0 80px;
}
#mock-clipboard {
margin: 3px 0 0 0;
}
}
.loading {

View File

@ -38,7 +38,7 @@ class MockUrl extends Component {
const { serverIp } = this.props
return (
<section className="mock-url-box">
<span>mock地址 : </span>
<span className="title">mock地址 : </span>
<p id="mock-p">{this.props.mockURL}</p>
<Button type="primary" id="mock-clipboard">复制</Button>
<div className="host">请配置host ***.***.***.*** { serverIp }</div>