Parcourir la source

前端页面修改

xusonglin il y a 4 ans
Parent
commit
894f27aa64
15 fichiers modifiés avec 339 ajouts et 19 suppressions
  1. 6 0
      tianti-modules/tianti-module-gateway/src/main/webapp/static/css/bootstrap-3.3.7.min.css
  2. BIN
      tianti-modules/tianti-module-gateway/src/main/webapp/static/fonts/glyphicons-halflings-regular.eot
  3. 288 0
      tianti-modules/tianti-module-gateway/src/main/webapp/static/fonts/glyphicons-halflings-regular.svg
  4. BIN
      tianti-modules/tianti-module-gateway/src/main/webapp/static/fonts/glyphicons-halflings-regular.ttf
  5. BIN
      tianti-modules/tianti-module-gateway/src/main/webapp/static/fonts/glyphicons-halflings-regular.woff
  6. BIN
      tianti-modules/tianti-module-gateway/src/main/webapp/static/fonts/glyphicons-halflings-regular.woff2
  7. 7 0
      tianti-modules/tianti-module-gateway/src/main/webapp/static/js/bootstrap-3.3.7.min.js
  8. 4 0
      tianti-modules/tianti-module-gateway/src/main/webapp/static/js/html5shiv-3.7.3.min.js
  9. 5 0
      tianti-modules/tianti-module-gateway/src/main/webapp/static/js/jquery-1.12.4.min.js
  10. 0 2
      tianti-modules/tianti-module-gateway/src/main/webapp/static/js/jquery-1.8.3.min.js
  11. 5 0
      tianti-modules/tianti-module-gateway/src/main/webapp/static/js/respond-1.4.2.min.js
  12. 8 1
      tianti-modules/tianti-module-gateway/src/main/webapp/static/template/textList.js
  13. 6 6
      tianti-modules/tianti-module-gateway/src/main/webapp/tianti/index/index.html
  14. 5 5
      tianti-modules/tianti-module-gateway/src/main/webapp/tianti/menuAndDetail/menuAndDetail.html
  15. 5 5
      tianti-modules/tianti-module-gateway/src/main/webapp/tianti/menuAndTextlist/menuAndTextlist.html

Fichier diff supprimé car celui-ci est trop grand
+ 6 - 0
tianti-modules/tianti-module-gateway/src/main/webapp/static/css/bootstrap-3.3.7.min.css


BIN
tianti-modules/tianti-module-gateway/src/main/webapp/static/fonts/glyphicons-halflings-regular.eot


Fichier diff supprimé car celui-ci est trop grand
+ 288 - 0
tianti-modules/tianti-module-gateway/src/main/webapp/static/fonts/glyphicons-halflings-regular.svg


BIN
tianti-modules/tianti-module-gateway/src/main/webapp/static/fonts/glyphicons-halflings-regular.ttf


BIN
tianti-modules/tianti-module-gateway/src/main/webapp/static/fonts/glyphicons-halflings-regular.woff


BIN
tianti-modules/tianti-module-gateway/src/main/webapp/static/fonts/glyphicons-halflings-regular.woff2


Fichier diff supprimé car celui-ci est trop grand
+ 7 - 0
tianti-modules/tianti-module-gateway/src/main/webapp/static/js/bootstrap-3.3.7.min.js


Fichier diff supprimé car celui-ci est trop grand
+ 4 - 0
tianti-modules/tianti-module-gateway/src/main/webapp/static/js/html5shiv-3.7.3.min.js


Fichier diff supprimé car celui-ci est trop grand
+ 5 - 0
tianti-modules/tianti-module-gateway/src/main/webapp/static/js/jquery-1.12.4.min.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 2
tianti-modules/tianti-module-gateway/src/main/webapp/static/js/jquery-1.8.3.min.js


Fichier diff supprimé car celui-ci est trop grand
+ 5 - 0
tianti-modules/tianti-module-gateway/src/main/webapp/static/js/respond-1.4.2.min.js


+ 8 - 1
tianti-modules/tianti-module-gateway/src/main/webapp/static/template/textList.js

