From 0583fff3f8921f3bb27349edc799d1fbcc568771 Mon Sep 17 00:00:00 2001 From: "waliang.wang" Date: Thu, 27 Jul 2017 20:47:12 +0800 Subject: [PATCH 1/2] fix --- client/containers/AddInterface/AddInterface.js | 1 - 1 file changed, 1 deletion(-) diff --git a/client/containers/AddInterface/AddInterface.js b/client/containers/AddInterface/AddInterface.js index 9406495c..2d599d27 100644 --- a/client/containers/AddInterface/AddInterface.js +++ b/client/containers/AddInterface/AddInterface.js @@ -100,7 +100,6 @@ class AddInterface extends Component { props.getResParams('') props.addReqHeader(initData) } - document.querySelector('.w-e-text-container').style.height = '200px' } getInterfaceId () { From d83921109e16d6b6c3d4ea9d5f7197fb65de25af Mon Sep 17 00:00:00 2001 From: "yhui.yang" Date: Thu, 27 Jul 2017 20:54:58 +0800 Subject: [PATCH 2/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: {