debug

admin/control/room_manage.php

@@ -110,11 +110,13 @@ class room_manageControl extends SystemControl
         if($res) {
             $certs = $this->mod_room->findCert(["cert_id" => $cert_id]);
             if($cstatus == 1) {
+                $room_status = true;
                 $this->mod_room->editRoom(['room_id' => $certs['room_id']],["room_name" => $certs['short_name'],"room_desc"=>$certs['full_name'], "room_level" => $certs['ctype']]);
             }else{
+                $room_status = false;
                 $this->mod_room->editRoom(['room_id' => $certs['room_id']],["room_level" => 0]);
             }
-            \room\pusher::instance()->cert_notice($certs['room_id'],$cstatus);
+            \room\pusher::instance()->cert_notice($certs['room_id'], $room_status , $remark);
             showMessage("操作成功",'index.php?act=room_manage&op=certs_list&cstatus='.$cstatus,'html','succ',1,1000);
         } else {
             showMessage("操作失败",'index.php?act=room_manage&op=certs_list','html','succ',1,1000);

data/resource/mobile/talk/js/room_apply.js

@@ -42,12 +42,14 @@ $(function () {
             for (var i = 0; i < this.useObj.length; i++) {
                 if(this.useObj[i].type == 'apply_friend'){
                     var _title = '<h3 class="title">好友申请</h3>';
+                }else if(this.useObj[i].type == 'cert_notice'){
+                    var _title = '<h3 class="title">群认证</h3>';
                 }else{
                     var _title = '<h3 class="title">入群申请</h3>';
                 }
 
-                if (this.useObj[i].state == 1 || this.useObj[i].state == 2) {
-                    if (this.useObj[i].state == 1) {
+                if(this.useObj[i].type == 'cert_notice') {
+                    if(this.useObj[i].state == 1){
                         html += "<div class=\"weui-cell_state\">\n" + _title +
                             "       <div class=\"weui-cell\">\n" +
                             "           <div class=\"weui-cell__hd\">\n" +
@@ -55,12 +57,41 @@ $(function () {
                             "           </div>\n" +
                             "           <div class=\"weui-cell__bd\">\n" +
                             "               <p class=\"apply_name\"><span>"+this.useObj[i].nickname+"</span><span class=\"state\">已通过</span></p>\n" +
-                            "               <p class=\"abstract\">留言："+ this.useObj[i].content+"</p>\n" +
+                            "               <p class=\"abstract\">留言：</p>\n" +
+                            "           </div>\n" +
+                            "       </div>\n" +
+                            "   </div>";
+                    }else if(this.useObj[i].state == 2){
+                        html += "<div class=\"weui-cell_state\">\n" + _title +
+                            "       <div class=\"weui-cell\">\n" +
+                            "           <div class=\"weui-cell__hd\">\n" +
+                            "               <img src=\""+this.useObj[i].avatar+"\">\n" +
+                            "           </div>\n" +
+                            "           <div class=\"weui-cell__bd\">\n" +
+                            "               <p class=\"apply_name\"><span>"+this.useObj[i].nickname+"</span><span class=\"state\">未通过</span></p>\n" +
+                            "               <p class=\"abstract\">留言：\"+ this.useObj[i].content+\"</p>\n" +
                             "           </div>\n" +
                             "       </div>\n" +
                             "   </div>";
+                    }else{
+
                     }
-                    else {
+                } else {
+                    if(this.useObj[i].state == 1)
+                    {
+                        html += "<div class=\"weui-cell_state\">\n" + _title +
+                            "       <div class=\"weui-cell\">\n" +
+                            "           <div class=\"weui-cell__hd\">\n" +
+                            "               <img src=\""+this.useObj[i].avatar+"\">\n" +
+                            "           </div>\n" +
+                            "           <div class=\"weui-cell__bd\">\n" +
+                            "               <p class=\"apply_name\"><span>"+this.useObj[i].nickname+"</span><span class=\"state\">已通过</span></p>\n" +
+                            "               <p class=\"abstract\">留言："+ this.useObj[i].content+"</p>\n" +
+                            "           </div>\n" +
+                            "       </div>\n" +
+                            "   </div>";
+                    }else if(this.useObj[i].state == 2)
+                    {
                         html += "<div class=\"weui-cell_state\">\n"  + _title +
                             "       <div class=\"weui-cell\">\n" +
                             "           <div class=\"weui-cell__hd\">\n" +
@@ -72,25 +103,24 @@ $(function () {
                             "           </div>\n" +
                             "       </div>\n" +
                             "   </div>";
+                    } else {
+                        html += "  <div class=\"weui-cell_box applys-item\" data-applys-id=\""+this.useObj[i].msg_id+"\">\n"  + _title +
+                            "        <div class=\"weui-cell\">\n" +
+                            "            <div class=\"weui-cell__hd\">\n" +
+                            "                <img src=\""+this.useObj[i].avatar+"\">\n" +
+                            "            </div>\n" +
+                            "            <div class=\"weui-cell__bd\">\n" +
+                            "                <p class=\"apply_name\">"+this.useObj[i].nickname+"</p>\n" +
+                            "                <p class=\"abstract\">留言："+this.useObj[i].content+"</p>\n" +
+                            "            </div>\n" +
+                            "        </div>\n" +
+                            "        <div class=\"handle\">\n" +
+                            "            <span class=\"agree_btn\" data-msg-id=\"" + this.useObj[i].msg_id + "\">通过</span>\n" +
+                            "            <span class=\"refusal_btn\" data-msg-id=\"" + this.useObj[i].msg_id + "\">忽略</span>\n" +
+                            "        </div>\n" +
+                            "    </div>"
                     }
                 }
-                else {
-                    html += "  <div class=\"weui-cell_box\">\n"  + _title +
-                        "        <div class=\"weui-cell\">\n" +
-                        "            <div class=\"weui-cell__hd\">\n" +
-                        "                <img src=\""+this.useObj[i].avatar+"\">\n" +
-                        "            </div>\n" +
-                        "            <div class=\"weui-cell__bd\">\n" +
-                        "                <p class=\"apply_name\">"+this.useObj[i].nickname+"</p>\n" +
-                        "                <p class=\"abstract\">留言："+this.useObj[i].content+"</p>\n" +
-                        "            </div>\n" +
-                        "        </div>\n" +
-                        "        <div class=\"handle\">\n" +
-                        "            <span class=\"agree_btn\" data-msg-id=\"" + this.useObj[i].msg_id + "\">通过</span>\n" +
-                        "            <span class=\"refusal_btn\" data-msg-id=\"" + this.useObj[i].msg_id + "\">忽略</span>\n" +
-                        "        </div>\n" +
-                        "    </div>"
-                }
             }
             $(id).append(html);
         }

helper/room/pusher.php

@@ -78,35 +78,24 @@ class pusher
         }
     }
 
-    public function room_notice($roomid, $user, $message)
-    {
-        try
-        {
-            $msg = "群公告@all {$message}";
-            $room = $this->get_room($roomid);
-            if($room == false) return;
-
-            factory_client::instance()->notice_room($roomid,$user,proto_type::msg_stype_text,$message);
-
-        }
-        catch (Exception $ex) {
-            Log::record($ex->getMessage(),Log::ERR);
-        }
-    }
-
     public function cert_notice($roomid, $state, $note)
     {
         try
         {
             $room = $this->get_room($roomid);
             if($room == false) return;
+
+            $name = \util::ellipsis($room->name());
             if($state) {
-                $msg = "群: {$room->name()} 申请的认证被通过";
+                $msg = "群: {$name} 申请的认证被通过";
+                $state = "accept";
             } else {
-                $msg = "群: {$room->name()} 申请的认证被拒绝";
+                $msg = "群: {$name} 申请的认证被拒绝";
+                $state = "refuse";
             }
 
-            $content = ['type' => 'cert_notice','note' => $note,'room_id' => $roomid];
+            $from = ['nickname' => $name,'avatar' => $room->avatar(),'room_id' => intval($roomid)];
+            $content = ['type' => 'cert_notice','from'=>$from,'note' => $note,'room_id' => $roomid,"state"=>$state];
             factory_client::instance()->notice_users([$room->owner()],proto_type::push_apply,$content,$msg);
         }
         catch (Exception $ex) {

helper/room/tpl_chatwo_home.php

@@ -38,7 +38,7 @@ class tpl_chatwo_home
             $html .= "
             <div class=\"group_top\">
                 <div class=\"group_members weui-flex\">
-                    <div class=\"weui-flex__item member-detail\" data-member-id={$member['member_id']} data-last='true'>
+                    <div class=\"weui-flex__item member-detail\" data-member-id={$member['userid']} data-last='true'>
                         <img src=\"{$member['avatar']}\" alt=\"\">
                         <p>{$member['nickname']}</p>
                     </div>

mobile/control/member_talk.php

@@ -670,7 +670,7 @@ class member_talkControl extends mbMemberControl
 
         $ret = Model("room")->editRoom(['room_id' => $room_id],['notice' => $room_notice]);
         if($ret) {
-            \room\pusher::instance()->notice_room($user,$room_id,$room_notice);
+            room\factory_client::instance()->notice_room($room_id,$user,proto_type::msg_stype_text,"群公告@all {$room_notice}");
             return self::outsuccess(null);
         } else {
             return self::outerr(errcode::ErrDB);
@@ -695,13 +695,6 @@ class member_talkControl extends mbMemberControl
             if($len <> 4) {
                 return self::outerr(errcode::ErrParamter,"密码设置错误");
             }
-//            if($len <4 || $len >8) {
-//                return self::outerr(errcode::ErrParamter,"密码长度请再4至8个字符之间");
-//            }
-//
-//            if (!preg_match("/^[a-z0-9]+$/u", $passwd)) {
-//                return self::outerr(errcode::ErrParamter,"密码只能包含英文字母或数字，不区分大小写");
-//            }
         }else{
             $passwd = "";
         }