@@ -19,7 +19,14 @@ jc.data.setup(function (data) {
         var $div = $("<div>");
         $div.html(curList.content);
         var filterContent = $div.text();
-        html += '<div onclick="window.router(\'menuAndDetail\',{ rootColumnId:\'' + window.rootColumnId + '\',columnListId:\'' + columnListId + '\',articleId:\'' + curList.id + '\' });" class="l_item ' + (firstClass) + '">';
+        debugger;
+        if (curList.type === 1) {
+            var href = "'" + curList.href + "'";
+            html += '<div onclick="window.location.href='+href+'"  class="l_item ' + (firstClass) + '">';
+        } else {
+            html += '<div onclick="window.router(\'menuAndDetail\',{ rootColumnId:\'' + window.rootColumnId + '\',columnListId:\'' + columnListId + '\',articleId:\'' + curList.id + '\' });" class="l_item ' + (firstClass) + '">';
+        }
+
         if (data.id == "8a2a08425b7a0b7b015b7a0f32450002") {
             html += '<img src="' + (curList.coverImageUrl ? window.serverUploadPath + curList.coverImageUrl : window.notImgUrl) + '">';
         }

+ 6 - 6
tianti-modules/tianti-module-gateway/src/main/webapp/tianti/index/index.html

@@ -9,15 +9,15 @@
     <title>中国医政管理沙龙首页</title>
 
     <!-- Bootstrap -->
-    <link rel="stylesheet" href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
+    <link rel="stylesheet" href="../../static/css/bootstrap-3.3.7.min.css">
 
     <!--[if lt IE 9]>
-      <script src="https://cdn.bootcss.com/html5shiv/3.7.3/html5shiv.min.js"></script>
-      <script src="https://cdn.bootcss.com/respond.js/1.4.2/respond.min.js"></script>
+    <script src="../../static/js/html5shiv-3.7.3.min.js"></script>
+    <script src="../../static/js/respond-1.4.2.min.js"></script>
     <![endif]-->
 
-    <script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script>
-    <script src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
+    <script src="../../static/js/jquery-1.12.4.min.js"></script>
+    <script src="../../static/js/bootstrap-3.3.7.min.js"></script>
 
     <script src="../../static/js/common.js"></script>
     <script src="../../static/js/config.js"></script>
@@ -27,7 +27,7 @@
     <script type="text/javascript">
         $(function(){
             $('#festival').liMarquee({
-                direction: 'down'
+                direction: 'up'
             });
             $('#festival').click(function () {
                 window.location.href=window.root + "menuAndDetail/menuAndDetail.html?rootColumnId=8a2a08425b7aa230015b7ab44ea90013&columnListId=4028814771c6151f0171c626a6e40014&articleId=4028814771ecf1810171f407c9f30033";

+ 5 - 5
tianti-modules/tianti-module-gateway/src/main/webapp/tianti/menuAndDetail/menuAndDetail.html

@@ -8,15 +8,15 @@
     <title>中国医政管理沙龙-资讯页</title>
 
     <!-- Bootstrap -->
-    <link rel="stylesheet" href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
+    <link rel="stylesheet" href="../../static/css/bootstrap-3.3.7.min.css">
 
     <!--[if lt IE 9]>
-      <script src="https://cdn.bootcss.com/html5shiv/3.7.3/html5shiv.min.js"></script>
-      <script src="https://cdn.bootcss.com/respond.js/1.4.2/respond.min.js"></script>
+    <script src="../../static/js/html5shiv-3.7.3.min.js"></script>
+    <script src="../../static/js/respond-1.4.2.min.js"></script>
     <![endif]-->
 
-    <script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script>
-    <script src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
+    <script src="../../static/js/jquery-1.12.4.min.js"></script>
+    <script src="../../static/js/bootstrap-3.3.7.min.js"></script>
 
     <script src="../../static/js/common.js"></script>
     <script src="../../static/js/config.js"></script>

+ 5 - 5
tianti-modules/tianti-module-gateway/src/main/webapp/tianti/menuAndTextlist/menuAndTextlist.html

@@ -8,15 +8,15 @@
     <title>中国医政管理沙龙-资讯页面</title>
 
     <!-- Bootstrap -->
-    <link rel="stylesheet" href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
+    <link rel="stylesheet" href="../../static/css/bootstrap-3.3.7.min.css">
 
     <!--[if lt IE 9]>
-      <script src="https://cdn.bootcss.com/html5shiv/3.7.3/html5shiv.min.js"></script>
-      <script src="https://cdn.bootcss.com/respond.js/1.4.2/respond.min.js"></script>
+    <script src="../../static/js/html5shiv-3.7.3.min.js"></script>
+    <script src="../../static/js/respond-1.4.2.min.js"></script>
     <![endif]-->
 
-    <script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script>
-    <script src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
+    <script src="../../static/js/jquery-1.12.4.min.js"></script>
+    <script src="../../static/js/bootstrap-3.3.7.min.js"></script>
 
     <script src="../../static/js/common.js"></script>
     <script src="../../static/js/config.js"></script>