소스 검색

后台重构

lizhen_gitee 8 달 전
부모
커밋
90841276ee
28개의 변경된 파일587개의 추가작업 그리고 192개의 파일을 삭제
  1. 3 1
      application/admin/controller/Video.php
  2. 3 1
      application/admin/controller/Videocate.php
  3. 37 0
      application/admin/controller/Videochildcate.php
  4. 1 36
      application/admin/controller/Videotype.php
  5. 5 1
      application/admin/lang/zh-cn/video.php
  6. 14 5
      application/admin/lang/zh-cn/videocate.php
  7. 13 0
      application/admin/lang/zh-cn/videochildcate.php
  8. 9 17
      application/admin/lang/zh-cn/videotype.php
  9. 8 0
      application/admin/model/Video.php
  10. 37 1
      application/admin/model/Videocate.php
  11. 57 0
      application/admin/model/Videochildcate.php
  12. 6 24
      application/admin/model/Videotype.php
  13. 27 0
      application/admin/validate/Videochildcate.php
  14. 12 0
      application/admin/view/video/add.html
  15. 12 0
      application/admin/view/video/edit.html
  16. 32 2
      application/admin/view/videocate/add.html
  17. 32 2
      application/admin/view/videocate/edit.html
  18. 2 2
      application/admin/view/videocate/index.html
  19. 68 0
      application/admin/view/videochildcate/add.html
  20. 68 0
      application/admin/view/videochildcate/edit.html
  21. 45 0
      application/admin/view/videochildcate/index.html
  22. 7 39
      application/admin/view/videotype/add.html
  23. 7 39
      application/admin/view/videotype/edit.html
  24. 3 13
      application/admin/view/videotype/index.html
  25. 14 1
      public/assets/js/backend/video.js
  26. 7 3
      public/assets/js/backend/videocate.js
  27. 57 0
      public/assets/js/backend/videochildcate.js
  28. 1 5
      public/assets/js/backend/videotype.js

+ 3 - 1
application/admin/controller/Video.php

@@ -54,7 +54,7 @@ class Video extends Backend
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
 
 
             $list = $this->model
             $list = $this->model
-                    ->with(['type'])
+                    ->with(['type','cate','childcate'])
                     ->where($where)
                     ->where($where)
                     ->order($sort, $order)
                     ->order($sort, $order)
                     ->paginate($limit);
                     ->paginate($limit);
@@ -62,6 +62,8 @@ class Video extends Backend
             foreach ($list as $row) {
             foreach ($list as $row) {
                 
                 
                 $row->getRelation('type')->visible(['type','name']);
                 $row->getRelation('type')->visible(['type','name']);
+                $row->getRelation('cate')->visible(['name']);
+                $row->getRelation('childcate')->visible(['name']);
             }
             }
 
 
             $result = array("total" => $list->total(), "rows" => $list->items());
             $result = array("total" => $list->total(), "rows" => $list->items());

+ 3 - 1
application/admin/controller/Videocate.php

@@ -5,7 +5,7 @@ namespace app\admin\controller;
 use app\common\controller\Backend;
 use app\common\controller\Backend;
 
 
 /**
 /**
- * 视频专题
+ * 视频大分类
  *
  *
  * @icon fa fa-circle-o
  * @icon fa fa-circle-o
  */
  */
@@ -23,6 +23,8 @@ class Videocate extends Backend
         parent::_initialize();
         parent::_initialize();
         $this->model = new \app\admin\model\Videocate;
         $this->model = new \app\admin\model\Videocate;
         $this->view->assign("statusList", $this->model->getStatusList());
         $this->view->assign("statusList", $this->model->getStatusList());
+        $this->view->assign("showtypeList", $this->model->getShowtypeList());
+        $this->view->assign("isZhuantiList", $this->model->getIsZhuantiList());
     }
     }
 
 
 
 

+ 37 - 0
application/admin/controller/Videochildcate.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace app\admin\controller;
+
+use app\common\controller\Backend;
+
+/**
+ * 视频子分类
+ *
+ * @icon fa fa-circle-o
+ */
+class Videochildcate extends Backend
+{
+
+    /**
+     * Videochildcate模型对象
+     * @var \app\admin\model\Videochildcate
+     */
+    protected $model = null;
+
+    public function _initialize()
+    {
+        parent::_initialize();
+        $this->model = new \app\admin\model\Videochildcate;
+        $this->view->assign("statusList", $this->model->getStatusList());
+    }
+
+
+
+    /**
+     * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法
+     * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑
+     * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改
+     */
+
+
+}

+ 1 - 36
application/admin/controller/Videotype.php

@@ -22,8 +22,7 @@ class Videotype extends Backend
     {
     {
         parent::_initialize();
         parent::_initialize();
         $this->model = new \app\admin\model\Videotype;
         $this->model = new \app\admin\model\Videotype;
-        $this->view->assign("statusList", $this->model->getStatusList());
-        $this->view->assign("showtypeList", $this->model->getShowtypeList());
+        $this->view->assign("typeList", $this->model->getTypeList());
     }
     }
 
 
 
 
@@ -35,38 +34,4 @@ class Videotype extends Backend
      */
      */
 
 
 
 
