Procházet zdrojové kódy

Merge branch 'bannerScroll' into dev/new1

zhangxc před 5 roky
rodič
revize
4ff9538fa1

+ 1 - 1
src/components/Banner/index.less

@@ -7,7 +7,7 @@
     height: 50px;
 
     border-bottom: 10px solid #e4e6e7;
-    position: fixed;          //页面布局调整
+    position: absolute;          //页面布局调整
     width: 100%;
     top: 0;
     // z-index: 202;

+ 1 - 1
src/components/BodyContainer/index.less

@@ -4,6 +4,6 @@
   }
 }*/
 .container{
-  padding: 50px 10px 0 10px;
+  padding: 50px 8px 0 10px;
   position: relative;
 }

+ 7 - 9
src/components/InfoTitle/index.jsx

@@ -52,15 +52,13 @@ class InfoTitle extends Component {
     render() {
         const {disVisible,copyVisible,winWidth,loading} = this.props;
         const {le} = this.state;
-        return <div className={style['title-wrapper']} >
-            <PatInfoContainer />
-            <div className={style['activeWrap']}>
-                <div className={style["operations"]} onClick={this.showHistoryBox}>
-                    <span><img src={historyCase} />&nbsp;历史病历</span>
-                </div>
-                <div className={style["health"]} >
-                    <span><img src={health} />&nbsp;健康档案</span>
-                </div>
+        return <div className={style['title-wrapper']} style={{left:le}}>
+            <PatInfoContainer sizeFlag={winWidth <= 1065?true:false}/>
+            <div className={style["operations"]} onClick={this.showHistoryBox}>
+                <span><img src={historyCase} />&nbsp;历史病历</span>
+            </div>
+            <div className={style["health"]} >
+                <span><img src={health} />&nbsp;健康档案</span>
             </div>
             <HistoryCases></HistoryCases>
             <Loading show={loading}/>