|
@@ -91,7 +91,7 @@ class Guild extends Api
|
|
|
$guilderInfo = \app\common\model\User::field("avatar,nickname,u_id")->where(["id"=>$guildInfo->user_id])->find();
|
|
|
|
|
|
// 获取房间信息
|
|
|
- $partyInfo = \app\common\model\Party::field("id,party_logo,party_type,is_online,party_name")->where(["id"=>$guildInfo->party_id])->find();
|
|
|
+ $partyInfo = \app\common\model\Party::field("id,party_logo,room_type,party_pass,party_type,is_online,party_name")->where(["id"=>$guildInfo->party_id])->find();
|
|
|
|
|
|
$partyParams = ['party_id' => $guildInfo->party_id];
|
|
|
$roomService = new RoomService();
|
|
@@ -104,6 +104,8 @@ class Guild extends Api
|
|
|
$mod = isset($partyInfo["party_type"])?intval($partyInfo["party_type"])%5:1;
|
|
|
$partyInfo["party_type_color"] = $mod == 0?5:$mod;
|
|
|
$partyInfo["type_name"] = '公会房';
|
|
|
+ $partyInfo["need_pass"] = !empty($partyInfo['party_pass']) ? 1 : 0 ;
|
|
|
+ unset($partyInfo["party_pass"]);
|
|
|
}
|
|
|
|
|
|
|