Merge remote-tracking branch 'origin/mergeOld0630' into testNew

# Conflicts:
#	src/css/staticInfo.less
#	src/js/informationOut.js

src/css/informationOut.less

@@ -225,7 +225,7 @@ div,li,span,i,p,h1,h2,h3,h4,h5,pre{
   border-radius: 0;
   border: none;
   background-color: #F5F6F7;
-  background: url('../images/icon_current.svg') center center no-repeat;
+  background: url('../images/icon_current.png') center center no-repeat;
   background-size: cover;
 }
   .disCopy {

src/css/searchStaticList.less

@@ -43,6 +43,7 @@
     background-color: #fff;
     ul {
       text-align: left;
+      max-width: 750px;
     }
     li {
       float: left;

src/css/staticInfo.less

@@ -151,7 +151,7 @@
     overflow-y: auto;
     background-color: #EDFAFF;
     padding: 25px 0;
-    height: calc(100% - 50px);
+    /*height: calc(100% - 50px);*/
     overflow-x: hidden;
   }
 
@@ -159,7 +159,6 @@
     margin-left: 30px;
     padding: 15px 0px 15px 20px;
     border-radius: 4px;
-    
     border: 1px solid #EDFAFF;
     /*background-color: #EDFAFF;*/
     line-height: 19px;
@@ -185,7 +184,6 @@
   height: 16px;
   background: #fff;
   border-radius: 16px;
-  
   position: absolute;
   left: 41px;
   z-index: 1;
@@ -201,7 +199,6 @@
     width: 16px;
     height: 16px;
     border-radius: 8px;
-    
     border: 1px solid @staticMainColor;
     background-color: @staticMainColor;
     left: -10px;
@@ -209,7 +206,7 @@
     z-index: 1;
   }
 .anchors li:first-child i{
-  top:35px;
+  top:37px;
 }
   .anchors a {
     display: inline-block;
@@ -230,15 +227,15 @@
   }
 
   .anchors .active i {
-    width: 26px;
-    height: 16px;
+    width: 30px;
+    height: 15px;
     top: 6px;
-    left: -14px;
+    left: -15px;
     border-radius: 0;
     border: none;
     background-color: #F5F6F7;
-    background: url('../images/icon_current.png');
-    background-repeat: no-repeat;
+    background: url('../images/icon_current.png') center center no-repeat;
+    background-size:cover ;
   }
   .disCopy {
     -webkit-touch-callout: none;
@@ -275,7 +272,7 @@
     font-size: 14px;
     color: #333333;
     border-radius: 6px 6px 0px 0px;
-    
+
   }
   .activeTab{
     background: @staticMainColor;
@@ -328,7 +325,6 @@
   /*滚动条里面小方块*/
   width: 6px;
   border-radius: 5px;
-  
   background: @staticMainColor;
   height: 100px;
 }
@@ -336,7 +332,6 @@
 .infos::-webkit-scrollbar-track, .anchors::-webkit-scrollbar-track {
   /*滚动条里面轨道*/
   border-radius: 2px;
-  
   background: #f0f2f5;
   opacity: .2;
 }
@@ -403,7 +398,6 @@
     height: 34px;
     background: #FFFFFF;
     border-radius: 8px;
-    
     border: 1px solid #2A9BD5;
     font-size: 16px;
     font-weight: 400;
@@ -421,7 +415,6 @@
 .result{
   background: #EDFAFF;
   border-radius: 10px;
-  
   font-size: 14px;
   font-weight: 500;
   color: #333333;
@@ -437,7 +430,6 @@
       height: 21px;
       background: #2C96E5;
       border-radius: 50%;
-      
       display: flex;
       align-items: center;
       justify-content: center;
@@ -465,7 +457,6 @@
       height: 32px;
       background: #FFFFFF;
       border-radius: 4px;
-      
       border: 1px solid #333333;
       cursor: pointer;
       & img{
@@ -482,7 +473,6 @@
       height: 32px;
       background: #FFFFFF;
       border-radius: 4px;
-      
       border: 1px solid #333333;
       text-align: center;
       line-height: 32px;

src/html/staticInfo.html

@@ -68,7 +68,7 @@
       </div>
     </div>
   </div>
-  <div class="btmFix"></div>
+  <!--<div class="btmFix"></div>-->
 </body>
 
  

src/images/icon_current.svg

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="26px" height="16px" viewBox="0 0 26 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 61 (89581) - https://sketch.com -->
-    <title>矩形</title>
-    <desc>Created with Sketch.</desc>
-    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="疾病详情-临床路径页" transform="translate(-1121.000000, -304.000000)" fill="#2A9BD5">
-            <g id="编组-3" transform="translate(1079.000000, 126.000000)">
-                <polygon id="矩形" points="42 178 63.6239567 178 68 186.189897 63.6239567 194 42 194"></polygon>
-            </g>
-        </g>
-    </g>
-</svg>

src/js/informationOut.js

@@ -1,6 +1,6 @@
-if (!Promise) {
+if(!Promise){
   var Promise = require("bluebird");
-  // Configure
+// Configure
   Promise.config({
     longStackTraces: true,
     warnings: true // note, run node with --trace-warnings to see full stack traces for warnings
@@ -539,8 +539,8 @@ function bindTabClick() {
 function adjustHeight() {
   const extHt = window.opener ? 60 : 0;
   var ht = window.innerHeight || document.documentElement.clientHeight;
-  $(".content,.content .infos").height(ht - 158 + extHt + "px");
-  /*$(".anchors").height(ht - 258 + "px");*/
+    $(".content,.content .infos").height(ht - 158 + extHt + "px");
+    $(".content .anchors").height(ht - 198 + extHt + "px");
 }
 function adjustWidth() {
   var wt = window.innerWidth || document.documentElement.clientWidth;

src/js/staticInfo.js

@@ -478,7 +478,9 @@ function bindTabClick() {
 }
 function adjustHeight() {
   var ht = window.innerHeight || document.documentElement.clientHeight;
-  $(".content,.content .infos").height(ht - 162 + "px");
+  $(".content").height(ht - 160 + "px");
+  $(".content .infos").height(ht - 170 + "px");
+  $(".content .anchors").height(ht - 217 + "px");
 }
 function adjustWidth() {
   var wt = window.innerWidth || document.documentElement.clientWidth;