Răsfoiți Sursa

添加一个字段,和修改了显示的HTML界面设计。

pzb 6 ani în urmă
părinte
comite
8156742ba4
3 a modificat fișierele cu 37 adăugiri și 6 ștergeri
  1. 7 2
      Controller/AppColophon.py
  2. 1 0
      Model/models.py
  3. 29 4
      templates/appVerList.html

+ 7 - 2
Controller/AppColophon.py

@@ -95,7 +95,7 @@ class AppColView(View):
             omqs = list(omqs[(page - 1) * line:page * line])
             # 查询时候用记得用in,查询是多个
             ev_qs = App_Colophon.objects.filter(app_id__appBundleId__in=list(omqs)).values("id", "lang",
-                     "newApp_version", "content", "app_id__appBundleId", "app_id__app_type")
+                     "newApp_version", "content","version_time", "app_id__appBundleId", "app_id__app_type")
 
             order_list = list(ev_qs)
             datas = {}
@@ -130,8 +130,9 @@ class AppColView(View):
         newApp_version = request_dict.get('newApp_version', None)
         en_content = request_dict.get('en_content', None)
         content = request_dict.get('content', None)
+        version_time = request_dict.get('version_time', None)
         param_flag = CommonService.get_param_flag(
-            data=[en_content, newApp_version, content])
+            data=[app_id,en_content,version_time, newApp_version, content])
         if param_flag is not True:
             return response.json(444)
         app_info = App_Info.objects.filter(appBundleId=app_id)
@@ -144,12 +145,14 @@ class AppColView(View):
                 app_id=App_Info.objects.get(appBundleId=app_id),
                 lang='cn',
                 newApp_version=newApp_version,
+                version_time=version_time,
                 content=content)
             AppColophon.save()
             AppColophon2 = App_Colophon(
                 app_id=App_Info.objects.get(appBundleId=app_id),
                 lang='en',
                 newApp_version=newApp_version,
+                version_time=version_time,
                 content=en_content)
             AppColophon2.save()
             return response.json(0)
@@ -166,6 +169,7 @@ class AppColView(View):
         lang = request_dict.get('lang', None)
         newApp_version = request_dict.get('newApp_version', None)
         content = request_dict.get('content', None)
+        version_time =  request_dict.get('version_time', None)
         id = request_dict.get('id', None)
         if not id:
             return response.json(444, 'content,id')
@@ -176,6 +180,7 @@ class AppColView(View):
             if AppColophon.exists():
                 AppColophon.update(  lang=lang,
                 newApp_version=newApp_version,
+                version_time=version_time,
                 content=content)
                 return response.json(0)
             else:

+ 1 - 0
Model/models.py

@@ -466,6 +466,7 @@ class App_Colophon(models.Model):
     lang = models.CharField(blank=True, max_length=32, verbose_name=u'系统语言')
     newApp_version = models.CharField(blank=True, max_length=12, verbose_name=u'系统版本')
     content = models.TextField(blank=True, default='', verbose_name=u'更新内容')
+    version_time = models.IntegerField(default=0, blank=True, verbose_name=u'版本更新的时间')
 
     def __str__(self):
         return self.id

+ 29 - 4
templates/appVerList.html

@@ -14,6 +14,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="author" content="LayoutIt!">
       <link href="https://cdn.bootcss.com/twitter-bootstrap/4.3.1/css/bootstrap.min.css" rel="stylesheet">
+
+      <script  type="text/javascript"  src=" https://test.dvema.com/web/js/jquery-2.1.1.min.js"></script>
   </head>
   <body>
     <div class="container-fluid">
@@ -23,17 +25,40 @@
 		<div class="col-md-4">
             {% for item  in queryset_dict %}
                 {% if lang == 'cn' %}
-                    <h3 style="text-align: center">版本 :{{ item.fields.newApp_version }}</h3>
-                    {{ item.fields.content }}
+                    <h3 style="text-align: center">版本 :{{ item.fields.newApp_version }}</h3>
+                    <div class="content">{{ item.fields.content }}</div>
                 {% else %}
-                    <h3 style="text-align: center">new version :{{ item.fields.newApp_version }}</h3>
-                    {{ item.fields.content }}
+                    <h3 style="text-align: center">version :{{ item.fields.newApp_version }}</h3>
+                    <div class="content">{{ item.fields.content }}</div>
                 {% endif %}
             {% endfor %}
 		</div>
 		<div class="col-md-4">
 		</div>
 	</div>
+        <script>
+            $(".content").each(function(){
+                var str = $(this).html();
+                var re2=new RegExp("2.","g");
+                var strs2=str.replace(re2,"<br>2.");
+                var re3=new RegExp("3.","g");
+                var strs3=strs2.replace(re3,"<br>3.");
+                var re4=new RegExp("4.","g");
+                var strs4=strs3.replace(re4,"<br>4.");
+                var re5=new RegExp("5.","g");
+                var strs5=strs4.replace(re5,"<br>5.");
+
+                var _re2=new RegExp("2、","g");
+                var _strs2=strs5.replace(_re2,"<br>2、");
+                var _re3=new RegExp("3、","g");
+                var _strs3=_strs2.replace(re3,"<br>3、");
+                var _re4=new RegExp("4、","g");
+                var _strs4=_strs3.replace(re4,"<br>4、");
+                var _re5=new RegExp("5、","g");
+                var _strs5=_strs3.replace(re5,"<br>5、");
+                $(this).html(_strs5);
+            });
+        </script>
 </div>
   </body>
 </html>