Merge branch 'chronicTreat' into dev/new1

src/common/components/HasInfoItem/index.jsx

@@ -32,7 +32,8 @@ class HasInfoItem extends Component {
             hasEnterImg: false
         })
     }
-    setDrugInfo(item){
+    setDrugInfo(item,e){
+        e.stopPropagation();
         const{ setDrugInfo } = this.props
         setDrugInfo && setDrugInfo(item)
     }
@@ -51,7 +52,10 @@ class HasInfoItem extends Component {
                 onMouseEnter={this.handleMouseEnterDrug.bind(this)}
                 onMouseLeave = {this.handleMouseLeaveDrug.bind(this)}
                 >
-                {item.medicitionName}
+                <span className={style['drug-name-span']}>
+                    {item.medicitionName}
+                    <span className={style['underline']}></span>
+                </span>
                 {<img className={`${style['info-img']} ${hasEnterItem?style['show-content']:style['hide-content']}`}  
                 title='点击i图标可查看详细说明'
                 src={hasEnterImg?infoMove:infoShow} 

src/common/components/HasInfoItem/index.less

@@ -3,17 +3,32 @@
 .drug-name-wrapper {
     position: relative;
     margin-right: 6px;
-    &:not(:last-child):after{
-        display: inline;
-        content: ' ,';
+    &:not(:last-child){
+        .drug-name-span:after{
+            display: inline;
+            content: ',';
+        }
     }
-}
+    
 .drug-name {
-    border-bottom: 1px solid #666;
     display: inline-block;
-    height: 30px;
     cursor: pointer;
     position: relative;
+    
+    
+}
+.drug-name-span {
+   position: relative;
+   
+}
+}
+.underline {
+    position: absolute;
+    width: 100%;
+    border-bottom: 1px solid #666;
+    display: inline-block;
+    left: 0;
+    bottom: 0;
 }
 .info-img, .info-img-more {
     width: 12px;

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'; //周铁刚