Squashed commit of the following:

commit 29b2499b796085a682a936d82c97decc35edf891
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Fri Jan 25 13:50:07 2019 +0800

    修改版本信息和免责声明位置

src/components/CopyRight/index.jsx

@@ -79,7 +79,6 @@ class CopyRight extends Component {
 
     return (
       <div className={style["container"]}>
-        {disContent.data && <div className={style['disTips']} dangerouslySetInnerHTML={{__html: disContent.data.data[1].description}}></div>}
         <div className={style["copy"]}>
           版本信息:{" "}
           <a href="javascript:;" onClick={showCopyModal}>

src/components/Inspect/index.jsx

@@ -127,7 +127,7 @@ class Inspect extends React.Component {
             }
         </ul>
     }
-    render() {console.log(22,this.state.ieVersion);
+    render() {
         const {fetchPushInfos, handleCloseExcel, handleChangeValue, labelListActive, list, handleSign, labelList, handleLabelSub, handleClear, handleConfirm, fillActive, changeActivePart, getExcelDataList,delPartItem } = this.props;
         return (
             <div className={styles.wrapper} >

src/components/PushContainer/index.jsx

@@ -13,6 +13,7 @@ import TemplateItems from '@components/TemplateItems';
 import {getWindowInnerHeight} from '@common/js/func';
 import PushItemsContainer from '@containers/PushItemsContainer';
 import { pushAllDataList } from '@utils/tools';
+import CopyRightContainer from "@containers/CopyRightContainer";
 class PushContainer extends Component {
     constructor(props) {
         super(props);
@@ -245,7 +246,8 @@ class PushContainer extends Component {
             >
                 {this.state.message}
             </ConfirmModal>
-        </div>
+            <CopyRightContainer />
+        </div>  
     }
 }
 

src/components/PushItems/index.jsx

@@ -7,7 +7,7 @@ import tipsImg from "../../common/images/tips.png";
 import vigilantImg from "../../common/images/vigilant.png";
 import showImg from "../../common/images/show.png";
 import hideImg from "../../common/images/close.png";
-import CopyRightContainer from "@containers/CopyRightContainer";
+
 import PushDiag from "./PushDiag";
 import DiagnosticItem from "@containers/DiagnosticItem";
 import $ from "jquery";
@@ -95,7 +95,7 @@ class PushItems extends Component {
       showAdd,
       showTips
     } = this;
-
+    console.log('tipsDiscalimer', tipsDiscalimer)
     let assayNum = 0;
     let assayHide = assay.map((item, index) => {
       assayNum = assayNum + item.name.length + 2;
@@ -355,8 +355,9 @@ class PushItems extends Component {
             </div>
           </div>
         </div>
-
-        <CopyRightContainer />
+        {tipsDiscalimer.data && <div className={style['disTips']} dangerouslySetInnerHTML={{__html: tipsDiscalimer.data.data[1].description}}></div>}
+        
+        
       </div>
     );
   }

src/components/PushItems/index.less

@@ -340,3 +340,9 @@
 .billing {
   color: #3B9ED0;
 }
+.disTips {
+  padding: 10px 20px 0;
+  font-size: 10px;
+  color: #979797;
+  text-align: center;
+}

src/components/TemplateItems/index.jsx

@@ -16,10 +16,10 @@ class TemplateItems extends React.Component {
         this.genItems = this.genItems.bind(this);
     }  
     componentDidMount(){
-        const height = getWindowInnerHeight()-172;
+        const height = getWindowInnerHeight()-216;
         this.$cont.current.style.height = height+"px";
         windowEventHandler('resize', ()=>{
-            const height = getWindowInnerHeight()-172;
+            const height = getWindowInnerHeight()-216;
             this.$cont.current.style.height = height+"px";
         });
     }