-    /**
-     * 查看
-     */
-    public function index()
-    {
-        //当前是否为关联查询
-        $this->relationSearch = true;
-        //设置过滤方法
-        $this->request->filter(['strip_tags', 'trim']);
-        if ($this->request->isAjax()) {
-            //如果发送的来源是Selectpage,则转发到Selectpage
-            if ($this->request->request('keyField')) {
-                return $this->selectpage();
-            }
-            list($where, $sort, $order, $offset, $limit) = $this->buildparams();
-
-            $list = $this->model
-                    ->with(['cate'])
-                    ->where($where)
-                    ->order($sort, $order)
-                    ->paginate($limit);
-
-            foreach ($list as $row) {
-                
-                $row->getRelation('cate')->visible(['catename']);
-            }
-
-            $result = array("total" => $list->total(), "rows" => $list->items());
-
-            return json($result);
-        }
-        return $this->view->fetch();
-    }
-
 }
 }

+ 5 - 1
application/admin/lang/zh-cn/video.php

@@ -3,6 +3,8 @@
 return [
 return [
     'Id'            => '主键ID',
     'Id'            => '主键ID',
     'Video_type_id' => '类型ID',
     'Video_type_id' => '类型ID',
+    'cate_id'       => '大分类ID',
+    'childcate_id'  => '子分类ID',
     'Title'         => '标题',
     'Title'         => '标题',
     'Search_title'         => '标题首字母',
     'Search_title'         => '标题首字母',
     'Image'         => '主图',
     'Image'         => '主图',
@@ -22,5 +24,7 @@ return [
     'Type.type'     => '分类类型',
     'Type.type'     => '分类类型',
     'Type.type 0'   => '老年大学',
     'Type.type 0'   => '老年大学',
     'Type.type 1'   => '普法课堂',
     'Type.type 1'   => '普法课堂',
-    'Type.name'     => '类型名称'
+    'Type.name'     => '类型名称',
+    'Cate.name'     => '大分类',
+    'Childcate.name'=> '子分类',
 ];
 ];

+ 14 - 5
application/admin/lang/zh-cn/videocate.php

@@ -1,9 +1,18 @@
 <?php
 <?php
 
 
 return [
 return [
-    'Id'       => 'ID',
-    'Catename' => '专题',
-    'Status'   => '上下架',
-    'Status 0' => '下架',
-    'Status 1' => '上架'
+    'Id'           => 'ID',
+    'Name'         => '大分类',
+    'Status'       => '上下架',
+    'Status 0'     => '下架',
+    'Status 1'     => '上架',
+    'Weigh'        => '权重排序',
+    'Showtype'     => '分布',
+    'Showtype 1'   => '左一右四',
+    'Showtype 2'   => '两行八个',
+    'Showtype 3'   => '一行四个',
+    'Showtype 4'   => '一行三个',
+    'Is_zhuanti'   => '是否专题',
+    'Is_zhuanti 1' => '是',
+    'Is_zhuanti 0' => '否'
 ];
 ];

+ 13 - 0
application/admin/lang/zh-cn/videochildcate.php

@@ -0,0 +1,13 @@
+<?php
+
+return [
+    'Id'       => 'ID',
+    'Cate_id'  => '大分类id',
+    'Name'     => '类型名称',
+    'Image'    => '图片',
+    'Weigh'    => '权重排序',
+    'Status'   => '上下架',
+    'Status 0' => '下架',
+    'Status 1' => '上架',
+    'Bg_image' => '专题背景图'
+];

+ 9 - 17
application/admin/lang/zh-cn/videotype.php

@@ -1,21 +1,13 @@
 <?php
 <?php
 
 
 return [
 return [
-    'Id'            => 'ID',
-    'Type'          => '专题',
-    'Name'          => '类型名称',
-    'Image'         => '图片',
-    'Weigh'         => '权重排序',
-    'Createtime'    => '创建时间',
-    'Updatetime'    => '更新时间',
-    'Status'        => '上下架',
-    'Status 0'      => '下架',
-    'Status 1'      => '上架',
-    'Showtype'      => '分布',
-    'Showtype 1'    => '左一右四',
-    'Showtype 2'    => '两行八个',
-    'Showtype 3'    => '一行四个',
-    'Showtype 4'    => '一行三个',
-    'Bg_image'      => '专题背景图',
-    'Cate.catename' => '专题'
+    'Id'         => 'ID',
+    'Type'       => '分类类型',
+    'Type 0'     => '老年大学',
+    'Type 1'     => '普法课堂',
+    'Name'       => '类型名称',
+    'Image'      => '图片',
+    'Weigh'      => '权重排序',
+    'Createtime' => '创建时间',
+    'Updatetime' => '更新时间'
 ];
 ];

+ 8 - 0
application/admin/model/Video.php

@@ -72,4 +72,12 @@ class Video extends Model
     {
     {
         return $this->belongsTo('Videotype', 'video_type_id', 'id', [], 'LEFT')->setEagerlyType(0);
         return $this->belongsTo('Videotype', 'video_type_id', 'id', [], 'LEFT')->setEagerlyType(0);
     }
     }
+    public function cate()
+    {
+        return $this->belongsTo('Videocate', 'cate_id', 'id', [], 'LEFT')->setEagerlyType(0);
+    }
+    public function childcate()
+    {
+        return $this->belongsTo('Videochildcate', 'childcate_id', 'id', [], 'LEFT')->setEagerlyType(0);
+    }
 }
 }

