Pārlūkot izejas kodu

【Fix】修复课程客服缺陷

liuxiangxin 2 mēneši atpakaļ
vecāks
revīzija
f5621b2dd3

+ 2 - 0
app/Http/Controllers/Admin/VideoCourse.php

@@ -81,6 +81,7 @@ class VideoCourse extends Auth{
 			$data['start_time']		= request('start_time','');
 			$data['end_time']		= request('end_time','');
 			$data['type_id']		= request('type_id',0);
+			$data['service_id']		= request('service_id',0);
 			$data['start_time']		= $data['start_time'] ? strtotime($data['start_time']) : 0;
 			$data['end_time']		= $data['end_time'] ? strtotime($data['end_time']) : 0;
 			$data['status']			= 1;
@@ -126,6 +127,7 @@ class VideoCourse extends Auth{
 			$data['start_time']		= request('start_time','');
 			$data['end_time']		= request('end_time','');
 			$data['type_id']		= request('type_id',0);
+			$data['service_id']		= request('service_id',0);
 			$data['start_time']		= $data['start_time'] ? strtotime($data['start_time']) : 0;
 			$data['end_time']		= $data['end_time'] ? strtotime($data['end_time']) : 0;
 			// 写入

+ 3 - 3
app/Http/Controllers/Api/Video/Course.php

@@ -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');
 		// 新增记录