|
@@ -85,7 +85,7 @@ class Course extends Api{
|
|
|
// 用户是否点赞
|
|
|
if( !$id ) return json_send(['code'=>'error','msg'=>'课程ID不能为空']);
|
|
|
// 获取旧数据
|
|
|
- $courseData = $Model->query()->where([['status','=',0]])->find($id,['id','name','thumb','service','video_src','content','start_time','end_time','insert_time']);
|
|
|
+ $courseData = $Model->query()->where([['status','=',0]])->find($id,['id','name','thumb','service_id as service','video_src','content','start_time','end_time','insert_time']);
|
|
|
// 用户是否点赞
|
|
|
if( !$courseData ) return json_send(['code'=>'error','msg'=>'课程不存在或者已下架']);
|
|
|
// 转数组
|
|
@@ -123,6 +123,8 @@ class Course extends Api{
|
|
|
$courseData['question_list'] = array_values($questionList);
|
|
|
// 学习状态
|
|
|
$courseData['learn_status'] = (int)$LearnRecord->query()->where([['custom_uid','=',$uid],['course_id','=',$id]])->max('status');
|
|
|
+ $courseData['service'] = $CourseService->getOne($courseData['service']);
|
|
|
+ $courseData['service'] = $courseData['service'] ? $courseData['service'] : (object)[];
|
|
|
// 接收参数
|
|
|
$data['custom_uid'] = $uid;
|
|
|
$data['course_id'] = $id;
|
|
@@ -130,8 +132,6 @@ class Course extends Api{
|
|
|
$data['video_inittime'] = $courseData['inittime'];
|
|
|
$data['video_lasttime'] = $courseData['inittime'];
|
|
|
$data['question_total'] = count($questionList);
|
|
|
- $data['service'] = $CourseService->getOne($courseData['service']);
|
|
|
- $data['service'] = $data['service'] ? $data['service'] : (object)[];
|
|
|
// 查询是不是有记录在使用中
|
|
|
// $oldRecordId = $LearnRecord->query()->where([['custom_uid','=',$uid],['course_id','=',$id],['status','=',0]])->value('id');
|
|
|
// 新增记录
|