课程接口调整

application/api/controller/Index.php

@@ -120,7 +120,7 @@ class Index extends Api
             $slot['coach_text'] = substr($coach_text,0,-1);
 
             //组织时间
-            $slot['slot_time'] = date('m-d',$slot['starttime']).'(周'.date('w',$slot['starttime']).')'.','.date('H:i',$slot['starttime']).'-'.date('H:i',$slot['endtime']);
+            $slot['slot_time'] = date('m月d日',$slot['starttime']).'(周'.date('w',$slot['starttime']).')'.','.date('H:i',$slot['starttime']).'-'.date('H:i',$slot['endtime']);
         }
 
         $this->success(1,$list);

application/api/controller/Lesson.php

@@ -140,6 +140,10 @@ class Lesson extends Api
             $info['num_remain'] = 0;
         }
 
+        //时间
+        $info['slot_time'] = date('m月d日',$info['starttime']).' (周'.date('w',$info['starttime']).')'.','.date('H:i',$info['starttime']).'-'.date('H:i',$info['endtime']);
+
+
         //预约按钮,1能预约，0不能
         /*$info['button_status'] = $info['status'] == 0 ? 1 : 0;
         if($info['num_remain'] <= 0){
@@ -154,7 +158,7 @@ class Lesson extends Api
             'o.user_id' =>$this->auth->id,
             'o.lesson_id' => $info['lesson_id'],
             'o.endtime' => ['gt',time()],
-            'o.remain' => ['egt',$number],
+            'o.remain' => ['egt',$number], //不能只是大于0，还得大于等于报名人数
             'o.order_status' => 1,
         ];
         $package_list = Db::name('package_order')->alias('o')
@@ -162,6 +166,16 @@ class Lesson extends Api
             ->field('o.id,o.remain,o.starttime,o.endtime,o.is_gift,p.name,p.name_en')
             ->where($map)->order('o.endtime asc')->select();
         $package_list = $this->list_lang($package_list,['name']);
+        if(!empty($package_list)){
+            foreach($package_list as $key => &$val){
+                if($this->lang == 'zh-cn'){
+                    $val['time_text'] = date('m月d,Y',$val['starttime']).'-'.date('m月d,Y',$val['starttime']);
+                }else{
+                    $val['time_text'] = date('M d,Y',$val['starttime']).'-'.date('M d,Y',$val['starttime']);
+                }
+            }
+        }
+
         $info['package_list'] = $package_list;