merge branch 'bannerScroll' into dev/new1

src/components/InfoTitle/index.jsx

@@ -52,13 +52,15 @@ class InfoTitle extends Component {
     render() {
         const {disVisible,copyVisible,winWidth,loading} = this.props;
         const {le} = this.state;
-        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>
+        return <div className={style['title-wrapper']}  style={{left:le}}>
+            <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>
             </div>
             <HistoryCases></HistoryCases>
             <Loading show={loading}/>