+ 37 - 1
application/admin/model/Videocate.php

@@ -25,16 +25,36 @@ class Videocate extends Model
 
 
     // 追加属性
     // 追加属性
     protected $append = [
     protected $append = [
-        'status_text'
+        'status_text',
+        'showtype_text',
+        'is_zhuanti_text'
     ];
     ];
     
     
 
 
+    protected static function init()
+    {
+        self::afterInsert(function ($row) {
+            $pk = $row->getPk();
+            $row->getQuery()->where($pk, $row[$pk])->update(['weigh' => $row[$pk]]);
+        });
+    }
+
     
     
     public function getStatusList()
     public function getStatusList()
     {
     {
         return ['0' => __('Status 0'), '1' => __('Status 1')];
         return ['0' => __('Status 0'), '1' => __('Status 1')];
     }
     }
 
 
+    public function getShowtypeList()
+    {
+        return ['1' => __('Showtype 1'), '2' => __('Showtype 2'), '3' => __('Showtype 3'), '4' => __('Showtype 4')];
+    }
+
+    public function getIsZhuantiList()
+    {
+        return ['1' => __('Is_zhuanti 1'), '0' => __('Is_zhuanti 0')];
+    }
+
 
 
     public function getStatusTextAttr($value, $data)
     public function getStatusTextAttr($value, $data)
     {
     {
@@ -44,6 +64,22 @@ class Videocate extends Model
     }
     }
 
 
 
 
+    public function getShowtypeTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['showtype']) ? $data['showtype'] : '');
+        $list = $this->getShowtypeList();
+        return isset($list[$value]) ? $list[$value] : '';
+    }
+
+
+    public function getIsZhuantiTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['is_zhuanti']) ? $data['is_zhuanti'] : '');
+        $list = $this->getIsZhuantiList();
+        return isset($list[$value]) ? $list[$value] : '';
+    }
+
+
 
 
 
 
 }
 }

+ 57 - 0
application/admin/model/Videochildcate.php

@@ -0,0 +1,57 @@
+<?php
+
+namespace app\admin\model;
+
+use think\Model;
+
+
+class Videochildcate extends Model
+{
+
+    
+
+    
+
+    // 表名
+    protected $name = 'video_childcate';
+    
+    // 自动写入时间戳字段
+    protected $autoWriteTimestamp = false;
+
+    // 定义时间戳字段名
+    protected $createTime = false;
+    protected $updateTime = false;
+    protected $deleteTime = false;
+
+    // 追加属性
+    protected $append = [
+        'status_text'
+    ];
+    
+
+    protected static function init()
+    {
+        self::afterInsert(function ($row) {
+            $pk = $row->getPk();
+            $row->getQuery()->where($pk, $row[$pk])->update(['weigh' => $row[$pk]]);
+        });
+    }
+
+    
+    public function getStatusList()
+    {
+        return ['0' => __('Status 0'), '1' => __('Status 1')];
+    }
+
+
+    public function getStatusTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['status']) ? $data['status'] : '');
+        $list = $this->getStatusList();
+        return isset($list[$value]) ? $list[$value] : '';
+    }
+
+
+
+
+}

+ 6 - 24
application/admin/model/Videotype.php

@@ -25,8 +25,7 @@ class Videotype extends Model
 
 
     // 追加属性
     // 追加属性
     protected $append = [
     protected $append = [
-        'status_text',
-        'showtype_text'
+        'type_text'
     ];
     ];
     
     
 
 
@@ -39,37 +38,20 @@ class Videotype extends Model
     }
     }
 
 
     
     
-    public function getStatusList()
+    public function getTypeList()
     {
     {
-        return ['0' => __('Status 0'), '1' => __('Status 1')];
-    }
-
-    public function getShowtypeList()
-    {
-        return ['1' => __('Showtype 1'), '2' => __('Showtype 2'), '3' => __('Showtype 3'), '4' => __('Showtype 4')];
-    }
-
-
-    public function getStatusTextAttr($value, $data)
-    {
-        $value = $value ? $value : (isset($data['status']) ? $data['status'] : '');
-        $list = $this->getStatusList();
-        return isset($list[$value]) ? $list[$value] : '';
+        return ['0' => __('Type 0'), '1' => __('Type 1')];
     }
     }
 
 
 
 
-    public function getShowtypeTextAttr($value, $data)
+    public function getTypeTextAttr($value, $data)
     {
     {
-        $value = $value ? $value : (isset($data['showtype']) ? $data['showtype'] : '');
-        $list = $this->getShowtypeList();
+        $value = $value ? $value : (isset($data['type']) ? $data['type'] : '');
+        $list = $this->getTypeList();
         return isset($list[$value]) ? $list[$value] : '';
         return isset($list[$value]) ? $list[$value] : '';
     }
     }
 
 
 
 
 
 
 
 
-    public function cate()
-    {
-        return $this->belongsTo('Videocate', 'type', 'id', [], 'LEFT')->setEagerlyType(0);
-    }
 }
 }

