样式修改

src/common/components/Add/index.jsx

@@ -23,7 +23,7 @@ class Add extends Component {
   render(){
     const {showText,handleClick,id,height} = this.props;
     return <div className={style['tag-container']} onClick={(e)=>{this.handleClick(e)}} id={id}>
-        <img src={more} style={{verticalAlign:'text-bottom'}}/>
+        <img src={more} style={{verticalAlign:'top'}}/>
         <span className={`inline-box ${style['gray']}`} style={{height:height?height:'',lineHeight:height?height:''}}>{showText}</span>
       </div>
   }

src/common/components/Add/index.less

@@ -5,7 +5,7 @@
   padding: 0 3px 3px;
 }
 .tag-container{
-  margin:5px 70px 5px 2px;
+  margin:18px 70px 17px 2px;
   display: inline-block;
   position: relative;
   cursor: pointer;

src/common/less/variables.less

@@ -2,9 +2,8 @@
 @orange: #f6b37f;
 @green: #4caf50;
 @cyan: #00bcd4;
-@blue: #3B9ED0;
 @red:#ff0000;
-@extBlue:#5968DD;
+@extBlue:#4F9FF3;
 @tab-color:#3B9ED0;
 
 @ipt-color:#E9F5FA;
@@ -54,6 +53,11 @@
 @closeIcon:url(../images/del_nor.png) no-repeat;
 @closeHor:url(../images/del_hor.png) no-repeat;
 
+/********6.5在用*******/
+@blue: #1677FF;       /*字体蓝色*/
+@bannerBg:#4F9FF3; /*banner背景色*/
+@hoverBg:#E3F0FF;   /****下拉hover背景色****/
+
 /*********推送内容容器宽度*************/
 @push-width: 450px;
 /****电子病历容器宽度*****/
@@ -189,9 +193,9 @@
   white-space: nowrap;
 }
 .llStyle{
-  box-shadow: 0 10px 20px 0 #989DA3;
+
+  box-shadow: 0px 2px 16px 0px #CECECE;
   // filter:progid:DXImageTransform.Microsoft.Shadow(color='#989DA3',Direction=125,Strength=6);
-  border: 1px solid #dedede;
 }
 
 .borderd{

src/components/AddAssistCheck/index.less

@@ -41,8 +41,8 @@
   width: 356px;
 }
 .searchLi:hover {
-  border: 1px solid @blue;
-  box-sizing: border-box;
+  background: @hoverBg;
+  color: @bannerBg;
 }
 
 .labelWrapSpec {

src/components/AddInspect/index.less

@@ -116,7 +116,8 @@
 }
 
 .searchLi:hover {
-    border: 1px solid @blue;
+    background: @hoverBg;
+    color: @bannerBg;
 }
 
 .searchResult {

src/components/Banner/index.jsx

@@ -3,7 +3,7 @@ import { connect } from "react-redux";
 import style from "./index.less";
 import ReactDom from "react-dom";
 import logo from "../../common/images/logoa.png";
-import bannerDown from "../../common/images/bannerDown.png";
+import bannerDown from "../../common/images/banner-down.png";
 import setup from "../../common/images/setup.png";
 import emergIcon from '../../common/images/emergency.png'
 import left3 from '../../common/images/left3.png'
@@ -216,7 +216,7 @@ class Banner extends Component {
           <div className={style["showHospitalLis"]} onClick={showHospitalLis} id="showHospitalLis">
             <p className={`${style["selectedHos"]}`}>
               <span className={style["ellipsis"]} title={curHos.hosName||hospitalMsg[0].name}>{curHos.hosName||hospitalMsg[0].name}</span>
-              <i style={{color:curHos.connect==1?'#3B9ED0':'#FF545B'}} onClick={(e)=>{showConnect(e)}}><img src={left3}/>{curHos.connect==1?'术语已关联':'术语未关联'}</i>
+              <i style={{color:curHos.connect==1?'#1E1E1E':'#FF3E3E'}} onClick={(e)=>{showConnect(e)}}><img src={left3}/>{curHos.connect==1?'术语已关联':'术语未关联'}</i>
               <img className={style['bannerDown']} src={bannerDown} />
             </p>
             <ul className={`${style["hospitalLis"]}`} style={{"display":showHos?"block":"none"}}>

src/components/Banner/index.less

@@ -2,8 +2,7 @@
 
 .logo{
     .contentZIndex3;
-    background: linear-gradient(-90deg, #93CEE3 7%,#3B9ED0 98%);
-    background-image: url("../../common/images/bar.png");
+    background: @bannerBg;
     height: 50px;
     border-bottom: 10px solid #e4e6e7;
     position: fixed;          //页面布局调整
@@ -16,14 +15,14 @@
     .logo-name{
         display: inline-block;
         line-height: 40px;
-        color: #FFFFFF;
+        color: #fff;
         font-size: 14px;
     }
     .buon{
         float: right;
         display: inline-block;
         margin: 0px 15px 4px 10px;
-        color: #FFFFFF;
+        color: #1E1E1E;
         font-size: 16px;
         // cursor: pointer;
         .buon1{
@@ -63,8 +62,8 @@
       margin-top: 6px;
       cursor: pointer;
       .selectedHos {
-        box-shadow: 0px 1px 3px 3px #45A3D2 inset;
-        background-color: #65B5D9;
+        box-shadow: 0px 2px 4px 0px #1C6EC3;
+        background-color: #fff;
         padding-left: 10px;
         i {
           position: absolute;
@@ -89,30 +88,30 @@
           position: relative;
           box-sizing: border-box;
           display: inline-block;
-          font-size: 12px;
+          font-size: 14px;
         }
         img.bannerDown {
           position: absolute;
           right: 124px;
-          top: 11px;
+          top: 15px;
         }
       }
       .hospitalLis {
         background-color: #fff;
         color: #1E1E1E;
-        border-radius: 5px;
-        box-shadow: 0px 6px 16px 0px #ccc;
+        box-shadow: 0px 2px 10px 0px #CECECE;
         max-height: 150px;
         overflow: auto;
+        margin-top: 6px;
         li {
           cursor: pointer;
           height: 30px;
           line-height: 30px;
           padding: 0 10px;
-          font-size: 12px;
+          font-size: 14px;
           &:hover {
-            background-color: #8DCBE2;
-            color: #fff;
+            background-color: @hoverBg;
+            color: @bannerBg;
           }
         }
       }

src/components/DiagResultSearch/index.less

@@ -54,7 +54,8 @@
 }
 
 .search-result-item:hover {
-    border: 1px solid @blue;
+  background: @hoverBg;
+  color: @bannerBg;
 }
 
 .search-result-noItem{

src/components/Diagnosis/index.jsx

@@ -103,14 +103,13 @@ class Diagnosis extends Component {
             const showNext = tcmList.length===0||!notAll;
             return (<div id="diagnosisTcmResult">
                 <ItemBox id="tcmDiagnosis" title="中医诊断" boxHeight='auto' hideAllDrop={this.props.hideAllDrop}
-                         titleTop='22px' marginTop='9px' backgroundColor='#EAF7FD'>
+                         titleTop='22px' marginTop='9px' backgroundColor='#E3F0FF'>
                     <DiagnosticList isTcm={isTcm}
                                     refreshScroller={this.refreshScroller}
                                     setHighter={this.props.setHighter}
                                     hideChronic={this.props.hideChronic}></DiagnosticList>
                     {showNext?<div style={{marginLeft: '10px', position: 'relative', color: '#000'}}>
-                        <Add showText="添加中医诊断结果" handleClick={this.handleTcmShowSearch} id="addTcmDiag"
-                             height="50px"/>
+                        <Add showText="添加中医诊断结果" handleClick={this.handleTcmShowSearch} id="addTcmDiag"/>
                         <DiagResultSearch
                             refreshScroller={this.refreshScroller}
                             setHighter={this.props.setHighter}
@@ -126,10 +125,10 @@ class Diagnosis extends Component {
         }
         return (<div id="diagnosisResult">
             <ItemBox id="diagnosis" title='西医诊断' boxHeight='auto' hideAllDrop={this.props.hideAllDrop} titleTop='22px'
-                     marginTop='9px' backgroundColor='#EAF7FD'>
+                     marginTop='9px' backgroundColor='#E3F0FF'>
                 <DiagnosticList refreshScroller={this.refreshScroller} hideChronic={this.props.hideChronic}></DiagnosticList>
                 <div style={{marginLeft: '10px', position: 'relative', color: '#000'}}>
-                    <Add showText="添加西医诊断结果" handleClick={this.handleshowSearch} id="addDiag" height="50px"/>
+                    <Add showText="添加西医诊断结果" handleClick={this.handleshowSearch} id="addDiag"/>
                     <DiagResultSearch
                         refreshScroller={this.refreshScroller}
                         setHighter={this.props.setHighter}

src/components/DiagnosticList/index.jsx

@@ -405,7 +405,7 @@ class DiagnosticList extends Component {
         }
         return(
                 <div className={style['diaglist-wrap']}>
-                    {diagList && (diagList.length > 0) && diagList.map((item, index) => {console.log(diagList,item)
+                    {diagList && (diagList.length > 0) && diagList.map((item, index) => {
 
                         return (<div draggable={false} className={`${style['diag-box']} ${setFontColorSize(2,3)} clearfix`} id="diagListBox" key={item.conceptId} >
                                     {index === 0 ? '' : <span className={style['diag-up']} onClick={() => {this.upDiagnostic(index)}}><img className={style["diag-up"]} src={diagUp}/></span>}

src/components/HistoryCaseContainer/HistoryList/index.jsx

@@ -95,7 +95,7 @@ class HistoryCaseContainer extends React.Component {
       $("#hislistLeft li").eq(idx).css({
         background: '#fff'
       }).siblings().css({
-        background: '#d2d1d1'
+        background: '#eee'
       })
       if (items.length == 0) {
         return

src/components/HistoryCaseContainer/HistoryList/index.less

@@ -21,7 +21,7 @@
     .mainHistoryLeft {
         width: 300px;
         height: 100%;
-        background: #d2d1d1;
+        background: #EEE;
         position: relative;
         float: left;
         padding-top: 80px;
@@ -33,7 +33,7 @@
             top: 0px;
             left: 0;
             width: 100%;
-            background: #d2d1d1;
+            background: #EEE;
         }
         .his {
             font-size: 18px;
@@ -89,7 +89,7 @@
                             white-space: nowrap;    
                             font-size: 14px;  
                             line-height: 34px;   
-                            color: #3B9ED0;                      
+                            color: @bannerBg;
                         }                   
                         .edit{
                             width: 30px;
@@ -126,8 +126,8 @@
                         width: 30px;
                         height:30px;
                         img{
-                            width: 20px;
-                            height: 20px;
+                            width: 16px;
+                            height: 18px;
                             position: relative;
                             top: -7px;
                             left: 13px;
@@ -149,7 +149,7 @@
                 border-radius: 15px;
                 border: 0 none;
                 color: #fff;
-                background-color: @template-color;
+                background-color: @bannerBg;
                 float: right;
                 font-size: 12px;
                 outline: none;

src/components/Operation/index.jsx

@@ -604,9 +604,9 @@ class Operation extends Component {
         close={this.closeSave}
         cancel={this.closeSave}
         okText={"保存"}
-        okBorderColor={'#3B9ED0'}
+        okBorderColor={'#4F9FF3'}
         okColor={'#fff'}
-        oKBg={'#3B9ED0'}
+        oKBg={'#4F9FF3'}
         title={'保存病历'}
         height={200}
       >

src/components/Operation/index.less

@@ -54,10 +54,10 @@
         outline: none;
         border-radius: 4px;
         cursor: pointer;
-        border: 1px solid #3B9ED0;
+        border: 1px solid @bannerBg;
         box-sizing: border-box;
         margin-left:20px;
-        background: #3B9ED0;
+        background: @bannerBg;
         color: #fff;
         float: none;
         display: inline-block;

src/components/PatInfo/index.less

@@ -185,19 +185,17 @@
       color: rgba(0, 0, 0, 0.65);
       font-size: 14px;
       background-color: #fff;
-      background-image: none;
-      border: 1px solid #d9d9d9;
-      border-radius: 4px;
+      box-shadow: 0px 2px 10px 0px #cecece;
       cursor: pointer;
       transition: 0.35s;
       opacity: 1;
-      box-shadow: 0 0 6px 0 rgba(0, 0, 0, 0.3);
       .item {
         position: relative;
         line-height: 20px;
         padding: 8px;
         &:hover {
-          background: rgba(226,241,248,1);
+          background: @hoverBg;
+          color: @bannerBg;
         }
       }
     }

src/components/PushData/index.less

@@ -1,3 +1,4 @@
+@import "~@less/variables.less";
 .slideButton{
     position: fixed;
     width:158px;
@@ -7,17 +8,17 @@
     bottom: 150px;
     right: 0px;
     font-size:16px;
-    background: #7AC1DE;
+    background: @bannerBg;
     color: #fff;
     border-radius:100px 0px 0px 100px;
     cursor: pointer;
     z-index: 31;
 }
 .arrowIcon{
-    width: 22px;
+    width: 15px;
     position: absolute;
-    right: 15px;
-    top: 8px;
+    right: 22px;
+    top: 13px;
 }
 .pushEmptyBox{
     position: relative;
@@ -45,13 +46,14 @@
     bottom: 20px;
     right: 10px;
     background: #fff;
+    border-radius: 4px 4px 0px 0px;
     z-index: 31;
     box-sizing: border-box;
 }
 .pushDataTitle{
     height: 40px;
     line-height: 40px;
-    background: #7AC1DE;
+    background: @bannerBg;
     color: #fff;
     font-size:16px;
     text-align: center;
@@ -62,7 +64,7 @@
     display: inline-block;
     position: absolute;
     height: 40px;
-    padding: 0 10px;
+    padding: 0 18px 0 10px;
     font-size:16px;
     right: 0px;
     cursor: pointer;