move member_detail

mobile/control/index.php

@@ -168,42 +168,42 @@ class indexControl extends specialControl
     {
         $type = 3;
         $apply_id   = intval($_GET['apply_id']);
-        if($apply_id >0) {
+        $from_type = intval($_GET['from_type']);
+        $relay_id = intval($_GET['relay_id']);
+
+        if($apply_id >0)
+        {
             $type = 2;
-            $member_id = "";
+            if(empty($apply_msg)){
+                return self::outerr("参数有误");
+            }
+            $relay_id = "";
+            $from_type = "";
         }else{
             $type = 1;
+            if(!isset($relay_id) || empty($relay_id)){
+                return self::outerr("参数有误");
+            }
+            if(!isset($from_type) || empty($from_type)){
+                return self::outerr("参数有误");
+            }
+            $from_type = $from_type == 1?"room":"qrcode";
         }
 
-        $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($relay_id ,$mine_friends);
 
-        $is_friend = in_array($visitor_id ,$mine_friends);
-
-        $member_info = [];
-        $visitor_info = [];
-        $items = member_info::get_members([$visitor_id,$member_id]);
+        $member_info = [];$visitor_info = [];
+        $items = member_info::get_members([$relay_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){
+                }elseif($item['member_id'] == $relay_id){
                     $visitor_info = $item;
                 }
             }
@@ -213,7 +213,7 @@ class indexControl extends specialControl
 
         }
 
-        $items = Model('room')->getRoomParts(["member_id"=>$visitor_id,'state' => 0],'room_id',false);
+        $items = Model('room')->getRoomParts(["member_id"=>$relay_id,'state' => 0],'room_id',false);
         $xroomids = [];
         if(!empty($items)) {
             foreach ($items as $item){
@@ -231,7 +231,7 @@ class indexControl extends specialControl
 
         $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");
+        return self::outsuccess(["type"=>$type,"common_rooms"=>count($intersect),"is_friend"=>$is_friend,"from_type"=>$from_type,"visitor_info"=>$visitor_info,"member_info"=>$member_info],"/talk/member_detail");
     }
 }