|
@@ -113,33 +113,38 @@ class indexControl extends specialControl
|
|
$room_id = intval($_GET['room_id']);
|
|
$room_id = intval($_GET['room_id']);
|
|
$inviter = intval($_GET["inviter"]);
|
|
$inviter = intval($_GET["inviter"]);
|
|
|
|
|
|
- if(session_helper::need_wechat_author())
|
|
|
|
- {
|
|
|
|
- $_SESSION['client_type'] = 'wap';
|
|
|
|
- define('SERVER_TYPE','panda');
|
|
|
|
- $author = new thrid_author\wxauthor();
|
|
|
|
- $url = author_url::room_invite_url($room_id,$inviter);
|
|
|
|
- $url = $author->enter($url);
|
|
|
|
- Log::record("url:$url",Log::DEBUG);
|
|
|
|
- return self::outsuccess(['direct_uri' => $url],"redirect");
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- $result = room\factory_client::instance()->invite($room_id,$inviter,[session_helper::memberid()]);
|
|
|
|
|
|
+// if(session_helper::need_wechat_author())
|
|
|
|
+// {
|
|
|
|
+// $_SESSION['client_type'] = 'wap';
|
|
|
|
+//// define('SERVER_TYPE','panda');
|
|
|
|
+// $author = new thrid_author\wxauthor();
|
|
|
|
+// $url = author_url::room_invite_url($room_id,$inviter);
|
|
|
|
+// $url = $author->enter($url);
|
|
|
|
+// Log::record("url:$url",Log::DEBUG);
|
|
|
|
+// return self::outsuccess(['direct_uri' => $url],"redirect");
|
|
|
|
+// }
|
|
|
|
+
|
|
|
|
+// $invitee = [session_helper::memberid()];
|
|
|
|
+ $invitee = [39682];
|
|
|
|
+
|
|
|
|
+ $result = room\factory_client::instance()->invite($room_id,$inviter,$invitee);
|
|
|
|
|
|
if(util::from_wechat() == false){
|
|
if(util::from_wechat() == false){
|
|
$_SESSION['client_type'] = 'ajax';
|
|
$_SESSION['client_type'] = 'ajax';
|
|
if($result === false) {
|
|
if($result === false) {
|
|
- return self::outerr(errcode::ErrRoom,"邀请失败");
|
|
|
|
|
|
+ return self::outerr(errcode::ErrRoom,"进入失败");
|
|
}
|
|
}
|
|
else
|
|
else
|
|
{
|
|
{
|
|
$members = member_info::get_members($result['newusers']);
|
|
$members = member_info::get_members($result['newusers']);
|
|
$result['invitees'] = $members;
|
|
$result['invitees'] = $members;
|
|
|
|
+ $result["url"] = BASE_SITE_URL.'/mobile/index.php?act=member_talk&op=room_detail&talk_type=room&talk_id='.$result['room'];
|
|
return self::outsuccess($result);
|
|
return self::outsuccess($result);
|
|
}
|
|
}
|
|
}else{
|
|
}else{
|
|
//todo 修改成同时兼容APP请求返回打开回话和微信返回打开小程序
|
|
//todo 修改成同时兼容APP请求返回打开回话和微信返回打开小程序
|
|
$_SESSION['client_type'] = 'wap';
|
|
$_SESSION['client_type'] = 'wap';
|
|
|
|
+ return self::outsuccess(null,"talk/share_bonus");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|