Merge remote-tracking branch 'origin/dev5.3.1' into dev/new1

src/components/CommonSymptom/index.jsx

@@ -69,14 +69,6 @@ class CommonSymptom extends Component{
     }
     return '';
   }
-  // 历史症状
-  getHisStyle(id){
-    const {conceptId} = this.state;
-    if(conceptId.includes(id)){
-      return style['hisSelect'];
-    }
-    return style['hisTab'];
-  }
   handleClear(e){
     e.stopPropagation();
     this.setState({
@@ -124,12 +116,10 @@ class CommonSymptom extends Component{
         {mainHis.length>0?<ul className={style["his"]} id="his">
           <p>最近输入症状：</p>
           {mainHis.map((it)=>{
-            return <li onClick={(e)=>this.handleSelect(e,it)} title={it.name.length>5?it.name:''}>
-                <span className={this.getHisStyle(it.conceptId)} style={{'padding':it.name.length>5?'0':'0 5px'}}>{it.name.length>5?it.name.slice(0,4)+'...':it.name}</span>
-              </li>
+            return <li onClick={(e)=>this.handleSelect(e,it)} className={this.getStyle(it.conceptId)} title={it.name.length>5?it.name:''}>{it.name.length>5?it.name.slice(0,4)+'...':it.name}</li>
           })}
         </ul>:''}
-        <p>常见症状：</p>
+        <p className={style['c-title']}>常见症状：</p>
         {data&&data.map((it)=>{
           return <li onClick={(e)=>this.handleSelect(e,it)} className={this.getStyle(it.conceptId)} title={it.name.length>5?it.name:''}>{it.name.length>5?it.name.slice(0,4)+'...':it.name}</li>
         })}

src/components/CommonSymptom/index.less

@@ -6,48 +6,28 @@
   white-space: pre-wrap;
   .listBox{
     max-width: 460px;
-    >p{
-      margin: 10px 0 15px;
-      padding-left: 15px;
-    }
-   /*  >li{
-     width: 85px;
-     line-height: 32px;
-     padding-left: 15px;
-     margin-right: 5px;
-     cursor: pointer;
-     display: inline-block;
-   } */
   }
   .his{
-    color: #777777;
-    border-bottom: 1px solid #EAEDF1;
-    padding-bottom: 10px;
-    >p{
-      line-height: 32px;
-      padding-left: 15px;
-      margin-bottom: 10px;
-    }
-    li{
-      /* display: inline-block;
-      margin-left: 10px;
-      padding: 0 5px; */
-      span{
-        display: inline-block;
-        border-radius:13px;
-        line-height: 25px;
-        // padding: 0 5px;
+      color: #3B9ED0;
+      border-bottom: 1px solid #EAEDF1;
+      p{
+        line-height: 32px;
+        padding-left: 15px;
+        color: #000;
       }
     }
+  .c-title{
+    margin: 10px 0;
+    text-indent: 15px;
   }
-   li{
+  li{
     width: 85px;
-    line-height: 32px;
+    line-height: 30px;
     padding-left: 15px;
     margin-right: 5px;
     cursor: pointer;
     display: inline-block;
-  } 
+  }
   li:hover{
     border-color:#3B9ED0;
   }
@@ -73,13 +53,6 @@
     margin-top: 5px;
     padding-right: 5px;
   }
-  .hisTab{
-    border:1px solid rgba(170,170,170,1);
-  }
-  .hisSelect{
-    color:#3B9ED0;
-    border:1px solid rgba(59,158,208,1);
-  }
 }
 .hide{
   display: none;

src/components/PushItems/DetailsModal/index.less

@@ -67,6 +67,7 @@
     height: 100%;
     padding: 0 180px 0 40px;
     overflow-y: auto;
+    white-space:pre;
     ul, ol {
         padding: 0 0 0 15px;
       }

src/components/PushItems/TipsMsg/index.less

@@ -2,6 +2,7 @@
 @import "~@less/base.less";
 
 .tips{
+  
    ul, ol {
      padding: 0 0 0 15px;
    }
@@ -11,8 +12,8 @@
    ol li{
     list-style: decimal;
   }
-  
-    border:1px solid #EAEDF1;
+  white-space:pre;
+  border:1px solid #EAEDF1;
     .tips-title,h1{
       font-size: 14px;
       color: #000;

src/components/TreatDesc/DrugInfo/index.less

@@ -13,6 +13,7 @@
     box-shadow: 0px 0px 5px -2px #7d7c7c;
     word-break: break-all;
     max-width: 100%;
+    white-space:pre;
     ul, ol {
         padding: 0 0 0 15px;
       }

src/components/TreatDesc/index.less

@@ -44,10 +44,11 @@
     height: 100%;
     top: 0;
     background: #fff;
-    padding: 60px  20px 20px 20px;
+    padding: 40px  0px 20px 20px;
     box-shadow: 2px 0px 5px -2px #7d7c7c;
 }
 .similar-drug {
+    padding: 20px 20px 0 0;
     height: 100%;
     overflow-y: auto;
 }