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

src/css/cdssHorizontal.less

@@ -223,6 +223,7 @@
     border-radius: 1px;
     padding: 0 0 0 80px;
     display: none;
+    z-index: 1;
 }
 .longStrBoxTitle{
     position: absolute;

src/css/homeStatic.less

@@ -78,7 +78,7 @@
   .foryou {
     width: 100%;
     text-align: center;
-    margin:80px 0 50px 0;
+    margin:180px 0 50px 0;
     color: #333;
     font-size: 2.7vw;
     font-weight: bold;

src/css/staticInfoOut.less

@@ -13,7 +13,7 @@ div,li,span,i,p,h1,h2,h3,h4,h5,pre{
   }
 
   body {
-    min-width: 650px;
+    /*min-width: 650px;*/
     font-size: 14px;
     overflow-y: hidden;
     font-family: '微软雅黑', '宋体';
@@ -77,6 +77,9 @@ div,li,span,i,p,h1,h2,h3,h4,h5,pre{
 
   .infos>div {
     margin-right: 160px;
+    .contentWrapper img{
+      width: 100%;
+    }
   }
 
   .title {
@@ -336,6 +339,7 @@ div,li,span,i,p,h1,h2,h3,h4,h5,pre{
   padding-top: 25px;
   position: absolute;
   bottom: 0;
+  z-index: 1;
   p{
     color:#fff;
     text-align: center;

src/css/staticSearch.css

@@ -1,3 +1,7 @@
+html{
+    background: #fff;
+    font-family: '微软雅黑', '宋体';
+}
 .staticContainer {
     width: 80%;
     background: #fff;

src/js/cdssHorizontal.js

@@ -299,8 +299,8 @@ function renderPushData(){
       }
     
       rendergeneraTreatPush(generaTreatPush)
-      renderMedicinesPush(medicinesPush,1,2,true)
-      renderOperationPush(operationsPush,1,6,true)
+      renderMedicinesPush(medicinesPush,medicinesNum,2,true)
+      renderOperationPush(operationsPush,operationsNum,6,true)
       // if(hasCompleteTnterface === allInterface){
       //   $('.loading').css("display","none")
       //   if(moduleNum === 0){ 
@@ -327,10 +327,10 @@ function renderLis(list,showNum,type,hasInfo){
 function renderScale(list,showNum,type,hasInfo){
   if(list.length > 0 &&  $(".moduleItem.evaluation").length > 0){
     moduleNum++
-    $('.moduleItem.evaluation .moduleItemTitBox').append(titleStr("lisPush"))
+    $('.moduleItem.evaluation .moduleItemTitBox').append(titleStr("scalePush"))
     let {shortStr, longStr} = renderItemWrapper(list,showNum,type,hasInfo)
     $('.moduleItem.evaluation').append(shortStr)
-    $('.moduleItem.evaluation').append(renderLongStr(titleConfigH["lisPush"].name,longStr,titleConfigH["lisPush"].location))
+    $('.moduleItem.evaluation').append(renderLongStr(titleConfigH["scalePush"].name,longStr,titleConfigH["scalePush"].location))
     $('.moduleItem.evaluation').css("display","block")
   }
 }
@@ -380,7 +380,7 @@ function renderOperationPush(list,showNum,type,hasInfo){
  
 }
 function renderDisName(){
-  $(".disName").append(`${treatDisName}`)
+  $(".disName").append(`${treatDisName||''}`)
 }
 function rendergeneraTreatPush(list){
   if(list&&list.length > 0 &&  $(".moduleItem.general").length > 0){