版本信息都使用页面推送的

src/components/CopyRight/index.jsx

@@ -80,7 +80,7 @@ class CopyRight extends Component {
           <a lassName={style["copy-number"]} href="javascript:;" onClick={showCopyModal}>
             {number}
           </a>{" "}
-          {hasNewVersion && <span>new</span>} &copy;<b>朗通医疗</b>
+          {hasNewVersion && <span>new</span>}<b> &copy;朗通医疗</b>
           <div className={style['disclaimer']} onClick={showDisclatmerModal}>免责声明</div>
         </div>
         {/* {copyVisible && <div

src/components/CopyRight/index.less

@@ -22,7 +22,8 @@
       a{
         text-decoration: none;
         font-size: 12px;
-        color: #3B9ED0;
+        color: #1E1E1E;
+        margin-right: 8px;
       }
       b{
         font-size: 12px;
@@ -32,7 +33,7 @@
     
     .disclaimer{
       font-size: 12px;
-      color: #3B9ED0;
+      color: #1E1E1E;
       float: right;
       cursor: pointer;
     }

src/components/PushContainer/index.jsx

@@ -8,12 +8,9 @@ import store from '@store';
 import { billing } from '@store/async-actions/pushMessage';
 import TemplateContainer from '@components/TemplateContainer';
 import TemplateItems from '@components/TemplateItems';
-import PushItemsContainer from '@containers/PushItemsContainer';
-import { pushAllDataList, getWindowInnerHeight, didPushParamChange } from '@utils/tools';
+import { pushAllDataList, getWindowInnerHeight, didPushParamChange,windowEventHandler } from '@utils/tools';
 import CopyRightContainer from "@containers/CopyRightContainer";
 import MedicalInfoContainer from '@containers/MedicalInfoContainer';
-import FolderName from '@components/FolderName';
-// import Search from './../Operation/Search';
 import Search from './Search';
 import slideDown from '@common/images/slideDown.png';
 import CaseQuailty from "../CaseQuailty";
@@ -96,8 +93,12 @@ class PushContainer extends Component {
     this.hideFolderList = this.hideFolderList.bind(this);
   }
   componentDidMount() {
-    // const height = getWindowInnerHeight()-160;
-    // this.$cont.current.style.height = height+"px";
+     const height = getWindowInnerHeight()-60;
+     this.$cont.current.style.height = height+"px";
+     windowEventHandler('resize', ()=>{
+      const height = getWindowInnerHeight() - 60;
+       this.$cont.current.style.height = height+"px";
+    });
   }
 
   templateSearch(name,selectTemp){
@@ -589,7 +590,7 @@ class PushContainer extends Component {
       allCheckShow,allCheckShowAdmin,adminItems,admin,checkItemsAdmin,clearSearch, templateNormsSearchList, departLis,mode} = this.props;
     const { type,okBorderColor,okColor,oKBg,okText,message,folderListShow,value,reset } = this.state
     const { handleChangeValue, handleChangeIpt} = this;
-    return <div className={style["container"]} ref={this.$cont} >
+    return <div className={style["container"]} ref={this.$cont} style={+activeId!==0?"":{paddingBottom:0}}>
       <Tab tabs={this.state.tabs}
         activeId={activeId}
         handleActiveClick={this.handleActiveClick}
@@ -713,7 +714,7 @@ class PushContainer extends Component {
           </div>:null
         }
       </ConfirmModal>
-      <CopyRightContainer />
+      {+activeId!==0?<CopyRightContainer />:''}
     </div>
   }
 }

src/components/PushEmbed/index.jsx

@@ -13,10 +13,10 @@ class PushEmbed extends Component{
     }
   }
   componentDidMount() {
-    const height = getWindowInnerHeight() - 190;
+    const height = getWindowInnerHeight() - 119;
     this.setState({height:height});
     windowEventHandler('resize', ()=>{
-        const height = getWindowInnerHeight() - 190;
+        const height = getWindowInnerHeight() - 119;
         this.setState({height:height});
     });
   }

src/store/async-actions/copyRight.js

@@ -5,7 +5,7 @@ import { storageLocal } from "@utils/tools"
 export const getMessage = (dispatch, getState) => {
     const state = getState();
     // 请求地址
-    post('/versionInfo/getVersionInfoAlls')
+    post('/api/data/versionInfo/getVersionInfoAlls',{},true)
     .then((data) => {
         
         const versionInfo = JSON.parse(storageLocal.get('versionInfo'));

src/utils/ajax.js

@@ -53,14 +53,14 @@ axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded
             return Promise.reject(error); // 返回接口返回的错误信息
         }
     );
-const post=(url,data)=>{
+const post=(url,data,noPrefix)=>{
   if(typeof data!=='string'){
     data=qs.stringify(data);
   }
 
   return axios({
     method:'post',
-    url:qhost+url,
+    url:url.indexOf('http:')!=-1?url:((noPrefix&&isLocal)?host+url:((noPrefix&&!isLocal)?orgin+url:qhost+url)),
     data
   });
 };

src/utils/config.js

@@ -1,8 +1,8 @@
 // const host='http://192.168.3.1:5050';//赵
 // const host='http://192.168.3.100:5050';//王峰
 // const host='http://192.168.2.121:5050';//后端接口访问地址
-// const host='http://192.168.2.236:5050';//后端接口访问地址
-const host='http://192.168.2.241:5050';//后端接口访问地址
+const host='http://192.168.2.236:5050';//后端接口访问地址
+// const host='http://192.168.2.241:5050';//后端接口访问地址
 // const host='http://192.168.3.11:5050';//王宇
 //const host='http://192.168.2.164:8080';
 // const host='http://192.168.3.117:5050'; //周铁刚
@@ -11,6 +11,6 @@ const imageUrlPrefix = 'http://192.168.2.121:82';
 module.exports={
     host,
     prefix:'/api/icss',            //带权限验证的api
-    pushPage:'http://192.168.2.236:5544/index.html',        //右侧推送页面的地址
+    pushPage:'http://localhost:8081/index.html',        //右侧推送页面的地址
     imageUrlPrefix
 };