+ 27 - 0
application/admin/validate/Videochildcate.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace app\admin\validate;
+
+use think\Validate;
+
+class Videochildcate extends Validate
+{
+    /**
+     * 验证规则
+     */
+    protected $rule = [
+    ];
+    /**
+     * 提示消息
+     */
+    protected $message = [
+    ];
+    /**
+     * 验证场景
+     */
+    protected $scene = [
+        'add'  => [],
+        'edit' => [],
+    ];
+    
+}

+ 12 - 0
application/admin/view/video/add.html

@@ -7,6 +7,18 @@
         </div>
         </div>
     </div>
     </div>
     <div class="form-group">
     <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Cate_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-cate_id" data-rule="required" data-source="videocate/index" data-order-by="weigh asc" class="form-control selectpage" name="row[cate_id]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Childcate_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-childcate_id" data-rule="required" data-source="videochildcate/index" data-order-by="weigh asc" class="form-control selectpage" name="row[childcate_id]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Title')}:</label>
         <label class="control-label col-xs-12 col-sm-2">{:__('Title')}:</label>
         <div class="col-xs-12 col-sm-8">
         <div class="col-xs-12 col-sm-8">
             <input id="c-title" data-rule="required" class="form-control" name="row[title]" type="text" value="">
             <input id="c-title" data-rule="required" class="form-control" name="row[title]" type="text" value="">

+ 12 - 0
application/admin/view/video/edit.html

@@ -7,6 +7,18 @@
         </div>
         </div>
     </div>
     </div>
     <div class="form-group">
     <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Cate_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-cate_id" data-rule="required" data-source="videocate/index" data-order-by="weigh asc" class="form-control selectpage" name="row[cate_id]" type="text" value="{$row.cate_id|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Childcate_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-childcate_id" data-rule="required" data-source="videochildcate/index" data-order-by="weigh asc" class="form-control selectpage" name="row[childcate_id]" type="text" value="{$row.childcate_id|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Title')}:</label>
         <label class="control-label col-xs-12 col-sm-2">{:__('Title')}:</label>
         <div class="col-xs-12 col-sm-8">
         <div class="col-xs-12 col-sm-8">
             <input id="c-title" data-rule="required" class="form-control" name="row[title]" type="text" value="{$row.title|htmlentities}">
             <input id="c-title" data-rule="required" class="form-control" name="row[title]" type="text" value="{$row.title|htmlentities}">

+ 32 - 2
application/admin/view/videocate/add.html

@@ -1,9 +1,9 @@
 <form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
 <form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
 
 
     <div class="form-group">
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Catename')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Name')}:</label>
         <div class="col-xs-12 col-sm-8">
         <div class="col-xs-12 col-sm-8">
-            <input id="c-catename" class="form-control" name="row[catename]" type="text" value="">
+            <input id="c-name" class="form-control" name="row[name]" type="text" value="">
         </div>
         </div>
     </div>
     </div>
     <div class="form-group">
     <div class="form-group">
@@ -18,6 +18,36 @@
 
 
         </div>
         </div>
     </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" data-rule="required" class="form-control" name="row[weigh]" type="number" value="0">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Showtype')}:</label>
+        <div class="col-xs-12 col-sm-8">
+                        
+            <select  id="c-showtype" data-rule="required" class="form-control selectpicker" name="row[showtype]">
+                {foreach name="showtypeList" item="vo"}
+                    <option value="{$key}" {in name="key" value="1"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Is_zhuanti')}:</label>
+        <div class="col-xs-12 col-sm-8">
+                        
+            <select  id="c-is_zhuanti" data-rule="required" class="form-control selectpicker" name="row[is_zhuanti]">
+                {foreach name="isZhuantiList" item="vo"}
+                    <option value="{$key}" {in name="key" value="0"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
+        </div>
+    </div>
     <div class="form-group layer-footer">
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">
         <div class="col-xs-12 col-sm-8">

+ 32 - 2
application/admin/view/videocate/edit.html

@@ -1,9 +1,9 @@
 <form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
 <form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
 
 
     <div class="form-group">
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Catename')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Name')}:</label>
         <div class="col-xs-12 col-sm-8">
         <div class="col-xs-12 col-sm-8">
-            <input id="c-catename" class="form-control" name="row[catename]" type="text" value="{$row.catename|htmlentities}">
+            <input id="c-name" class="form-control" name="row[name]" type="text" value="{$row.name|htmlentities}">
         </div>
         </div>
     </div>
     </div>
     <div class="form-group">
     <div class="form-group">
