郭盛 / community · 提交

转到一个项目

作者 何书鹏
提交 b4693d66f5cd3694ac90ff768af93ffca036fb67 2 个父辈 79228233 2150d98d
1 个管道 的构建 通过 耗费 1 秒

合并分支 'heshupeng' 到 'master' 

接口文档更新



查看合并请求 !26
内嵌 并排对比
正在显示 2 个修改的文件 包含 40 行增加 和 47 行删除
... ... @@ -32,13 +32,8 @@ class HouseBoard extends Api
"time": "1571492001",
"data": {
"is_binding"://是否绑定1已绑定2未绑定
"house_name"://社区名称
"is_have"://是否有社区公告1有2没有
"title"://社区公告标题
"is_new"://是否是新 1是2否
"content"://公告内容
"look_num"://浏览人数
"createtime"://时间
"house"://社区信息
"house_board"://最新公告信息
}
})
*/
... ... @@ -72,12 +67,20 @@ class HouseBoard extends Api
->find();
if(!empty($house_board)){
$house_board['createtime'] = date('Y-m-d',$house_board['createtime']);
// 查询是否已读
// 最新公告是否已读
$is_read = Db::name('house_board_detail')
->where('user_id',$user_id)
->where('house_board_id',$house_board['id'])
->find();
$house_board['is_new'] = !empty($is_read) ? 1 : 2;
// 最新公告-用户头像
$house_board['avatar'] = Db::name('house_board_detail')
->alias('a')
->join('user b','a.user_id = b.id')
->where('a.house_board_id',$house_board['id'])
->field('b.avatar,b.id')
->limit(6)
->select();
}
$info = array_merge($info,compact('house','house_board'));
}
... ... @@ -113,7 +116,6 @@ class HouseBoard extends Api
* @ApiTitle (社区公告-轮播图)
* @ApiSummary (社区公告-轮播图)
* @ApiMethod (POST)
* @ApiRoute (/api/house/house_banner)
*
* @ApiReturn({
"code": 1,
... ... @@ -141,10 +143,9 @@ class HouseBoard extends Api
/**
* @ApiTitle (公告列表)
* @ApiSummary (公告列表)
* @ApiTitle (社区公告-公告列表)
* @ApiSummary (社区公告-公告列表)
* @ApiMethod (POST)
* @ApiRoute (/api/house/house_board_list)
*
* @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
* @ApiParams (name="house_board_id", type=inter, required=true, description="社区id")
... ... @@ -212,10 +213,9 @@ class HouseBoard extends Api
}
/**
* @ApiTitle (社区服务电话)
* @ApiSummary (社区服务电话)
* @ApiTitle (社区公告-服务电话)
* @ApiSummary (社区公告-服务电话)
* @ApiMethod (POST)
* @ApiRoute (/api/house/house_phone)
*
* @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
* @ApiParams (name="house_id", type="string", required=true, description="小区id")
... ... @@ -244,10 +244,9 @@ class HouseBoard extends Api
/**
* @ApiTitle (社区物业管理员列表)
* @ApiSummary (社区物业管理员列表)
* @ApiTitle (社区公告-物业留言)
* @ApiSummary (社区公告-物业留言)
* @ApiMethod (POST)
* @ApiRoute (/api/house/house_admin_list)
*
* @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
* @ApiParams (name="house_id", type="string", required=true, description="小区id")
... ... @@ -297,10 +296,9 @@ class HouseBoard extends Api
}
/**
* @ApiTitle (聊天记录列表)
* @ApiSummary （聊天记录列表)
* @ApiTitle (社区公告-物业留言-详情)
* @ApiSummary (社区公告-物业留言-详情)
* @ApiMethod (POST)
* @ApiRoute (/api/house/chat_record)
*
* @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
* @ApiParams (name="house_id", type="inter", required=true, description="社区id")
... ...
... ... @@ -195,10 +195,10 @@
<a href="javascript:;" data-id="34" class="list-group-item">社区公告-首页</a>
<a href="javascript:;" data-id="35" class="list-group-item">社区公告-业主信息</a>
<a href="javascript:;" data-id="36" class="list-group-item">社区公告-轮播图</a>
<a href="javascript:;" data-id="37" class="list-group-item">公告列表</a>
<a href="javascript:;" data-id="38" class="list-group-item">社区服务电话</a>
<a href="javascript:;" data-id="39" class="list-group-item">社区物业管理员列表</a>
<a href="javascript:;" data-id="40" class="list-group-item">聊天记录列表</a>
<a href="javascript:;" data-id="37" class="list-group-item">社区公告-公告列表</a>
<a href="javascript:;" data-id="38" class="list-group-item">社区公告-服务电话</a>
<a href="javascript:;" data-id="39" class="list-group-item">社区公告-物业留言</a>
<a href="javascript:;" data-id="40" class="list-group-item">社区公告-物业留言-详情</a>
</div>
<a href="#首页接口" class="list-group-item" data-toggle="collapse" data-parent="#sidebar">首页接口 <i class="fa fa-caret-down"></i></a>
<div class="child collapse" id="首页接口">
... ... @@ -5502,13 +5502,8 @@
"time": "1571492001",
"data": {
"is_binding"://是否绑定1已绑定2未绑定
"house_name"://社区名称
"is_have"://是否有社区公告1有2没有
"title"://社区公告标题
"is_new"://是否是新 1是2否
"content"://公告内容
"look_num"://浏览人数
"createtime"://时间
"house"://社区信息
"house_board"://最新公告信息
}
}</pre>
</div>
... ... @@ -5669,7 +5664,7 @@
<div class="panel-heading" id="heading-36">
<h4 class="panel-title">
<span class="label label-primary">POST</span>
<a data-toggle="collapse" data-parent="#accordion36" href="#collapseOne36"> 社区公告-轮播图 <span class="text-muted">/api/house/house_banner</span></a>
<a data-toggle="collapse" data-parent="#accordion36" href="#collapseOne36"> 社区公告-轮播图 <span class="text-muted">/api/house_board/banner</span></a>
</h4>
</div>
<div id="collapseOne36" class="panel-collapse collapse">
... ... @@ -5713,7 +5708,7 @@
<div class="panel panel-default">
<div class="panel-heading"><strong>参数</strong></div>
<div class="panel-body">
<form enctype="application/x-www-form-urlencoded" role="form" action="/api/house/house_banner" method="POST" name="form36" id="form36">
<form enctype="application/x-www-form-urlencoded" role="form" action="/api/house_board/banner" method="POST" name="form36" id="form36">
<div class="form-group">
无
</div>
... ... @@ -5772,7 +5767,7 @@
<div class="panel-heading" id="heading-37">
<h4 class="panel-title">
<span class="label label-primary">POST</span>
<a data-toggle="collapse" data-parent="#accordion37" href="#collapseOne37"> 公告列表 <span class="text-muted">/api/house/house_board_list</span></a>
<a data-toggle="collapse" data-parent="#accordion37" href="#collapseOne37"> 社区公告-公告列表 <span class="text-muted">/api/house_board/house_board_list</span></a>
</h4>
</div>
<div id="collapseOne37" class="panel-collapse collapse">
... ... @@ -5790,7 +5785,7 @@
<div class="tab-pane active" id="info37">
<div class="well">
公告列表 </div>
社区公告-公告列表 </div>
<div class="panel panel-default">
<div class="panel-heading"><strong>Headers</strong></div>
<div class="panel-body">
... ... @@ -5873,7 +5868,7 @@
<div class="panel panel-default">
<div class="panel-heading"><strong>参数</strong></div>
<div class="panel-body">
<form enctype="application/x-www-form-urlencoded" role="form" action="/api/house/house_board_list" method="POST" name="form37" id="form37">
<form enctype="application/x-www-form-urlencoded" role="form" action="/api/house_board/house_board_list" method="POST" name="form37" id="form37">
<div class="form-group">
<label class="control-label" for="house_board_id">house_board_id</label>
<input type="inter" class="form-control input-sm" id="house_board_id" required placeholder="社区id" name="house_board_id">
... ... @@ -5945,7 +5940,7 @@
<div class="panel-heading" id="heading-38">
<h4 class="panel-title">
<span class="label label-primary">POST</span>
<a data-toggle="collapse" data-parent="#accordion38" href="#collapseOne38"> 社区服务电话 <span class="text-muted">/api/house/house_phone</span></a>
<a data-toggle="collapse" data-parent="#accordion38" href="#collapseOne38"> 社区公告-服务电话 <span class="text-muted">/api/house_board/house_phone</span></a>
</h4>
</div>
<div id="collapseOne38" class="panel-collapse collapse">
... ... @@ -5963,7 +5958,7 @@
<div class="tab-pane active" id="info38">
<div class="well">
社区服务电话 </div>
社区公告-服务电话 </div>
<div class="panel panel-default">
<div class="panel-heading"><strong>Headers</strong></div>
<div class="panel-body">
... ... @@ -6034,7 +6029,7 @@
<div class="panel panel-default">
<div class="panel-heading"><strong>参数</strong></div>
<div class="panel-body">
<form enctype="application/x-www-form-urlencoded" role="form" action="/api/house/house_phone" method="POST" name="form38" id="form38">
<form enctype="application/x-www-form-urlencoded" role="form" action="/api/house_board/house_phone" method="POST" name="form38" id="form38">
<div class="form-group">
<label class="control-label" for="house_id">house_id</label>
<input type="string" class="form-control input-sm" id="house_id" required placeholder="小区id" name="house_id">
... ... @@ -6092,7 +6087,7 @@
<div class="panel-heading" id="heading-39">
<h4 class="panel-title">
<span class="label label-primary">POST</span>
<a data-toggle="collapse" data-parent="#accordion39" href="#collapseOne39"> 社区物业管理员列表 <span class="text-muted">/api/house/house_admin_list</span></a>
<a data-toggle="collapse" data-parent="#accordion39" href="#collapseOne39"> 社区公告-物业留言 <span class="text-muted">/api/house_board/house_admin_list</span></a>
</h4>
</div>
<div id="collapseOne39" class="panel-collapse collapse">
... ... @@ -6110,7 +6105,7 @@
<div class="tab-pane active" id="info39">
<div class="well">
社区物业管理员列表 </div>
社区公告-物业留言 </div>
<div class="panel panel-default">
<div class="panel-heading"><strong>Headers</strong></div>
<div class="panel-body">
... ... @@ -6181,7 +6176,7 @@
<div class="panel panel-default">
<div class="panel-heading"><strong>参数</strong></div>
<div class="panel-body">
<form enctype="application/x-www-form-urlencoded" role="form" action="/api/house/house_admin_list" method="POST" name="form39" id="form39">
<form enctype="application/x-www-form-urlencoded" role="form" action="/api/house_board/house_admin_list" method="POST" name="form39" id="form39">
<div class="form-group">
<label class="control-label" for="house_id">house_id</label>
<input type="string" class="form-control input-sm" id="house_id" required placeholder="小区id" name="house_id">
... ... @@ -6241,7 +6236,7 @@
<div class="panel-heading" id="heading-40">
<h4 class="panel-title">
<span class="label label-primary">POST</span>
<a data-toggle="collapse" data-parent="#accordion40" href="#collapseOne40"> 聊天记录列表 <span class="text-muted">/api/house/chat_record</span></a>
<a data-toggle="collapse" data-parent="#accordion40" href="#collapseOne40"> 社区公告-物业留言-详情 <span class="text-muted">/api/house_board/chat_record</span></a>
</h4>
</div>
<div id="collapseOne40" class="panel-collapse collapse">
... ... @@ -6259,7 +6254,7 @@
<div class="tab-pane active" id="info40">
<div class="well">
聊天记录列表 </div>
社区公告-物业留言-详情 </div>
<div class="panel panel-default">
<div class="panel-heading"><strong>Headers</strong></div>
<div class="panel-body">
... ... @@ -6336,7 +6331,7 @@
<div class="panel panel-default">
<div class="panel-heading"><strong>参数</strong></div>
<div class="panel-body">
<form enctype="application/x-www-form-urlencoded" role="form" action="/api/house/chat_record" method="POST" name="form40" id="form40">
<form enctype="application/x-www-form-urlencoded" role="form" action="/api/house_board/chat_record" method="POST" name="form40" id="form40">
<div class="form-group">
<label class="control-label" for="house_id">house_id</label>
<input type="inter" class="form-control input-sm" id="house_id" required placeholder="社区id" name="house_id">
... ... @@ -11552,7 +11547,7 @@
<div class="row mt0 footer">
<div class="col-md-6" align="left">
Generated on 2020-08-27 19:15:00 </div>
Generated on 2020-08-27 19:32:50 </div>
<div class="col-md-6" align="right">
<a href="./" target="_blank">社区</a>
</div>
... ...