修改课程排课表，增加状态

app/Http/Controllers/Api/Course.php

@@ -208,20 +208,29 @@ class Course extends Api{
             ->orderByDesc('course_schedule.start_time')
             ->select($select)
             ->get();
+        //用户已预约课程
+        $courseReservation = CourseReservation::query()->where(['uid'=>$uid,'status'=>1])->select('schedule_id')->get()->toArray();
+        $reservationIds = array_column($courseReservation,'schedule_id');
         $list = [];
         foreach ($data as &$dataItem) {
             $dataItem['course_image']	        = path_compat($dataItem['course_image']);
             //按老师分组
             $list[$dataItem['teacher_id']]['teacher_id']	= $dataItem['teacher_id'];
             $list[$dataItem['teacher_id']]['teacher_name']	= $dataItem['teacher_name'];
-            $list[$dataItem['teacher_id']]['list']	= $dataItem;
+            //判断排课是否已预约：1预约，0未预约
+            if (in_array($dataItem['id'],$reservationIds)) {
+                $dataItem['reservation_status']	= 1;
+            }else{
+                $dataItem['reservation_status']	= 0;
+            }
+            $list[$dataItem['teacher_id']]['list'][]	= $dataItem;
         }
         $list = array_values($list);
         // 返回结果
         return						json_send(['code'=>'success','msg'=>'获取成功','data'=>$list]);
     }
     /**
-     * 预约课程					 	/api/course/reservation_list
+     * 预约列表					 	/api/course/reservation_list
      *
      * @param int $page 页码,默认1
      * @param int $limit 每页条数,默认10条

app/Http/Controllers/Api/Orders.php

@@ -79,7 +79,7 @@ class Orders extends Api{
 			$productList[$buyInfo['product_id']]['stock']	= $productList[$buyInfo['product_id']]['stock'] - $buyInfo['buy_num'];
 			// 计算价值
 			$priceTotal					= $buyInfo['buy_num'] * $productInfo['price'];
-			$courseTotal					= $buyInfo['buy_num'] * $productInfo['course_number'];
+			$courseTotal				= $buyInfo['buy_num'] * $productInfo['course_number'];
 			// 购买信息
 			$buyInfo					= [
                 'is_rebate'=>0,

package.json

@@ -1,4 +1,4 @@
-{
+    {
     "private": true,
     "scripts": {
         "dev": "npm run development",