Merge branch 'master' of http://192.168.136.45:3000/SERVER/langer

controller/LangWord.py

@@ -170,7 +170,8 @@ class LangWordView(TemplateView):
             count = lk_qs.count()
             # lk_qs = lk_qs[(page - 1) * line:page * line].values_list('word_key', flat=True)
             # 时间排序
-            if orderByupdate == 1:
+
+            if orderByupdate == "1":
                 lk_qs = lk_qs.order_by('updTime')
             else:
                 lk_qs = lk_qs.order_by('-updTime')

web/index.html

@@ -182,7 +182,11 @@
 </div>
 
 <script type="text/javascript">
-    var orderByupdate = 0
+    var orderByupdate=$.cookie('orderByupdate');
+    if(orderByupdate!=1){
+        setCookie('orderByupdate', 0, 1000)
+    }
+    console.log("11111111orderByupdate"+orderByupdate);
     var page = 1
     var line = 10
     var initData
@@ -224,7 +228,11 @@
         } else {
             orderByupdate = 1
         }
+        setCookie('orderByupdate', orderByupdate, 1000)
+        orderByupdate=$.cookie('orderByupdate');
+        console.log("orderByupdate------------"+orderByupdate)
         var page = GetUrlParam('page')
+        console.log("page----------------"+page)
         if (!page) {
             page = 1
         }
@@ -235,10 +243,10 @@
             'orderByupdate': orderByupdate
         };
         InitIndex(post_data)
+        window.location.reload(); //刷新当前页面.
     }
 
     function InitIndex(post_data) {
-
         $.postJSON(
             http_ip_prot + 'langWord/query', JSON.stringify(post_data),
             function (data) {
@@ -255,7 +263,6 @@
                         displayedPages: 5, //显示几个
                         onPageClick: function (pageNumber, event) {
                             //点击时调用
-                            // alert(pageNumber);
                             queryData(pageNumber)
                         },
                         onInit: function (getid) {
@@ -290,6 +297,7 @@
     let lw_data
 
     function queryData(page) {
+        console.log("----------"+page) ;
         let searchKey = $('input[name="optionsRadios"]:checked').val();
         let searchVal = $('#searchInput').val()
         var post_data = {}