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

src/css/homeStatic.less

@@ -55,8 +55,10 @@
       padding: 0 30px;
     }
     .searchBtn {
-      width: 100px;
-      border-left: 1px solid #C4C6CF;
+      width: 88px;
+      height: 100%;
+      line-height: 50px;
+      border-left: 1px solid #979797;
       position: absolute;
       right: 0;
       top: 0;
@@ -66,8 +68,8 @@
       box-sizing: border-box;
       img {
         position: absolute;
-        left: 20px;
-        top: 20px;
+        left: 34px;
+        top: 22px;
         width: 20px;
         height: 20px;
       }

src/css/staticInfo.less

@@ -91,7 +91,8 @@
   .infos {
     height: 100%;
     overflow-y: auto;
-    padding: 0 60px 0 0;
+    /*padding: 0 60px 0 0;*/
+    width: calc(100% - 250px);
   }
 
   .infos>div {
@@ -143,10 +144,11 @@
     right:15px;
     top: 0;
     margin-right: 14px;
-    overflow: auto;
+    overflow-y: auto;
     background-color: #EDFAFF;
     padding: 25px 0;
-    /*height: 100%;*/
+    height: calc(100% - 50px);
+    overflow-x: hidden;
   }
 
   .anchors ul {
@@ -183,7 +185,9 @@
   z-index: 1;
 }
 .anchors .a-circle:last-child{
-  bottom: 22px;
+  position: unset;
+  margin-left: 41px;
+  margin-top: -16px;
 }
   .anchors i {
     position: absolute;

src/css/staticInfoOut.less

@@ -71,7 +71,8 @@ div,li,span,i,p,h1,h2,h3,h4,h5,pre{
   .infos {
     height: 100%;
     overflow-y: auto;
-    padding: 0 60px 0 0;
+    /*padding: 0 60px 0 0;*/
+    width: calc(100% - 250px);
   }
 
   .infos>div {
@@ -123,10 +124,11 @@ div,li,span,i,p,h1,h2,h3,h4,h5,pre{
   right:15px;
   top: 0;
   margin-right: 14px;
-  overflow: auto;
+  overflow-y: auto;
   background-color: #EDFAFF;
   padding: 25px 0;
-  /*height: 100%;*/
+  height: calc(100% - 50px);
+  overflow-x: hidden;
 }
 
 .anchors ul {
@@ -163,7 +165,9 @@ div,li,span,i,p,h1,h2,h3,h4,h5,pre{
   z-index: 1;
 }
 .anchors .a-circle:last-child{
-  bottom: 22px;
+  position: unset;
+  margin-left: 41px;
+  margin-top: -16px;
 }
 .anchors i {
   position: absolute;
@@ -327,7 +331,7 @@ div,li,span,i,p,h1,h2,h3,h4,h5,pre{
 }
 .footer{
   width: 100%;
-  height: 100px;
+  height: 75px;
   background: #172238;
   padding-top: 25px;
   position: absolute;

src/html/homeStatic.html

@@ -28,8 +28,8 @@
         <div class="staticTopSearch clearfix">
           <input class="searchStr" type="text" placeholder="请输入搜索内容">
           <div class="searchBtn">
-            <img src="../images/staticBgS.png" alt=""> 搜索</div>
-        </div>
+            <img src="../images/staticBgS.png" alt="">
+          </div>
       </div>
     </div>
     <p class="foryou">——— 为你提供丰富的医学知识查询 ———</p>

src/html/staticInfoOut.html

@@ -58,7 +58,7 @@
     </div>
   </div>
 <div class="footer">
-    <p>免责声明：本知识库提供的有关疾病、症状、检查、药品、指南规范、循证文献和病例文献等信息仅供医生学习参考。</p>
+    <p>免责声明：本知识库提供的医学静态知识仅供医生学习参考。</p>
     <p>版权所有：杭州朗通信息技术有限公司      浙ICP备：16000400号-2</p>
 </div>
 </body>

src/js/staticInfo.js

@@ -68,11 +68,11 @@ function renderContent(list, contentWrapClassName){
           '">' + item.title + '</a></li><li class="anchor-line"></li>';
         str = '<div class="infoBox"><div class="title"> <h2 class="titleH2" id="' + contentWrapClassName+i +
           '">'
-        if (getUrlArgObject('type') == 8) {
+        /*if (getUrlArgObject('type') == 8) {
           str += '【' + item.title + '】'
-        } else {
+        } else {*/
           str += item.title
-        }
+        /*}*/
         str += '</h2></div>' +
           '<div class="contentWrapper"><pre>' + item.content + '</pre><div></div>';
           str = `<div class="infoWrapper">${str}</div>`
@@ -155,7 +155,7 @@ function bindTabClick(){
 }
 function adjustHeight() {
   var ht = window.innerHeight || document.documentElement.clientHeight;
-  $(".content").height(ht - 30 + "px");
+  $(".content,.content .infos").height(ht - 132 + "px");
 }
 function adjustWidth() {
   var wt = window.innerWidth || document.documentElement.clientWidth;

src/js/staticInfoOut.js

@@ -208,7 +208,8 @@ function bindTabClick(){
 }
 function adjustHeight() {
   var ht = window.innerHeight || document.documentElement.clientHeight;
-  $(".content").height(ht - 250 + "px");
+  $(".content,.content .infos").height(ht - 228 + "px");
+  /*$(".anchors").height(ht - 258 + "px");*/
 }
 function adjustWidth() {
   var wt = window.innerWidth || document.documentElement.clientWidth;

webpack.config.js

@@ -4,7 +4,7 @@ const CleanWebpackPlugin = require('clean-webpack-plugin') // 清空打包目录
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
 const webpack = require('webpack');
-const proxyHost = "http://192.168.2.236:6060";
+const proxyHost = "http://192.168.2.241:6060";
 module.exports = {
   entry: {
     index: path.resolve(__dirname, 'src/js', 'index.js'),