郭盛 / community · 提交

转到一个项目

作者 刘朕
提交 981ea24f3f995917a1390c7ca1de23e913ed917b 2 个父辈 8e6b652a a05bffa8
1 个管道 的构建 通过 耗费 1 秒

合并分支 'Branch_liuzhen' 到 'master' 

banner排序修改



查看合并请求 !337
内嵌 并排对比
正在显示 6 个修改的文件 包含 27 行增加 和 5 行删除
@@ -5,6 +5,7 @@ return [ @@ -5,6 +5,7 @@ return [
5 'Image' => '图片', 5 'Image' => '图片',
6 'Url' => '跳转链接', 6 'Url' => '跳转链接',
7 'Typeswitch' => '是否跳转', 7 'Typeswitch' => '是否跳转',
  8 + 'Weigh' => '排序',
8 'Createtime' => '创建时间', 9 'Createtime' => '创建时间',
9 'Updatetime' => '修改时间' 10 'Updatetime' => '修改时间'
10 ]; 11 ];
@@ -27,13 +27,21 @@ class Banner extends Model @@ -27,13 +27,21 @@ class Banner extends Model
27 protected $append = [ 27 protected $append = [
28 28
29 ]; 29 ];
30 -  
31 30
32 -  
33 31
34 32
35 33
36 34
  35 + protected static function init()
  36 + {
  37 + self::afterInsert(function ($row) {
  38 + $pk = $row->getPk();
  39 + $row->getQuery()->where($pk, $row[$pk])->update(['weigh' => $row[$pk]]);
  40 + });
  41 + }
  42 +
  43 +
  44 +
37 45
38 46
39 47
@@ -26,6 +26,12 @@ @@ -26,6 +26,12 @@
26 <!--<input id="c-typeswitch" class="form-control" name="row[typeswitch]" type="number">--> 26 <!--<input id="c-typeswitch" class="form-control" name="row[typeswitch]" type="number">-->
27 <!--</div>--> 27 <!--</div>-->
28 <!--</div>--> 28 <!--</div>-->
  29 + <div class="form-group">
  30 + <label class="control-label col-xs-12 col-sm-2">{:__('Weigh')}:</label>
  31 + <div class="col-xs-12 col-sm-8">
  32 + <input id="c-weigh" class="form-control" name="row[weigh]" type="number" value="0">
  33 + </div>
  34 + </div>
29 <div class="form-group layer-footer"> 35 <div class="form-group layer-footer">
30 <label class="control-label col-xs-12 col-sm-2"></label> 36 <label class="control-label col-xs-12 col-sm-2"></label>
31 <div class="col-xs-12 col-sm-8"> 37 <div class="col-xs-12 col-sm-8">
@@ -26,6 +26,12 @@ @@ -26,6 +26,12 @@
26 <input id="c-typeswitch" class="form-control" name="row[typeswitch]" type="number" value="{$row.typeswitch|htmlentities}"> 26 <input id="c-typeswitch" class="form-control" name="row[typeswitch]" type="number" value="{$row.typeswitch|htmlentities}">
27 </div> 27 </div>
28 </div> 28 </div>
  29 + <div class="form-group">
  30 + <label class="control-label col-xs-12 col-sm-2">{:__('Weigh')}:</label>
  31 + <div class="col-xs-12 col-sm-8">
  32 + <input id="c-weigh" class="form-control" name="row[weigh]" type="number" value="{$row.weigh|htmlentities}">
  33 + </div>
  34 + </div>
29 <div class="form-group layer-footer"> 35 <div class="form-group layer-footer">
30 <label class="control-label col-xs-12 col-sm-2"></label> 36 <label class="control-label col-xs-12 col-sm-2"></label>
31 <div class="col-xs-12 col-sm-8"> 37 <div class="col-xs-12 col-sm-8">
@@ -45,7 +45,7 @@ class House extends Api @@ -45,7 +45,7 @@ class House extends Api
45 */ 45 */
46 public function banner() 46 public function banner()
47 { 47 {
48 - $data = Db::name('banner')->field('updatetime',true)->order('createtime desc')->select(); 48 + $data = Db::name('banner')->field('updatetime',true)->order(['weigh'=>'desc','createtime'=>'desc'])->select();
49 foreach ($data as &$v){ 49 foreach ($data as &$v){
50 $v['image'] = cdnurl($v['image'],true); 50 $v['image'] = cdnurl($v['image'],true);
51 $v['createtime'] = date('Y-m-d H:i:s',$v['createtime']); 51 $v['createtime'] = date('Y-m-d H:i:s',$v['createtime']);
@@ -20,14 +20,15 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin @@ -20,14 +20,15 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
20 table.bootstrapTable({ 20 table.bootstrapTable({
21 url: $.fn.bootstrapTable.defaults.extend.index_url, 21 url: $.fn.bootstrapTable.defaults.extend.index_url,
22 pk: 'id', 22 pk: 'id',
23 - sortName: 'id', 23 + sortName: 'weigh',
24 columns: [ 24 columns: [
25 [ 25 [
26 {checkbox: true}, 26 {checkbox: true},
27 {field: 'id', title: __('Id')}, 27 {field: 'id', title: __('Id')},
28 {field: 'image', title: __('Image'), events: Table.api.events.image, formatter: Table.api.formatter.image}, 28 {field: 'image', title: __('Image'), events: Table.api.events.image, formatter: Table.api.formatter.image},
29 {field: 'url', title: __('Url'), formatter: Table.api.formatter.url}, 29 {field: 'url', title: __('Url'), formatter: Table.api.formatter.url},
30 - {field: 'typeswitch', title: __('是否开启跳转'), table: table, formatter: Table.api.formatter.toggle}, 30 + {field: 'typeswitch', title: __('是否开启跳转'), table: table, formatter: Table.api.formatter.toggle},,
  31 + {field: 'weigh', title: __('Weigh')},
31 {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime}, 32 {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
32 {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime}, 33 {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
33 {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate} 34 {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}