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

data/model/room.model.php

@@ -35,9 +35,9 @@ class roomModel extends Model
         $ret = $this->table('room_participant')->where(['room_id' => $room_id,'member_id' => $user])->update(['leave_time' => time(),'state' => 2]);
         return $ret;
     }
-    public function editPartNickname($room_id,$user,$member_remark)
+    public function editPartNickname($room_id,$user,$member_nick)
     {
-        $ret = $this->table('room_participant')->where(['room_id' => $room_id,'member_id' => $user])->update(['member_remark' => $member_remark]);
+        $ret = $this->table('room_participant')->where(['room_id' => $room_id,'member_id' => $user])->update(['member_nick' => $member_nick]);
         return $ret;
     }
     ///群聊接口//////////////////////////////////////////////////////////////////////////////////////////////////////////

helper/room/factory.php

@@ -158,11 +158,11 @@ class factory
         $items = $mod_room->participants($roomid);
 
         $uids = [];
-        $member_remarks = [];
+        $member_nick = [];
         foreach ($items as $item) {
             $uid = intval($item['member_id']);
             $uids[] = $uid;
-            $member_remarks[$uid] = $item['member_remark'];
+            $member_nick[$uid] = $item['member_nick'];
         }
 
         $uids = array_unique($uids,SORT_NUMERIC);
@@ -172,7 +172,7 @@ class factory
         foreach ($members as $member) {
             $uinfo = new member_info($member);
             $user = $uinfo->member_id();
-            $nickname = empty($member_remarks[$user]) ? $uinfo->nickname() : $member_remarks[$user];
+            $nickname = empty($member_nick[$user]) ? $uinfo->nickname() : $member_nick[$user];
             $item = ['avatar' => $uinfo->avatar(),'nickname' => $nickname,'userid' => $uinfo->member_id()];
             $uid_infos[$user] = $item;
         }

helper/room/factory_client.php

