Selaa lähdekoodia

版本信息修改、接口修改

zhouna 5 vuotta sitten
vanhempi
commit
0d428274f1
4 muutettua tiedostoa jossa 21 lisäystä ja 14 poistoa
  1. 16 10
      src/css/indexVert.less
  2. 2 2
      src/html/index.html
  3. 2 1
      src/js/index.js
  4. 1 1
      src/js/promise.js

+ 16 - 10
src/css/indexVert.less

@@ -266,38 +266,44 @@
 }
 
 .responsibility {
-    text-align: center;
     font-size: 12px;
     color: #979797;
-    padding-top: 15px;
+    padding: 10px 0;
+    position: fixed;
+    bottom: 22px;
+    background: #fff;
+    z-index: 99;
 }
 .disclaimer {
-    height: 40px;
+    padding:10px 0;
     width: 100%;
-    line-height: 40px;
     position: fixed;
     bottom: 0;
-    background-color: #ececec;
     left: 0;
     z-index: 98;
+    font-size: 12px;
+    height: 14px;
+    background: #fff;
     .version-tip{
         margin-left: 20px;
         font-size: 12px;
-        padding-right: 34px;
-        cursor: pointer;
+        a{
+            font-size: 12px;
+            text-decoration: none;
+        }
         &.new-icon{
             background: url(../images/new.png) 100% 0px no-repeat;
         }
     }
     .logo {
-        float: left;
         font-size: 12px;
-        margin-left: 15px;
+        margin-left: 8px;
+        color: #797979;
     }
     .disclaimerInfo {
         float: right;
         font-size: 12px;
-        margin-right: 15px;
+        margin-right: 20px;
     }
 }
 

+ 2 - 2
src/html/index.html

@@ -20,8 +20,8 @@
         <p class="responsibility"></p>
       </div>
       <div class="disclaimer clearfix">
-        <span class="logo">&copy 朗通医疗</span>
-        <span class="version-tip">版本说明</span>
+        <span class="version-tip">版本信息: <a href="javascript:void(0);"></a> </span>
+        <b class="logo">&copy朗通医疗</b>
         <span class="disclaimerInfo">免责声明</span>
       </div>
   </div>

+ 2 - 1
src/js/index.js

@@ -191,6 +191,7 @@ function getVersion() {
     const data = res.data.data;
     const ver = localStorage.getItem('versionTime');
     const time = data.refreshTime;
+    $(".version-tip a").text(data.name);
     if(!ver||ver===time+"=new"||time!==ver.replace("=new","")){       //判断版本是否更新
       $(".version-tip").addClass('new-icon');
       localStorage.setItem('versionTime',time+"=new");     //保存版本更新时间
@@ -213,7 +214,7 @@ $(function(){
   $(".disclaimerInfo").on("click", function(){
     openNewWin("disclaimer.html")
   });
-  $(".version-tip").on("click", function(){
+  $(".version-tip a").on("click", function(){
     const ver = localStorage.getItem('versionTime');
     $(".version-tip").removeClass('new-icon');
     localStorage.setItem('versionTime',ver.replace("=new",""));

+ 1 - 1
src/js/promise.js

@@ -38,7 +38,7 @@ const config = {
   informationMore: '/api/data/conceptDetail/getConceptDetails',
   pushScale: '/api/data/push/pushScale',
   getSysSetInfoDatas: '/api/data/sysSet/getSysSetInfoDatas',
-  getMr: '/api/data/mr/getMr',
+  getMr: '/api/data/mrv2/getMr',
   getVersion: '/api/data/versionInfo/getVersionInfoAlls',
   getStaticKnowledge: '/api/data/search/getStaticKnowledge',
   getStaticScale: '/api/data/search/getScale',