Ver Fonte

Merge branch 'pzb' of ssh://192.168.136.45:10022/SERVER/AnsjerServer into pzb

chenjunkai há 6 anos atrás
pai
commit
d96f0dbf15
1 ficheiros alterados com 30 adições e 4 exclusões
  1. 30 4
      templates/appVerList.html

+ 30 - 4
templates/appVerList.html

@@ -18,9 +18,19 @@
       <script  type="text/javascript"  src=" https://test.dvema.com/web/js/jquery-2.1.1.min.js"></script>
   </head>
   <style>
+      body{
+          background: #f3f4f9;
+      }
+      .date_left{
+          float: left;
+          text-align: left;
+      }
       .date{
+           float: right;
           text-align: right;
       }
+      .content{
+      }
   </style>
   <body>
     <div class="container-fluid">
@@ -30,13 +40,23 @@
 		<div class="col-md-4">
             {% for item  in queryset_dict %}
                 {% if lang == 'cn' %}
-                    <h3 style="text-align: center">版本 :{{ item.fields.newApp_version }}</h3>
-                    <div class="date">更新日期:<a class="data_time">{{ item.fields.version_time }}</a></div>
+                    <h3 style="text-align: left">{{ item.fields.newApp_version }}</h3>
+                    <div class="all">
+                        <!--<div class="date_left">本次更新</div>-->
+                        <div class="date">更新日期:<a class="data_time">{{ item.fields.version_time }}</a></div>
+                    </div>
+                    <br>
                     <div class="content">{{ item.fields.content }}</div>
+                    <hr />
                 {% else %}
-                    <h3 style="text-align: center">version :{{ item.fields.version_time }}{{ item.fields.newApp_version }}</h3>
-                    <div class="date">update date:<a class="data_time">{{ item.fields.version_time }}</a></div>
+                     <h3 style="text-align: left">{{ item.fields.newApp_version }}</h3>
+                    <div class="all">
+                        <!--<div class="date_left">This update</div>-->
+                        <div class="date">update date:<a class="data_time">{{ item.fields.version_time }}</a></div>
+                    </div>
+                    <br>
                     <div class="content">{{ item.fields.content }}</div>
+                    <hr />
                 {% endif %}
             {% endfor %}
 		</div>
@@ -81,6 +101,12 @@
                 // var _strs5=_strs3.replace(re5,"<br>5、");
                 // $(this).html(strs5);
             });
+            $(".content").each(function(){
+                var str = $(this).html();
+                var _re5=new RegExp("\\n","g");
+                var _strs5=str.replace(_re5,"<br>");
+                $(this).html(_strs5);
+            });
         </script>
 </div>
   </body>