合并分支 'Branch_liuzhen' 到 'master'

banner排序修改



查看合并请求 !337

@@ -5,6 +5,7 @@ return [
     'Image'      => '图片',
     'Url'        => '跳转链接',
     'Typeswitch' => '是否跳转',
+    'Weigh'      => '排序',
     'Createtime' => '创建时间',
     'Updatetime' => '修改时间'
 ];

@@ -27,13 +27,21 @@ class Banner extends Model
     protected $append = [
 
     ];
-    
 
-    
 
 
 
 
+    protected static function init()
+    {
+        self::afterInsert(function ($row) {
+            $pk = $row->getPk();
+            $row->getQuery()->where($pk, $row[$pk])->update(['weigh' => $row[$pk]]);
+        });
+    }
+
+
+
 
 
 

@@ -26,6 +26,12 @@
             <!--<input id="c-typeswitch" class="form-control" name="row[typeswitch]" type="number">-->
         <!--</div>-->
     <!--</div>-->
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Weigh')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-weigh" class="form-control" name="row[weigh]" type="number" value="0">
+        </div>
+    </div>
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">

@@ -26,6 +26,12 @@
             <input id="c-typeswitch" class="form-control" name="row[typeswitch]" type="number" value="{$row.typeswitch|htmlentities}">
         </div>
     </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Weigh')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-weigh" class="form-control" name="row[weigh]" type="number" value="{$row.weigh|htmlentities}">
+        </div>
+    </div>
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">

@@ -45,7 +45,7 @@ class House extends Api
      */
     public function banner()
     {
-        $data = Db::name('banner')->field('updatetime',true)->order('createtime desc')->select();
+        $data = Db::name('banner')->field('updatetime',true)->order(['weigh'=>'desc','createtime'=>'desc'])->select();
         foreach ($data as &$v){
             $v['image'] = cdnurl($v['image'],true);
             $v['createtime'] = date('Y-m-d H:i:s',$v['createtime']);

@@ -20,14 +20,15 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             table.bootstrapTable({
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 pk: 'id',
-                sortName: 'id',
+                sortName: 'weigh',
                 columns: [
                     [
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
                         {field: 'image', title: __('Image'), events: Table.api.events.image, formatter: Table.api.formatter.image},
                         {field: 'url', title: __('Url'), formatter: Table.api.formatter.url},
-                        {field: 'typeswitch', title: __('是否开启跳转'), table: table, formatter: Table.api.formatter.toggle},
+                        {field: 'typeswitch', title: __('是否开启跳转'), table: table, formatter: Table.api.formatter.toggle},,
+                        {field: 'weigh', title: __('Weigh')},
                         {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
                         {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}