add to local

helper/room_helper.php

@@ -76,6 +76,19 @@ class room_helper
         }
     }
 
+    public static function room($roomid)
+    {
+        if($roomid <= 0) return false;
+
+        $mod_room = Model('room');
+        $items = $mod_room->getRooms(['room_id' => $roomid]);
+        foreach ($items as $item) {
+            return new room\room_info($item);
+        }
+
+        return false;
+    }
+
     public static function avatarts($uids)
     {
         if(empty($uids)) return false;

helper/util_helper.php

@@ -180,6 +180,15 @@ class util
     {
         return strtotime(date('Y-m-d',$input)) + 86399;
     }
+
+    public static function ellipsis($input, $len = 12)
+    {
+        if(mb_strlen($input,'utf-8') >= $len) {
+            $input = mb_substr($input,0,$len,'utf-8');
+            $input.= "...";
+        }
+        return $input;
+    }
 }
 
 class string_helper

mobile/control/member_bonus.php

@@ -49,6 +49,8 @@ class member_bonusControl extends mbMemberControl
             $result['show_joinroom'] = false;
             $result['mine_room'] = $mine_rooms;
         }
+        $result['convert_ratio'] = 100;
+        
 
         $result['other_room'] = room_helper::page_rooms(['type' => proto_type::room_chat],'steps_count desc,room_id desc');
         return self::outsuccess($result);

mobile/control/member_talk.php

@@ -16,6 +16,7 @@ require_once(BASE_ROOT_PATH . '/helper/room/tpl_group_home.php');
 require_once(BASE_ROOT_PATH . '/helper/room/tpl_chatwo_home.php');
 require_once(BASE_ROOT_PATH . '/helper/FileUploader.php');
 require_once(BASE_ROOT_PATH . '/helper/room/face_room.php');
+require_once(BASE_ROOT_PATH . '/helper/util_helper.php');
 
 use room\proto_type;
 class member_talkControl extends mbMemberControl
@@ -999,7 +1000,7 @@ class member_talkControl extends mbMemberControl
                     $steps[$k]['steps'] = $sport['steps'];
                     $steps[$k]['avatar'] = $member['avatar'];
                     $steps[$k]['is_man'] = $member['is_man'];
-                    $steps[$k]['nickname'] = $this->mb_name($member['nickname']);
+                    $steps[$k]['nickname'] = util::ellipsis($member['nickname']);
                     $steps[$k]['bonus'] = $sport['bonus'];
                 }
                 if(count($steps) >= $per_page) $hasmore = true;
@@ -1011,14 +1012,7 @@ class member_talkControl extends mbMemberControl
         }
     }
 
-    private function mb_name($name)
-    {
-        if(mb_strlen($name,'utf-8') >= 12) {
-            $name = mb_substr($name,0,12,'utf-8');
-            $name.= "...";
-        }
-        return $name;
-    }
+
 
     private function user_steps($room_parti)
     {
@@ -1067,7 +1061,7 @@ class member_talkControl extends mbMemberControl
 
                 $room['avatar'] = $rinfo->avatar();
                 $name = $rinfo->name();
-                $room['name'] = $this->mb_name($name);
+                $room['name'] = util::ellipsis($name);
                 $room['steps'] = $mod_room->totalRoomSteps($room['room_id']);
 
                 $room_steps[] = $room;
@@ -1397,7 +1391,8 @@ class member_talkControl extends mbMemberControl
         return self::outsuccess(null,'talk/new_applys');
     }
 
-    public function ajax_get_applysOp(){
+    public function ajax_get_applysOp()
+    {
         $mod_room = Model('room');
         $member = session_helper::memberid();
 

mobile/control/user_index.php

@@ -22,6 +22,7 @@ require_once(BASE_ROOT_PATH . '/mobile/control/special.php');
 require_once(BASE_ROOT_PATH . '/helper/third_author/wxauthor.php');
 require_once(BASE_ROOT_PATH . '/helper/session_helper.php');
 require_once(BASE_ROOT_PATH . '/helper/url_helper.php');
+require_once(BASE_ROOT_PATH . '/helper/room_helper.php');
 
 
 class user_indexControl extends mobileHomeControl
@@ -50,7 +51,6 @@ class user_indexControl extends mobileHomeControl
             return self::outsuccess(['direct_uri' => $url],"redirect");
         }
 
-        $minfo = new member_info($idolid);
         if(session_helper::logined() == false)
         {
             if(session_helper::isapp()) {
@@ -74,13 +74,76 @@ class user_indexControl extends mobileHomeControl
         }
         else
         {
-            $relateion = new relation\mem_relation(session_helper::memberid());
-            $isfriend =  $relateion->is_follower($idolid);
 
-            return self::outsuccess(['member_info' => $minfo->filter(),'is_friend' => $isfriend,'from_type' => 'qrcode'],
-                "member/index",'wap');
         }
     }
+
+    private function open_page($idolid,$from)
+    {
+        $minfo = new member_info($idolid);
+        $relateion = new relation\mem_relation(session_helper::memberid());
+        $isfriend =  $relateion->is_follower($idolid);
+
+        return self::outsuccess(['member_info' => $minfo->filter(),'is_friend' => $isfriend,'from_type' => $from],
+            "member/friends",'wap');
+    }
+
+    //下面都是登录装下的情况
+    public function detailOp()
+    {
+        if(!session_helper::logined()) {
+            return self::outerr(errcode::ErrUnLogin);
+        }
+        $idolid = $_GET['member_id'];
+        if($idolid <= 0) {
+            return self::outerr(errcode::ErrParamter);
+        }
+
+        $room_id = $_GET['room_id'];
+        if($room_id > 0)
+        {
+            $room = room_helper::room($room_id);
+            if($room == false) {
+                $from = "来自于群聊";
+            } else {
+                $name = $room->name();
+                $name = util::ellipsis($name);
+                $from = "来自于群聊 {$name}";
+            }
+        }
+        else {
+            $from = '来自于聊天';
+        }
+
+        return $this->open_page($idolid,$from);
+    }
+
+    public function friend_applyOp()
+    {
+        if(!session_helper::logined()) {
+            return self::outerr(errcode::ErrUnLogin);
+        }
+        $idolid = $_GET['member_id'];
+        if($idolid <= 0) {
+            return self::outerr(errcode::ErrParamter);
+        }
+
+        return $this->open_page($idolid,"");
+
+    }
+
+    public function room_applyOp()
+    {
+        if(!session_helper::logined()) {
+            return self::outerr(errcode::ErrUnLogin);
+        }
+        $idolid = $_GET['member_id'];
+        if($idolid <= 0) {
+            return self::outerr(errcode::ErrParamter);
+        }
+
+        return $this->open_page($idolid,"");
+    }
 }
 
 class tpl_member