Merge pull request #2079 from visuddhinanda/laravel

支持全部课程记录

app/Http/Controllers/CourseMemberController.php

@@ -45,8 +45,11 @@ class CourseMemberController extends Controller
                 /**
                  * 编辑时间线
                  */
-                $table = CourseMember::where('course_id', $request->get('course'))
-                                    ->where('user_id',$request->get('userId'));
+                $table = CourseMember::where('user_id',$request->get('userId'));
+                if($request->get('timeline','current')==='current'){
+                    $table = $table->where('course_id', $request->get('course'));
+                }
+
                 break;
             default:
                 return $this->error('无法识别的参数view',400,400);

app/Http/Resources/CourseMemberResource.php

@@ -5,6 +5,7 @@ namespace App\Http\Resources;
 use Illuminate\Http\Resources\Json\JsonResource;
 use App\Http\Api\UserApi;
 use App\Http\Api\ChannelApi;
+use App\Models\Course;
 
 class CourseMemberResource extends JsonResource
 {
@@ -34,6 +35,10 @@ class CourseMemberResource extends JsonResource
                $data['channel'] =  $channel;
             }
         }
+        if(!empty($request->get('request_course'))){
+            $course = Course::find($this->course_id);
+            $data['course'] =  $course;
+        }
         return $data;
     }
 }