|
@@ -66,9 +66,17 @@ class Guild extends Api
|
|
|
$res = [];
|
|
|
|
|
|
|
|
|
- $guildInfo = \app\common\model\Guild::field("id,image,name,g_id,user_id,party_id,desc,notice,status")->where(["id"=>$guild_id])->find();
|
|
|
+ $guildInfo = \app\common\model\Guild::field("id,image,name,g_id,user_id,party_id,desc,notice,status,province_id,city_id")->where(["id"=>$guild_id])->find();
|
|
|
if(!$guildInfo) $this->error("公会信息获取失败!");
|
|
|
|
|
|
+ $guildInfo['province_name'] = '';
|
|
|
+ $guildInfo['city_name'] = '';
|
|
|
+ $area_info = Db::name('shopro_area')->where('id',$guildInfo['city_id'])->field('name,province_name')->find();
|
|
|
+ if($area_info){
|
|
|
+ $guildInfo['province_name'] = $area_info['province_name'];
|
|
|
+ $guildInfo['city_name'] = $area_info['name'];
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
$guildMemberInfo = \app\common\model\GuildMember::alias("a")
|
|
|
->field("a.id,a.user_id,a.role,u.nickname,u.avatar,u.gender")
|