@@ -18,6 +18,36 @@
 
 
         </div>
         </div>
     </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" data-rule="required" class="form-control" name="row[weigh]" type="number" value="{$row.weigh|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Showtype')}:</label>
+        <div class="col-xs-12 col-sm-8">
+                        
+            <select  id="c-showtype" data-rule="required" class="form-control selectpicker" name="row[showtype]">
+                {foreach name="showtypeList" item="vo"}
+                    <option value="{$key}" {in name="key" value="$row.showtype"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Is_zhuanti')}:</label>
+        <div class="col-xs-12 col-sm-8">
+                        
+            <select  id="c-is_zhuanti" data-rule="required" class="form-control selectpicker" name="row[is_zhuanti]">
+                {foreach name="isZhuantiList" item="vo"}
+                    <option value="{$key}" {in name="key" value="$row.is_zhuanti"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
+        </div>
+    </div>
     <div class="form-group layer-footer">
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">
         <div class="col-xs-12 col-sm-8">

+ 2 - 2
application/admin/view/videocate/index.html

@@ -17,8 +17,8 @@
                 <div class="widget-body no-padding">
                 <div class="widget-body no-padding">
                     <div id="toolbar" class="toolbar">
                     <div id="toolbar" class="toolbar">
                         <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
                         <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
-                        <!--<a href="javascript:;" class="btn btn-success btn-add {:$auth->check('videocate/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
-                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('videocate/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
+                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('videocate/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
+                        <!--<a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('videocate/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
                         <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('videocate/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
                         <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('videocate/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
                         
                         
 
 

+ 68 - 0
application/admin/view/videochildcate/add.html

@@ -0,0 +1,68 @@
+<form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Cate_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-cate_id" data-rule="required" data-source="cate/index" class="form-control selectpage" name="row[cate_id]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Name')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-name" data-rule="required" class="form-control" name="row[name]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Image')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <div class="input-group">
+                <input id="c-image" data-rule="required" class="form-control" size="50" name="row[image]" type="text" value="">
+                <div class="input-group-addon no-border no-padding">
+                    <span><button type="button" id="faupload-image" class="btn btn-danger faupload" data-input-id="c-image" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp,image/webp" data-multiple="false" data-preview-id="p-image"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
+                    <span><button type="button" id="fachoose-image" class="btn btn-primary fachoose" data-input-id="c-image" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
+                </div>
+                <span class="msg-box n-right" for="c-image"></span>
+            </div>
+            <ul class="row list-inline faupload-preview" id="p-image"></ul>
+        </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" data-rule="required" class="form-control" name="row[weigh]" type="number" value="0">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            
+            <div class="radio">
+            {foreach name="statusList" item="vo"}
+            <label for="row[status]-{$key}"><input id="row[status]-{$key}" name="row[status]" type="radio" value="{$key}" {in name="key" value="1"}checked{/in} /> {$vo}</label> 
+            {/foreach}
+            </div>
+
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Bg_image')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <div class="input-group">
+                <input id="c-bg_image" data-rule="required" class="form-control" size="50" name="row[bg_image]" type="text" value="">
+                <div class="input-group-addon no-border no-padding">
+                    <span><button type="button" id="faupload-bg_image" class="btn btn-danger faupload" data-input-id="c-bg_image" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp,image/webp" data-multiple="false" data-preview-id="p-bg_image"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
+                    <span><button type="button" id="fachoose-bg_image" class="btn btn-primary fachoose" data-input-id="c-bg_image" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
+                </div>
+                <span class="msg-box n-right" for="c-bg_image"></span>
+            </div>
+            <ul class="row list-inline faupload-preview" id="p-bg_image"></ul>
+        </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">
+            <button type="submit" class="btn btn-primary btn-embossed disabled">{:__('OK')}</button>
+            <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
+        </div>
+    </div>
+</form>

+ 68 - 0
application/admin/view/videochildcate/edit.html

@@ -0,0 +1,68 @@
+<form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Cate_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-cate_id" data-rule="required" data-source="cate/index" class="form-control selectpage" name="row[cate_id]" type="text" value="{$row.cate_id|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Name')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-name" data-rule="required" class="form-control" name="row[name]" type="text" value="{$row.name|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Image')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <div class="input-group">
+                <input id="c-image" data-rule="required" class="form-control" size="50" name="row[image]" type="text" value="{$row.image|htmlentities}">
+                <div class="input-group-addon no-border no-padding">
+                    <span><button type="button" id="faupload-image" class="btn btn-danger faupload" data-input-id="c-image" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp,image/webp" data-multiple="false" data-preview-id="p-image"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
+                    <span><button type="button" id="fachoose-image" class="btn btn-primary fachoose" data-input-id="c-image" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
+                </div>
+                <span class="msg-box n-right" for="c-image"></span>
+            </div>
+            <ul class="row list-inline faupload-preview" id="p-image"></ul>
+        </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" data-rule="required" class="form-control" name="row[weigh]" type="number" value="{$row.weigh|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            
+            <div class="radio">
+            {foreach name="statusList" item="vo"}
+            <label for="row[status]-{$key}"><input id="row[status]-{$key}" name="row[status]" type="radio" value="{$key}" {in name="key" value="$row.status"}checked{/in} /> {$vo}</label> 
+            {/foreach}
+            </div>
+
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Bg_image')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <div class="input-group">
+                <input id="c-bg_image" data-rule="required" class="form-control" size="50" name="row[bg_image]" type="text" value="{$row.bg_image|htmlentities}">
+                <div class="input-group-addon no-border no-padding">
+                    <span><button type="button" id="faupload-bg_image" class="btn btn-danger faupload" data-input-id="c-bg_image" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp,image/webp" data-multiple="false" data-preview-id="p-bg_image"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
+                    <span><button type="button" id="fachoose-bg_image" class="btn btn-primary fachoose" data-input-id="c-bg_image" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
+                </div>
+                <span class="msg-box n-right" for="c-bg_image"></span>
+            </div>
+            <ul class="row list-inline faupload-preview" id="p-bg_image"></ul>
+        </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">
+            <button type="submit" class="btn btn-primary btn-embossed disabled">{:__('OK')}</button>
+            <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
+        </div>
+    </div>
+</form>

+ 45 - 0
application/admin/view/videochildcate/index.html

@@ -0,0 +1,45 @@
+<div class="panel panel-default panel-intro">
+    
+    <div class="panel-heading">
+        {:build_heading(null,FALSE)}
+        <ul class="nav nav-tabs" data-field="status">
+            <li class="{:$Think.get.status === null ? 'active' : ''}"><a href="#t-all" data-value="" data-toggle="tab">{:__('All')}</a></li>
+            {foreach name="statusList" item="vo"}
+            <li class="{:$Think.get.status === (string)$key ? 'active' : ''}"><a href="#t-{$key}" data-value="{$key}" data-toggle="tab">{$vo}</a></li>
+            {/foreach}
+        </ul>
+    </div>
+
+
+    <div class="panel-body">
+        <div id="myTabContent" class="tab-content">
+            <div class="tab-pane fade active in" id="one">
+                <div class="widget-body no-padding">
+                    <div id="toolbar" class="toolbar">
+                        <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
+                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('videochildcate/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
+                        <!--<a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('videochildcate/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
+                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('videochildcate/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
+                        
+
+                        <div class="dropdown btn-group {:$auth->check('videochildcate/multi')?'':'hide'}">
+                            <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
+                            <ul class="dropdown-menu text-left" role="menu">
+                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>
+                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>
+                            </ul>
+                        </div>-->
+
+                        
+                    </div>
+                    <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
+                           data-operate-edit="{:$auth->check('videochildcate/edit')}"
+                           data-operate-del="{:$auth->check('videochildcate/del')}"
+                           width="100%">
+                    </table>
+                </div>
+            </div>
+
+        </div>
+    </div>
+</div>

+ 7 - 39
application/admin/view/videotype/add.html

@@ -3,7 +3,13 @@
     <div class="form-group">
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Type')}:</label>
         <label class="control-label col-xs-12 col-sm-2">{:__('Type')}:</label>
         <div class="col-xs-12 col-sm-8">
         <div class="col-xs-12 col-sm-8">
-            <input id="c-type" data-rule="required" class="form-control selectpage" data-source="videocate/index" data-field="catename" name="row[type]">
+                        
+            <select  id="c-type" data-rule="required" class="form-control selectpicker" name="row[type]">
+                {foreach name="typeList" item="vo"}
+                    <option value="{$key}" {in name="key" value="0"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
         </div>
         </div>
     </div>
     </div>
     <div class="form-group">
     <div class="form-group">
@@ -32,44 +38,6 @@
             <input id="c-weigh" data-rule="required" class="form-control" name="row[weigh]" type="number" value="0">
             <input id="c-weigh" data-rule="required" class="form-control" name="row[weigh]" type="number" value="0">
         </div>
         </div>
     </div>
     </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            
-            <div class="radio">
-            {foreach name="statusList" item="vo"}
-            <label for="row[status]-{$key}"><input id="row[status]-{$key}" name="row[status]" type="radio" value="{$key}" {in name="key" value="1"}checked{/in} /> {$vo}</label> 
-            {/foreach}
-            </div>
-
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Showtype')}:</label>
-        <div class="col-xs-12 col-sm-8">
-                        
-            <select  id="c-showtype" data-rule="required" class="form-control selectpicker" name="row[showtype]">
-                {foreach name="showtypeList" item="vo"}
-                    <option value="{$key}" {in name="key" value="1"}selected{/in}>{$vo}</option>
-                {/foreach}
-            </select>
-
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Bg_image')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <div class="input-group">
-                <input id="c-bg_image" data-rule="required" class="form-control" size="50" name="row[bg_image]" type="text" value="">
-                <div class="input-group-addon no-border no-padding">
-                    <span><button type="button" id="faupload-bg_image" class="btn btn-danger faupload" data-input-id="c-bg_image" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp,image/webp" data-multiple="false" data-preview-id="p-bg_image"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
-                    <span><button type="button" id="fachoose-bg_image" class="btn btn-primary fachoose" data-input-id="c-bg_image" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
-                </div>
-                <span class="msg-box n-right" for="c-bg_image"></span>
-            </div>
-            <ul class="row list-inline faupload-preview" id="p-bg_image"></ul>
-        </div>
-    </div>
     <div class="form-group layer-footer">
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">
         <div class="col-xs-12 col-sm-8">

+ 7 - 39
application/admin/view/videotype/edit.html

@@ -3,7 +3,13 @@
     <div class="form-group">
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Type')}:</label>
         <label class="control-label col-xs-12 col-sm-2">{:__('Type')}:</label>
         <div class="col-xs-12 col-sm-8">
         <div class="col-xs-12 col-sm-8">
-            <input id="c-type" data-rule="required" class="form-control selectpage" name="row[type]" data-source="videocate/index" data-field="catename" value="{$row.type|htmlentities}">
+                        
+            <select  id="c-type" data-rule="required" class="form-control selectpicker" name="row[type]">
+                {foreach name="typeList" item="vo"}
+                    <option value="{$key}" {in name="key" value="$row.type"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
         </div>
         </div>
     </div>
     </div>
     <div class="form-group">
     <div class="form-group">
@@ -32,44 +38,6 @@
             <input id="c-weigh" data-rule="required" class="form-control" name="row[weigh]" type="number" value="{$row.weigh|htmlentities}">
             <input id="c-weigh" data-rule="required" class="form-control" name="row[weigh]" type="number" value="{$row.weigh|htmlentities}">
         </div>
         </div>
     </div>
     </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            
-            <div class="radio">
-            {foreach name="statusList" item="vo"}
-            <label for="row[status]-{$key}"><input id="row[status]-{$key}" name="row[status]" type="radio" value="{$key}" {in name="key" value="$row.status"}checked{/in} /> {$vo}</label> 
-            {/foreach}
-            </div>
-
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Showtype')}:</label>
-        <div class="col-xs-12 col-sm-8">
-                        
-            <select  id="c-showtype" data-rule="required" class="form-control selectpicker" name="row[showtype]">
-                {foreach name="showtypeList" item="vo"}
-                    <option value="{$key}" {in name="key" value="$row.showtype"}selected{/in}>{$vo}</option>
-                {/foreach}
-            </select>
-
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Bg_image')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <div class="input-group">
-                <input id="c-bg_image" data-rule="required" class="form-control" size="50" name="row[bg_image]" type="text" value="{$row.bg_image|htmlentities}">
-                <div class="input-group-addon no-border no-padding">
-                    <span><button type="button" id="faupload-bg_image" class="btn btn-danger faupload" data-input-id="c-bg_image" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp,image/webp" data-multiple="false" data-preview-id="p-bg_image"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
-                    <span><button type="button" id="fachoose-bg_image" class="btn btn-primary fachoose" data-input-id="c-bg_image" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
-                </div>
-                <span class="msg-box n-right" for="c-bg_image"></span>
-            </div>
-            <ul class="row list-inline faupload-preview" id="p-bg_image"></ul>
-        </div>
-    </div>
     <div class="form-group layer-footer">
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">
         <div class="col-xs-12 col-sm-8">

+ 3 - 13
application/admin/view/videotype/index.html

@@ -1,15 +1,5 @@
 <div class="panel panel-default panel-intro">
 <div class="panel panel-default panel-intro">
-    
-    <div class="panel-heading">
-        {:build_heading(null,FALSE)}
-        <ul class="nav nav-tabs" data-field="status">
-            <li class="{:$Think.get.status === null ? 'active' : ''}"><a href="#t-all" data-value="" data-toggle="tab">{:__('All')}</a></li>
-            {foreach name="statusList" item="vo"}
-            <li class="{:$Think.get.status === (string)$key ? 'active' : ''}"><a href="#t-{$key}" data-value="{$key}" data-toggle="tab">{$vo}</a></li>
-            {/foreach}
-        </ul>
-    </div>
-
+    {:build_heading()}
 
 
     <div class="panel-body">
     <div class="panel-body">
         <div id="myTabContent" class="tab-content">
         <div id="myTabContent" class="tab-content">
@@ -18,8 +8,8 @@
                     <div id="toolbar" class="toolbar">
                     <div id="toolbar" class="toolbar">
                         <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
                         <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
                         <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('videotype/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
                         <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('videotype/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
-                        <!--<a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('videotype/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>-->
-                        <!--<a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('videotype/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
+                        <!--<a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('videotype/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
+                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('videotype/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
                         
                         
 
 
                         <div class="dropdown btn-group {:$auth->check('videotype/multi')?'':'hide'}">
                         <div class="dropdown btn-group {:$auth->check('videotype/multi')?'':'hide'}">

+ 14 - 1
public/assets/js/backend/video.js

@@ -28,9 +28,13 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     [
                     [
                         {checkbox: true},
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
                         {field: 'id', title: __('Id')},
-                        {field: 'video_type_id', title: __('Video_type_id')},
+//                        {field: 'video_type_id', title: __('Video_type_id')},
                         // {field: 'type.type', title: __('Type.type')},
                         // {field: 'type.type', title: __('Type.type')},
                         {field: 'type.name', title: __('Type.name'), operate: 'LIKE'},
                         {field: 'type.name', title: __('Type.name'), operate: 'LIKE'},
+//                        {field: 'cate_id', title: __('Cate_id')},
+                        {field: 'cate.name', title: __('Cate.name'),operate:'LIKE'},
+//                        {field: 'childcate_id', title: __('Childcate_id')},
+                        {field: 'childcate.name', title: __('Childcate.name'), operate: 'LIKE'},
                         {field: 'title', title: __('Title'), operate: 'LIKE'},
                         {field: 'title', title: __('Title'), operate: 'LIKE'},
                         {field: 'search_title', title: __('Search_title'), operate: 'LIKE'},
                         {field: 'search_title', title: __('Search_title'), operate: 'LIKE'},
                         {field: 'image', title: __('Image'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
                         {field: 'image', title: __('Image'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
@@ -69,3 +73,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
     };
     };
     return Controller;
     return Controller;
 });
 });
+
+$("#c-childcate_id").data("params", function (obj) {
+    return {
+        custom: {cate_id: $("#c-cate_id").val()}
+    };
+});
+$(document).on("change","#c-cate_id",function(){
+    $("#c-childcate_id").selectPageClear();
+})

+ 7 - 3
public/assets/js/backend/videocate.js

@@ -8,7 +8,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     index_url: 'videocate/index' + location.search,
                     index_url: 'videocate/index' + location.search,
                     add_url: 'videocate/add',
                     add_url: 'videocate/add',
                     edit_url: 'videocate/edit',
                     edit_url: 'videocate/edit',
-//                    del_url: 'videocate/del',
+                    del_url: 'videocate/del',
                     multi_url: 'videocate/multi',
                     multi_url: 'videocate/multi',
                     import_url: 'videocate/import',
                     import_url: 'videocate/import',
                     table: 'video_cate',
                     table: 'video_cate',
@@ -21,13 +21,17 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             table.bootstrapTable({
             table.bootstrapTable({
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 pk: 'id',
                 pk: 'id',
-                sortName: 'id',
+                sortName: 'weigh',
+                sortOrder:'asc',
                 columns: [
                 columns: [
                     [
                     [
                         {checkbox: true},
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
                         {field: 'id', title: __('Id')},
-                        {field: 'catename', title: __('Catename'), operate: 'LIKE'},
+                        {field: 'name', title: __('Name'), operate: 'LIKE'},
                         {field: 'status', title: __('Status'), searchList: {"0":__('Status 0'),"1":__('Status 1')}, formatter: Table.api.formatter.status},
                         {field: 'status', title: __('Status'), searchList: {"0":__('Status 0'),"1":__('Status 1')}, formatter: Table.api.formatter.status},
+                        {field: 'weigh', title: __('Weigh'), operate: false},
+                        {field: 'showtype', title: __('Showtype'), searchList: {"1":__('Showtype 1'),"2":__('Showtype 2'),"3":__('Showtype 3'),"4":__('Showtype 4')}, formatter: Table.api.formatter.normal},
+                        {field: 'is_zhuanti', title: __('Is_zhuanti'), searchList: {"1":__('Is_zhuanti 1'),"0":__('Is_zhuanti 0')}, formatter: Table.api.formatter.normal},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                     ]
                 ]
                 ]

+ 57 - 0
public/assets/js/backend/videochildcate.js

@@ -0,0 +1,57 @@
+define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
+
+    var Controller = {
+        index: function () {
+            // 初始化表格参数配置
+            Table.api.init({
+                extend: {
+                    index_url: 'videochildcate/index' + location.search,
+                    add_url: 'videochildcate/add',
+                    edit_url: 'videochildcate/edit',
+                    del_url: 'videochildcate/del',
+                    multi_url: 'videochildcate/multi',
+                    import_url: 'videochildcate/import',
+                    table: 'video_childcate',
+                }
+            });
+
+            var table = $("#table");
+
+            // 初始化表格
+            table.bootstrapTable({
+                url: $.fn.bootstrapTable.defaults.extend.index_url,
+                pk: 'id',
+                sortName: 'cate_id,weigh',
+                sortOrder: 'asc,asc',
+                columns: [
+                    [
+                        {checkbox: true},
+                        {field: 'id', title: __('Id')},
+                        {field: 'cate_id', title: __('Cate_id')},
+                        {field: 'name', title: __('Name'), operate: 'LIKE'},
+                        {field: 'image', title: __('Image'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
+                        {field: 'weigh', title: __('Weigh'), operate: false},
+                        {field: 'status', title: __('Status'), searchList: {"0":__('Status 0'),"1":__('Status 1')}, formatter: Table.api.formatter.status},
+                        {field: 'bg_image', title: __('Bg_image'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
+                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+                    ]
+                ]
+            });
+
+            // 为表格绑定事件
+            Table.api.bindevent(table);
+        },
+        add: function () {
+            Controller.api.bindevent();
+        },
+        edit: function () {
+            Controller.api.bindevent();
+        },
+        api: {
+            bindevent: function () {
+                Form.api.bindevent($("form[role=form]"));
+            }
+        }
+    };
+    return Controller;
+});

+ 1 - 5
public/assets/js/backend/videotype.js

@@ -26,16 +26,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     [
                     [
                         {checkbox: true},
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
                         {field: 'id', title: __('Id')},
-//                        {field: 'type', title: __('Type')},
-                        {field: 'cate.catename', title: __('Cate.catename'), operate: 'LIKE'},
+                        {field: 'type', title: __('Type'), searchList: {"0":__('Type 0'),"1":__('Type 1')}, formatter: Table.api.formatter.normal},
                         {field: 'name', title: __('Name'), operate: 'LIKE'},
                         {field: 'name', title: __('Name'), operate: 'LIKE'},
                         {field: 'image', title: __('Image'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
                         {field: 'image', title: __('Image'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
                         {field: 'weigh', title: __('Weigh'), operate: false},
                         {field: 'weigh', title: __('Weigh'), operate: false},
                         {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        {field: 'status', title: __('Status'), searchList: {"0":__('Status 0'),"1":__('Status 1')}, formatter: Table.api.formatter.status},
-                        {field: 'showtype', title: __('Showtype'), searchList: {"1":__('Showtype 1'),"2":__('Showtype 2'),"3":__('Showtype 3'),"4":__('Showtype 4')}, formatter: Table.api.formatter.normal},
-                        {field: 'bg_image', title: __('Bg_image'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                     ]
                 ]
                 ]