debug

helper/room/tpl_group_home.php

@@ -582,7 +582,7 @@ class tpl_group_home
 //        $save_path = BASE_UPLOAD_PATH."/room/qrcodes/{$this->room_id}_{$this->cur_user}.png";
 //        $qrcode_path = BASE_SITE_URL . "/data/upload/room/qrcodes/{$this->room_id}_{$this->cur_user}.png?v=" . time();
 
-          $url = url_helper::room_detail_url('room',$this->room_id,$this->cur_user);
+          $url = author_url::room_detail_url('room',$this->room_id,$this->cur_user);
 //        $save_path = BASE_UPLOAD_PATH."/room/qrcodes/{$this->room_id}.png";
 //        $qrcode_path = BASE_SITE_URL . "/data/upload/room/qrcodes/{$this->room_id}.png?v=" . time();
 

mobile/control/index.php

@@ -145,22 +145,94 @@ class indexControl extends specialControl
     }
 
 
-    public function room_detailOp(){
+    public function room_detailOp()
+    {
         $talk_type = trim($_GET['talk_type']);
         $talk_id = intval($_GET["talk_id"]);
+        $relay_id = intval($_GET['relay_id']);
 
         if(session_helper::need_wechat_author())
         {
             $author = new thrid_author\wxauthor();
-            $url = author_url::room_detail_url($talk_type,$talk_id);
+            $url = author_url::room_detail_url($talk_type,$talk_id,$relay_id);
             $url = $author->enter($url);
             Log::record("url:$url",Log::DEBUG);
             return self::outsuccess(['direct_uri' => $url],"redirect");
         }
 
-        $url = url_helper::room_detail_url($talk_type,$talk_id);
+        $url = url_helper::room_detail_url($talk_type,$talk_id,$relay_id);
         return self::outsuccess(['direct_uri' => $url],"redirect");
     }
+
+    public function member_detailOp()
+    {
+        $type = 3;
+        $apply_id   = intval($_GET['apply_id']);
+        if($apply_id >0) {
+            $type = 2;
+            $member_id = "";
+        }else{
+            $type = 1;
+        }
+
+        $visitor_id = intval($_GET['visitor_id']);
+        $from_type = intval($_GET['from_type']);
+
+        if(!isset($visitor_id) || empty($visitor_id)){
+            return self::outerr("参数有误");
+        }
+
+        if(!isset($from_type) || empty($from_type)){
+            return self::outerr("参数有误");
+        }
+
+        $from_type = $from_type == 1?"room":"qrcode";
+
+        $member_id = session_helper::memberid();
+
+        $talks_helper = new room\talks_helper();
+        $mine_friends = $talks_helper->friends($member_id);
+
+        $is_friend = in_array($visitor_id ,$mine_friends);
+
+        $member_info = [];
+        $visitor_info = [];
+        $items = member_info::get_members([$visitor_id,$member_id]);
+        if (count($items) == 2)
+        {
+            foreach ($items as $item){
+                if($item['member_id'] == $member_id){
+                    $member_info = $item;
+                }elseif($item['member_id'] == $visitor_id){
+                    $visitor_info = $item;
+                }
+            }
+        } elseif( count($items) == 1) {
+            $member_info =  $visitor_info = $items[0];
+        } else {
+
+        }
+
+        $items = Model('room')->getRoomParts(["member_id"=>$visitor_id,'state' => 0],'room_id',false);
+        $xroomids = [];
+        if(!empty($items)) {
+            foreach ($items as $item){
+                $xroomids[] = $item['room_id'];
+            }
+        }
+
+        $items = Model('room')->getRoomParts(["member_id"=>$member_id ,'state' => 0],'room_id',false);
+        $yroomids = [];
+        if(!empty($items)) {
+            foreach ($items as $item){
+                $yroomids[] = $item['room_id'];
+            }
+        }
+
+        $intersect = array_intersect($xroomids,$yroomids);
+
+        return self::outsuccess(["type"=>1,"common_rooms"=>count($intersect),"is_friend"=>$is_friend,"from_type"=>$from_type,"visitor_info"=>$visitor_info,"member_info"=>$member_info],"/talk/member_detail");
+    }
 }
 
 class tpl_member

mobile/control/member_talk.php

@@ -1316,46 +1316,8 @@ class member_talkControl extends mbMemberControl
     }
 
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    public function member_detailOp()
-    {
-        $visitor_id = intval($_GET['visitor_id']);
-        $from_type = intval($_GET['from_type']);
-
-        if(!isset($visitor_id) || empty($visitor_id)){
-            return self::outerr("参数有误");
-        }
-
-        if(!isset($from_type) || empty($from_type)){
-            return self::outerr("参数有误");
-        }
 
-        $from_type = $from_type == 1?"room":"qrcode";
 
-        $member_id = session_helper::memberid();
-
-        $talks_helper = new room\talks_helper();
-        $mine_friends = $talks_helper->friends($member_id);
-
-        $is_friend = in_array($visitor_id ,$mine_friends);
-
-        $member_info = [];
-        $visitor_info = [];
-        $items = member_info::get_members([$visitor_id,$member_id]);
-        if (count($items) == 2) {
-            foreach ($items as $item){
-                if($item['member_id'] == $member_id){
-                    $member_info = $item;
-                }elseif($item['member_id'] == $visitor_id){
-                    $visitor_info = $item;
-                }
-            }
-        } elseif( count($items) == 1) {
-            $member_info =  $visitor_info = $items[0];
-        } else {
-
-        }
-        return self::outsuccess(["is_friend"=>$is_friend,"from_type"=>$from_type,"visitor_info"=>$visitor_info,"member_info"=>$member_info],"/talk/member_detail");
-    }
 
     public function message_boardOp()
     {
@@ -1449,7 +1411,6 @@ class member_talkControl extends mbMemberControl
 
         return self::outsuccess(["applys"=>$applys,"mobile_page"=>["hasmore"=>$hasmore,"curpage"=>$this->cur_page]]);
     }
-
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     public function room_goodsOp()
     {