...
|
...
|
@@ -730,7 +730,7 @@ class User extends Api |
|
|
foreach ($notice as &$k){
|
|
|
if($k['type'] == 'course_sign' || $k['type'] == 'course_start'){
|
|
|
$course = new \app\admin\model\Course();
|
|
|
$course= $course->where(['id'=>$k['content_id']])->find();
|
|
|
$course= $course->where(['id'=>$k['course_sign']['course_id']])->find();
|
|
|
if(empty($course)){
|
|
|
$course = [];
|
|
|
}else{
|
...
|
...
|
@@ -738,6 +738,16 @@ class User extends Api |
|
|
}
|
|
|
|
|
|
$k['course'] = $course;
|
|
|
|
|
|
$store = new \app\admin\model\Store();
|
|
|
$store= $store->where(['id'=>$k['course_sign']['store_id']])->find();
|
|
|
if(empty($store)){
|
|
|
$store = [];
|
|
|
}else{
|
|
|
$store = $store->toArray();
|
|
|
}
|
|
|
|
|
|
$k['store'] = $store;
|
|
|
}
|
|
|
}
|
|
|
$this->success('ok',$notice);
|
...
|
...
|
|