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

src/css/homeStatic.less

@@ -48,6 +48,7 @@
     position: relative;
     input {
       height: 55px;
+      line-height: 55px;
       box-sizing: border-box;
       float: left;
       border-radius: 8px;

src/css/searchStaticList.less

@@ -45,13 +45,12 @@
       text-align: left;
     }
     li {
-      display: inline-block;
+      float: left;
       font-size: 16px;
       color: #333;
-      margin: 0 1.2vw;
+      margin: 0 2% 10px;
       cursor: pointer;
       padding-bottom: 2px;
-      margin-bottom: 14px;
     }
     .tabFst {
       color: @staticMainColor;
@@ -69,7 +68,6 @@
     position: relative;
     overflow: hidden;
     border: 1px solid #979797;
-    margin-top: -4px;
     input {
       height: 50px;
       line-height: 50px;

src/html/searchStaticList.html

@@ -20,7 +20,7 @@
           <a href="homeStatic.html"><img class="staticTopLogo" src="../images/staticLogo.png" alt=""></a>
       </div>
       <div class="staticTopTab">
-        <ul>
+        <ul class="clearfix">
           
         </ul>
       </div>

src/js/tcmiss.js

@@ -8,9 +8,6 @@ $(function () {
         const code = $(this).attr("code");
         openNewWin(targetUrl + '?page=' + code, true);
     })
-    $("#goPush").on("click", function () {
-        openNewWin(targetUrl + '?page=bztd', true);
-    });
 });
 
 function renderConfig(config) {
@@ -37,7 +34,11 @@ function getTcmMr(mrId, config) {
         let data = res.data.data || {}
         const {tcmdisease, tcmsyndrome} = data;
         if (res.data.code === '0') {
-            getTcmData({tcmDiag: (tcmdisease || {}).uniqueName, tcmSyndrome: (tcmsyndrome || {}).uniqueName}, config)
+            const diag = (tcmdisease || {}).uniqueName;
+            $("#goPush").on("click", function () {
+                openNewWin(targetUrl + '?page=bztd&jibing='+diag, true);
+            });
+            getTcmData({tcmDiag: diag, tcmSyndrome: (tcmsyndrome || {}).uniqueName}, config)
         } else {
 
         }