|
@@ -4,6 +4,9 @@ use App\Facades\Servers\Aliyun\Oss;
|
|
|
use App\Http\Requests\Admin\Video\Course as Request;
|
|
|
use App\Models\Video\Course as Model;
|
|
|
use App\Models\Video\CourseType;
|
|
|
+use App\Models\Video\CourseService;
|
|
|
+
|
|
|
+
|
|
|
/**
|
|
|
* 课程管理
|
|
|
*
|
|
@@ -22,45 +25,51 @@ class VideoCourse extends Auth{
|
|
|
* 首页列表
|
|
|
*
|
|
|
* */
|
|
|
- public function index(Model $Model,CourseType $CourseType){
|
|
|
+ public function index(Model $Model,CourseType $CourseType,CourseService $CourseService){
|
|
|
// 接受参数
|
|
|
- $name = request('name','');
|
|
|
- $status = request('status');
|
|
|
- $typeId = request('type_id',0);
|
|
|
- $startTime = request('start_time','');
|
|
|
- $endTime = request('end_time','');
|
|
|
+ $name = request('name','');
|
|
|
+ $status = request('status');
|
|
|
+ $serviceId = request('service_id',0);
|
|
|
+ $typeId = request('type_id',0);
|
|
|
+ $startTime = request('start_time','');
|
|
|
+ $endTime = request('end_time','');
|
|
|
// 查询条件
|
|
|
- $map = [];
|
|
|
+ $map = [];
|
|
|
// 编码ID
|
|
|
- if( $name ) $map[] = ['name','LIKE','%'.$name.'%'];
|
|
|
- if( $typeId ) $map[] = ['type_id','=',$typeId];
|
|
|
- if( $startTime ) $map[] = ['insert_time','>=',strtotime($startTime)];
|
|
|
- if( $endTime ) $map[] = ['insert_time','<=',strtotime($endTime)];
|
|
|
- if( !is_null($status) ) $map[] = ['status','=',$status];
|
|
|
+ if( $name ) $map[] = ['name','LIKE','%'.$name.'%'];
|
|
|
+ if( $typeId ) $map[] = ['type_id','=',$typeId];
|
|
|
+ if( $serviceId ) $map[] = ['service_id','=',$serviceId];
|
|
|
+ if( $startTime ) $map[] = ['insert_time','>=',strtotime($startTime)];
|
|
|
+ if( $endTime ) $map[] = ['insert_time','<=',strtotime($endTime)];
|
|
|
+ if( !is_null($status) ) $map[] = ['status','=',$status];
|
|
|
// 查询数据
|
|
|
- $list = $Model->query()->where($map)->orderByDesc('id')->paginate(request('limit',config('page_num',10)))->appends(request()->all());
|
|
|
+ $list = $Model->query()->where($map)->orderByDesc('id')->paginate(request('limit',config('page_num',10)))->appends(request()->all());
|
|
|
// 循环处理数据
|
|
|
foreach ($list as $key => $value) {
|
|
|
// 类型名称
|
|
|
- $value['type_name'] = $CourseType->getOne($value['type_id'],'name');
|
|
|
+ $value['service_name'] = $CourseService->getOne($value['service_id'],'name');
|
|
|
+ // 类型名称
|
|
|
+ $value['type_name'] = $CourseType->getOne($value['type_id'],'name');
|
|
|
// 重组
|
|
|
- $list[$key] = $value;
|
|
|
+ $list[$key] = $value;
|
|
|
}
|
|
|
// 获取类型列表
|
|
|
$typeList = $CourseType->getList();
|
|
|
+ $serviceList = $CourseService->getList();
|
|
|
// 分配数据
|
|
|
$this->assign('empty', '<tr><td colspan="20">~~暂无数据</td></tr>');
|
|
|
+ $this->assign('serviceList',$serviceList);
|
|
|
$this->assign('typeList',$typeList);
|
|
|
$this->assign('list', $list);
|
|
|
// 加载模板
|
|
|
- return $this->fetch();
|
|
|
+ return $this->fetch();
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* 添加
|
|
|
*
|
|
|
* */
|
|
|
- public function add( Request $request, Model $Model,CourseType $CourseType){
|
|
|
+ public function add( Request $request, Model $Model,CourseType $CourseType,CourseService $CourseService){
|
|
|
if( request()->isMethod('post') ){
|
|
|
// 验证参数
|
|
|
$request->scene('add')->validate();
|
|
@@ -86,9 +95,11 @@ class VideoCourse extends Auth{
|
|
|
}
|
|
|
// 获取类型列表
|
|
|
$typeList = $CourseType->getList();
|
|
|
+ $serviceList = $CourseService->getList();
|
|
|
// 分配数据
|
|
|
$this->assign('crumbs','新增');
|
|
|
$this->assign('typeList',$typeList);
|
|
|
+ $this->assign('serviceList',$serviceList);
|
|
|
// 加载模板
|
|
|
return $this->fetch();
|
|
|
}
|
|
@@ -97,7 +108,7 @@ class VideoCourse extends Auth{
|
|
|
* 编辑
|
|
|
*
|
|
|
* */
|
|
|
- public function edit( Request $request, Model $Model,CourseType $CourseType){
|
|
|
+ public function edit( Request $request, Model $Model,CourseType $CourseType,CourseService $CourseService){
|
|
|
// 接收参数
|
|
|
$id = request('id',0);
|
|
|
// 查询数据
|
|
@@ -132,7 +143,9 @@ class VideoCourse extends Auth{
|
|
|
if( !$oldData ) return $this->error('查无数据');
|
|
|
// 获取类型列表
|
|
|
$typeList = $CourseType->getList();
|
|
|
+ $serviceList = $CourseService->getList();
|
|
|
// 分配数据
|
|
|
+ $this->assign('serviceList',$serviceList);
|
|
|
$this->assign('typeList',$typeList);
|
|
|
$this->assign('oldData',$oldData);
|
|
|
$this->assign('crumbs','修改');
|