fix css bug

client/containers/FinishAskContainer/FinishAskContainer.jsx

@@ -47,7 +47,7 @@ export default class FinishAskContainer extends React.Component{
         this.props.showPopup({
         this.props.showPopup({
             popupText : '检测到店铺反常，请站出店铺，关闭店铺门后重新验证您的身份',
             popupText : '检测到店铺反常，请站出店铺，关闭店铺门后重新验证您的身份',
             popupButtons:[btnDom,clockDom],
             popupButtons:[btnDom,clockDom],
-            classNames : 'finishCloseDoor'
+            classNames : 'popupExtClass'
         })
         })
         this.props.uploadErrs(2);
         this.props.uploadErrs(2);
     }
     }

client/containers/FinishAskContainer/index.css

@@ -22,6 +22,3 @@
     display: inline-block;
     display: inline-block;
     align-items: center;
     align-items: center;
 }
 }
-.finishCloseDoor .defaultPopup .defaultPopupText{
-    margin-top: 0.525rem !important;
-}

client/containers/OtherQuestionContainer/OtherQuestionContainer.jsx

@@ -173,7 +173,7 @@ export default class OtherQuestionContainer extends React.Component{
                     popupInfo:{
                     popupInfo:{
                         "popupText":"提交前请输入相关信息，如果不想提交可以直接跳过(右上角)",
                         "popupText":"提交前请输入相关信息，如果不想提交可以直接跳过(右上角)",
                         "showPopup":true,
                         "showPopup":true,
-                        "classNames" : 'finishCloseDoor',
+                        "classNames" : 'popupExtClass',
                         "popupButtons": [<ButtonComponent key={"btn"} option={this.handleShowPopo.bind(this)} text={"确定"}/>]
                         "popupButtons": [<ButtonComponent key={"btn"} option={this.handleShowPopo.bind(this)} text={"确定"}/>]
                     }
                     }
                 })
                 })

client/containers/OtherQuestionContainer/index.css

@@ -110,7 +110,3 @@
 .OtherQuestionContainer .opeationContainer .noMoreBtn{
 .OtherQuestionContainer .opeationContainer .noMoreBtn{
 }
 }
 
 
-.finishCloseDoor .defaultPopup .defaultPopupText{
-    margin-top: 0.525rem !important;
-}
-

client/containers/PageContainer/PageContainer.jsx

@@ -188,10 +188,13 @@ class PageContainer extends React.Component {
     }
     }
 
 
     showError(errMsg){
     showError(errMsg){
-        let btnDom = <Button key={"pagecountBack1"} style={{'width':UTILPATH.getRemByPx(260)}} text={'确定'} option={this.hideError}/>
+        let className = errMsg.length > 24 ? 'popupExtClass' : '';
+        let style = {'width':UTILPATH.getRemByPx(260)}
+        let btnDom = <Button key={"pagecountBack1"} style={style} text={'确定'} option={this.hideError}/>
         this.showPopup({
         this.showPopup({
             popupText : errMsg,
             popupText : errMsg,
-            popupButtons:[btnDom]
+            popupButtons:[btnDom],
+            classNames : className
         })
         })
     }
     }
 
 

client/containers/PageContainer/index.css

@@ -7,4 +7,7 @@
 }
 }
 .pageContainer.backColfff{
 .pageContainer.backColfff{
     background-color: #ffffff;
     background-color: #ffffff;
+}
+.popupExtClass .defaultPopup .defaultPopupText{
+    margin-top: 0.525rem !important;
 }
 }
\ No newline at end of file

client/reducers/error.js

@@ -2,9 +2,6 @@ import actionTypes from '../actiontype/error';
 
 
 
 
 const addErrors = (state,data)=>{
 const addErrors = (state,data)=>{
-    console.log(state);
-    console.log(data);
-
     return Object.assign({},state,{errMsg:data});
     return Object.assign({},state,{errMsg:data});
 }
 }
 
 

client/util/socket.js

@@ -39,7 +39,6 @@ const getIp = ()=>{
             // credentials : 'include',
             // credentials : 'include',
             method : 'GET',
             method : 'GET',
             mode : 'cors',
             mode : 'cors',
-            body : {}
         }).then(checkStatus)
         }).then(checkStatus)
             .then(parseJson)
             .then(parseJson)
             .then((data) => {
             .then((data) => {
@@ -83,7 +82,6 @@ const testIp = (ip) => {
         // credentials : 'include',
         // credentials : 'include',
         method : 'GET',
         method : 'GET',
         mode : 'cors',
         mode : 'cors',
-        body : {}
     }).then(checkStatus)
     }).then(checkStatus)
         .then(parseJson)
         .then(parseJson)
         .then((data) => {
         .then((data) => {