正在显示
1 个修改的文件
包含
7 行增加
和
7 行删除
@@ -383,7 +383,6 @@ class HouseBoard extends Api | @@ -383,7 +383,6 @@ class HouseBoard extends Api | ||
383 | * | 383 | * |
384 | * @ApiHeaders (name=token, type=string, required=true, description="请求的Token") | 384 | * @ApiHeaders (name=token, type=string, required=true, description="请求的Token") |
385 | * @ApiParams (name="house_id", type="inter", required=true, description="社区id") | 385 | * @ApiParams (name="house_id", type="inter", required=true, description="社区id") |
386 | - * @ApiParams (name="user_id", type="inter", required=true, description="社区物业管理员用户id") | ||
387 | * | 386 | * |
388 | * @ApiReturn({ | 387 | * @ApiReturn({ |
389 | "code": 1, | 388 | "code": 1, |
@@ -391,11 +390,11 @@ class HouseBoard extends Api | @@ -391,11 +390,11 @@ class HouseBoard extends Api | ||
391 | "time": "1598587213", | 390 | "time": "1598587213", |
392 | "data": [ | 391 | "data": [ |
393 | { | 392 | { |
394 | - "id": 29, | ||
395 | - "title": "1", | ||
396 | - "content": "1", | ||
397 | - "activity_time": "2020-08-28-2020-08-28", | ||
398 | - "status": "已到期" | 393 | + "id": // 活动id |
394 | + "title": // 活动标题 | ||
395 | + "content": // 活动描述 | ||
396 | + "activity_time": 活动日期 | ||
397 | + "status": // 活动状态 | ||
399 | } | 398 | } |
400 | ] | 399 | ] |
401 | }) | 400 | }) |
@@ -404,6 +403,7 @@ class HouseBoard extends Api | @@ -404,6 +403,7 @@ class HouseBoard extends Api | ||
404 | { | 403 | { |
405 | $user_id = $this->auth->id; | 404 | $user_id = $this->auth->id; |
406 | $house_id = $this->request->param('house_id'); //社区id | 405 | $house_id = $this->request->param('house_id'); //社区id |
406 | + empty($house_id) && $this->error('缺少必要参数'); | ||
407 | $now = time(); | 407 | $now = time(); |
408 | $list = Db::name('house_activity') | 408 | $list = Db::name('house_activity') |
409 | ->alias('ha') | 409 | ->alias('ha') |
@@ -423,7 +423,7 @@ class HouseBoard extends Api | @@ -423,7 +423,7 @@ class HouseBoard extends Api | ||
423 | $v['activity_time'] = date('Y-m-d',$v['start_time']).'-'.date('Y-m-d',$v['end_time']); | 423 | $v['activity_time'] = date('Y-m-d',$v['start_time']).'-'.date('Y-m-d',$v['end_time']); |
424 | // 活动日期 | 424 | // 活动日期 |
425 | $v['status'] = $v['join_status'] == 1 ? '已报名' : ($v['end_time'] < time() ? '已到期' : '未报名'); | 425 | $v['status'] = $v['join_status'] == 1 ? '已报名' : ($v['end_time'] < time() ? '已到期' : '未报名'); |
426 | - unset($v['start_time'],$v['end_time'],$v['join_status'],); | 426 | + unset($v['start_time'],$v['end_time'],$v['join_status']); |
427 | } | 427 | } |
428 | $this->success('success',$list); | 428 | $this->success('success',$list); |
429 | } | 429 | } |
-
请 注册 或 登录 后发表评论