Merge branch 'talksec' of 121.43.114.153:/home/git/repositories/shopnc into talksec

mobile/control/member_relation.php

@@ -222,4 +222,10 @@ class member_relationControl extends mbMemberControl
             return false;
         }
     }
+
+    //处理好友申请
+    public function handle_applysOp()
+    {
+        return self::outsuccess(null,"处理成功");
+    }
 }

mobile/control/member_talk.php

@@ -103,7 +103,13 @@ class member_talkControl extends mbMemberControl
             $result = $this->chatwomsg($msgid,$user);
             $msgs = $this->format_message($result['uids'],$result['msgs'],$type,$user);
         }
-        else {
+//        elseif($type == 'applys')
+//        {
+//            $result = $this->applysmsg($msgid);
+//            $msgs = $result['msgs'];
+//        }
+        else
+        {
             $msgs = [];
             Log::record(__METHOD__ . " : invalid type={$type}.",Log::ERR);
         }
@@ -233,8 +239,14 @@ class member_talkControl extends mbMemberControl
         return ['uids' => [$left,$right],'msgs' => $msgs];
     }
 
-    private function applysmsg($msgid,$user){
-
+    private function applysmsg($msgid){
+        $mod_room = Model('room');
+        $user = session_helper::memberid();
+        $msgs = $mod_room->getRoomsgList(["member_id"=>$user,"type"=>proto_type::msg_type_apply], $this->page_size);
+        if($msgs){
+            usort($msgs,['room\sorter','msgid_asc']);
+        }
+        return ['msgs' => $msgs];
     }
 
     public function create_roomOp()

mobile/control/user_index.php

@@ -172,7 +172,7 @@ class user_indexControl extends mobileHomeControl
             return self::outerr(errcode::ErrParamter);
         }
 
-        return $this->open_page($idolid,['from_type' => '来自于好友申请','scene' => 'applyer','note' => $msg['note']]);
+        return $this->open_page($idolid,['from_type' => '来自于好友申请','scene' => 'applyer','note' => $msg['note'],"msg_id"=>$msg_id]);
     }