yin5th
/
zzwy2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

master
Lee 2022-10-17 16:13:32 +08:00
parent b08fce3078 380170db6f
commit 9302a45bb5
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/model/PositionModel.php
View File

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

10
public/static/manager/js/ocms.js
View File

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

2
view/manager/content/article.html
View File

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