|
@@ -121,7 +121,7 @@ class indexControl extends specialControl
|
|
|
$is_app = session_helper::isapp();
|
|
|
$from_wechat = util::from_wechat();
|
|
|
$user = session_helper::memberid();
|
|
|
- $param = ["talk_type" => $talk_type, "talk_id" => $talk_id , "member_id" => $user,"room_name"=>"","relay_id"=>$relay_id,"is_app"=>intval($is_app)];
|
|
|
+ $param = ["talk_type" => $talk_type, "talk_id" => $talk_id , "member_id" => $user,"room_name"=>"","room_avatar"=>"","relay_id"=>$relay_id,"is_app"=>intval($is_app)];
|
|
|
|
|
|
//app内打开请求授权登录
|
|
|
if(($is_app || !$from_wechat) && $user<= 0)
|
|
@@ -150,8 +150,8 @@ class indexControl extends specialControl
|
|
|
$room_id = $talk_id;
|
|
|
try {
|
|
|
$tpl = new room\tpl_group_home($user,$talk_id,$relay_id);
|
|
|
- $room_name = $tpl->get_room_info()->name();
|
|
|
- $param["room_name"] = $room_name;
|
|
|
+ $param["room_name"] = $tpl->get_room_info()->name();
|
|
|
+ $param["room_avatar"] = $tpl->get_room_info()->avatar();
|
|
|
return self::outsuccess(['tpl' => $tpl,"param" => $param],'talk/homepage_room');
|
|
|
} catch (Exception $ex) {
|
|
|
Log::record("member_talk.room_detail error: room_id={$room_id} user={$user}",Log::ERR);
|