Merge branch 'master' of http://git.scdxtc.com/yin5th/zzwy2

app/model/PositionModel.php

@@ -28,7 +28,7 @@ class PositionModel extends Base
         ->when($onlyVisible, function($query){
             $query->where('visible', 1);
         })
-        ->order('sort', 'asc')
+        ->order('sort', 'desc')
         ->limit($pre)
         ->select();
         return $items->toArray();

public/static/manager/js/ocms.js

@@ -461,7 +461,7 @@ function batch_box_show(url,values,top,hot,recommend,title){
                             html += '</select>'+
                         '</div>'+
                     '</div>'+
-                    '<div class="layui-form-item" style="margin-left:10px;">'+
+                    '<div class="layui-form-item" style="margin-left:10px; display: none">'+
                         '<label class="layui-form-label" style="width: auto;">热门：</label>'+
                         '<div class="layui-input-block" style="margin-left: 45px;">'+
                             '<select name="hot" class="layui-select">'
@@ -481,7 +481,7 @@ function batch_box_show(url,values,top,hot,recommend,title){
                             html += '</select>'+
                         '</div>'+
                     '</div>'+
-                    '<div class="layui-form-item" style="margin-left:10px;">'+
+                    '<div class="layui-form-item" style="margin-left:10px;display: none">'+
                         '<label class="layui-form-label" style="width: auto;">推荐：</label>'+
                         '<div class="layui-input-block" style="margin-left: 45px;">'+
                             '<select name="recommend" class="layui-select">'
@@ -921,7 +921,7 @@ function betch_form(obj){
                                 $('.eject-layuiBox').css('max-height','79vh');
                             }
                             if(state == 'edit'){
-                        
+
                             }
                         },
                         end:function(){
@@ -933,10 +933,10 @@ function betch_form(obj){
                 }
             }
          });
-   
+
 
     }
- 
+
     //ajax确认弹窗方法
     /**
      * type {table,primary} 使用在layuitable里面还是外面

view/manager/content/article.html

@@ -70,7 +70,7 @@ use app\model\Category as VCategory;
                 <col width="75px">
                 <col width="75px">
                 <col width="75px">
-                <col width="390px">
+                <col width="">
             </colgroup>
             <thead>
                 <td><input type="checkbox" lay-skin="primary" lay-filter="parents-table" title=""/></td>