@@ -116,7 +116,7 @@ class factory_client extends tcp_client
     }
     public function leave($roomid, $user)
     {
-        $param = ["act" => 'fcgi','op' => 'invite','room' => $roomid,'user' => $user];
+        $param = ["act" => 'fcgi','op' => 'leave','room' => $roomid,'user' => $user];
         $result = $this->request($param);
         if(empty($result)) return false;
 

helper/room/room_info.php

@@ -75,8 +75,8 @@ class room_info
     public function shared_bonus(){
         return $this->mParams['shared_bonus'];
     }
-    public function broadcast(){
-        return $this->mParams['broadcast'];
+    public function notice(){
+        return $this->mParams['notice'];
     }
     public function passwd(){
         return $this->mParams['passwd'];
@@ -109,7 +109,7 @@ class room_info
         $ret['level']  = $this->level();
 
         $ret['shared_bonus']    = $this->shared_bonus();
-        $ret['broadcast']    = $this->broadcast();
+        $ret['notice']    = $this->notice();
         $ret['passwd']    = $this->passwd();
 
         return $ret;

helper/room/tpl_group_home.php

@@ -79,12 +79,19 @@ class tpl_group_home
     {
         $html = '';
         if (!empty($this->participants)) {
+            $i = 1;
+            $cnt = count($this->participants);
             foreach ($this->participants as $uids => $member)
             {
+                if($i < $cnt) {
+                    $html .= "<div class=\"weui-flex__item\" data-member-id={$member['userid']}>";
+                }else{
+                    $html .= "<div class=\"weui-flex__item\" data-member-id={$member['userid']} data-last='true'> ";
+                }
+
                 if($this->isManager($uids))
                 {
                     $html .= "        
-                    <div class=\"weui-flex__item\">
                         <img src=\"{$member['avatar']}\" alt=\"\">
                         <p>{$member['nickname']}</p>
                         <span>管理员</span>
@@ -92,13 +99,15 @@ class tpl_group_home
                 }
                 else
                 {
-                    $html .= "        
-                    <div class=\"weui-flex__item\">
+                    $html .= "
                         <img src=\"{$member['avatar']}\" alt=\"\">
                         <p>{$member['nickname']}</p>
                     </div>";
                 }
+
+                $i++;
             }
+
         }
 
 

mobile/control/member_talk.php

@@ -430,8 +430,8 @@ class member_talkControl extends mbMemberControl
             return self::outerr(errcode::ErrParamter);
         }
 
-        $member_remark = trim($_GET['member_remark']);
-        $len = strlen($member_remark);
+        $member_nick = trim($_GET['member_nick']);
+        $len = strlen($member_nick);
         if( $len <= 0 || $len > 40 ) {
             return self::outerr(errcode::ErrParamter,"群备注名称不得为空或过长");
         }
@@ -442,7 +442,7 @@ class member_talkControl extends mbMemberControl
 
         if($user <= 0)
         {
-            $ret = $mod_room->editPartNickname($roomid,$self,$member_remark);
+            $ret = $mod_room->editPartNickname($roomid,$self,$member_nick);
         }
         else
         {
@@ -455,7 +455,7 @@ class member_talkControl extends mbMemberControl
                 return self::outerr(errcode::ErrTalk,"只有管理员可以修改他人的备注");
             }
 
-            $ret = $mod_room->editPartNickname($roomid,$user,$member_remark);
+            $ret = $mod_room->editPartNickname($roomid,$user,$member_nick);
         }
 
         if($ret) {
@@ -515,10 +515,10 @@ class member_talkControl extends mbMemberControl
     public function kickOp()
     {
         $room = intval($_GET['room_id']);
-        $leaver = intval($_GET['troublemaker']);
+        $leavers = explode(',', trim($_GET['troublemaker']));
 
 
-        if($room <= 0 || $leaver<= 0 ) {
+        if($room <= 0 || count($leavers) <= 0 ) {
             return self::outerr(errcode::ErrParamter);
         }
 
@@ -533,7 +533,7 @@ class member_talkControl extends mbMemberControl
             return self::outerr(errcode::ErrTalk,"只有群主可以踢人");
         }
 
-        $result = room\factory_client::instance()->leave($room,$leaver);
+        $result = room\factory_client::instance()->leave($room,$leavers);
         if($result === false) {
             return self::outerr(errcode::ErrRoom);
         }

mobile/templates/default/talk/homepage.php

@@ -112,44 +112,33 @@
                         room_id: 37
                     }
                 };
-
-                $.get('/mobile/index.php?act=member_talk&op=invite',
-                    {
-                        invitees:['36620','36621'].join(','),
-                        room:37
-                    },function(res){
-                        console.log(res);
-                        if(res.code != 200) {
-                            $.alert(res.message);
-                            return;
-                        }
-                        var datas = res.datas;
-                        var html = '';
-                        if(datas.invitees && datas.invitees.length > 0) {
-                            for(var i=0;i<datas.invitees.length;i++) {
-                                html += '<div class="weui-flex__item">' +
-                                            '<img src="'+datas.invitees[i].avatar+'" alt="">' +
-                                            '<p>'+datas.invitees[i].nickname+'</p>\n' +
-                                        '</div>'
-                            }
-                            $('.group_members').append(html);
-                        }
-                    });
-
                 jsBridge.call_native_handler('on_native_click', JSON.stringify(jsonobject), function (res) {
                     var datas = JSON.parse(res);
+                    if(datas.friends.length <= 0) return;
                     var add_friends = datas.friends.join(',');
-                    $.get('http://192.168.0.103/mobile/index.php?act=member_talk&op=invite',
+                    $.get('/mobile/index.php?act=member_talk&op=invite',
                         {
                             invitees:add_friends,
-                            room:37
-                    },function(data){
-                        alert(data);
-                    })
+                            room_id:37,
+                            client_type:'ios'
+                        },function(res){
+                            if(JSON.parse(res).code != 200) {
+                                $.alert(res.message);
+                                return;
+                            }
+                            var datas = JSON.parse(res).datas;
+                            var html = '';
+                            if(datas.invitees && datas.invitees.length > 0) {
+                                for(var i=0;i<datas.invitees.length;i++) {
+                                    html += '<div class="weui-flex__item" data-member-id="'+datas.invitees[i].member_id+'">' +
+                                        '<img src="'+datas.invitees[i].avatar+'" alt="">' +
+                                        '<p>'+datas.invitees[i].nickname+'</p>\n' +
+                                        '</div>'
+                                }
+                                $('div[data-last="true"]').after(html);
+                            }
+                        });
                 });
-
-
-
             });
 
             $('#del_member').on('click', function () {
@@ -159,7 +148,32 @@
                         room_id: 37
                     }
                 };
-                jsBridge.call_native_handler('on_native_click', JSON.stringify(jsonobject));
+
+                var datas = [36621];
+                var add_friends = datas.join(',');
+                $.get('/mobile/index.php?act=member_talk&op=kick',
+                    {
+                        troublemaker:add_friends,
+                        room_id:37,
+                        client_type:'ios'
+                    },function(res){
+                    console.log(res);
+                        if(JSON.parse(res).code != 200) {
+                            $.alert(res.message);
+                            return;
+                        }
+                        for(var i=0;i<datas.length;i++){
+                            $('div[data-member-id='+datas[i]+']').remove();
+                        }
+                        $.alert('删除成功');
+                    });
+
+
+                jsBridge.call_native_handler('on_native_click', JSON.stringify(jsonobject), function (res) {
+                    var datas = JSON.parse(res);
+                    if(datas.friends.length <= 0) return;
+
+                });
             });
 
             $('#talk_top').on('change', function () {