From 62c669efb39049e426a76c7acdf88d2e4647c9a9 Mon Sep 17 00:00:00 2001
From: "yhui.yang" <qitmac000068@qitmac000068deMacBook-Pro.local>
Date: Thu, 27 Jul 2017 20:54:58 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E5=8A=A0=E5=88=A4=E6=96=AD=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E8=BF=9B=E4=B8=8D=E4=BA=86=E9=A1=B5=E9=9D=A2=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/reducer/Login/login.js | 2 +-
 client/reducer/login/login.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/reducer/Login/login.js b/client/reducer/Login/login.js
index 790e346d..030c0b3c 100644
--- a/client/reducer/Login/login.js
+++ b/client/reducer/Login/login.js
@@ -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: {
diff --git a/client/reducer/login/login.js b/client/reducer/login/login.js
index 790e346d..030c0b3c 100644
--- a/client/reducer/login/login.js
+++ b/client/reducer/login/login.js
@@ -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: {

From 6b7d1dbc0cb4782e28a687cd5c9e90065db59157 Mon Sep 17 00:00:00 2001
From: zwjamnsss <zwjamnsss@gmail.com>
Date: Thu, 27 Jul 2017 20:59:54 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../containers/AddInterface/InterfaceTest/InterfaceTest.js   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/client/containers/AddInterface/InterfaceTest/InterfaceTest.js b/client/containers/AddInterface/InterfaceTest/InterfaceTest.js
index c562b6f1..fe031b1d 100644
--- a/client/containers/AddInterface/InterfaceTest/InterfaceTest.js
+++ b/client/containers/AddInterface/InterfaceTest/InterfaceTest.js
@@ -239,7 +239,7 @@ export default class InterfaceTest extends Component {
               style={{marginLeft: 10}}
               loading={this.state.loading}
             >发送</Button>
-            <span style={{fontSize: 12}}>（请求测试真实接口）</span>
+            <span style={{fontSize: 12, color: 'rgba(0, 0, 0, 0.25)'}}>（请求测试真实接口）</span>
           </div>
           <Card title="HEADERS" noHovering style={{marginTop: 10}} className={Object.keys(headers).length ? '' : 'hidden'}>
             <div className="req-row headers">
@@ -294,10 +294,9 @@ export default class InterfaceTest extends Component {
         <Card title="返回结果" noHovering style={{marginTop: 10}}>
           <Spin spinning={this.state.loading}>
             <div className="res-part">
-              <div>
+              <div style={{padding: 10}}>
                 <TextArea
                   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 }}
                 ></TextArea>
               </div>