debubg

admin/control/room_manage.php

@@ -107,8 +107,13 @@ class room_manageControl extends SystemControl
         }
 
         $res = $this->mod_room->editCerts(["cert_id"=>$cert_id],["cstatus"=>$cstatus,"remark"=>$remark,"admin"=>$admin,"confirm_time"=>time()]);
-
         if($res) {
+            $certs = $this->mod_room->findCert(["cert_id" => $cert_id]);
+            if($cstatus == 1) {
+                $this->mod_room->editRoom(['room_id' => $certs['room_id'], "room_name" => $certs['room_name'], "room_level" => $certs['ctype']]);
+            }else{
+                $this->mod_room->editRoom(['room_id'=>$certs['room_id'],"room_name"=>$certs['room_name'],"room_level"=>0]);
+            }
             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);

admin/templates/default/room_cert.view.php

@@ -43,6 +43,17 @@
         <td colspan="2">
             <ul>
                 <li style="width: 80%;">
+                    <strong>认证类型:</strong>
+                    <?php if($output['cert_info']['ctype'] == 1){
+                        echo "校园认证";
+                    }elseif($output['cert_info']['ctype'] == 2){
+                        echo "校园认证";
+                    }
+                    ?>
+                </li>
+
+                <li style="width: 80%;"></li>
+                <li style="width: 80%;">
                     <strong>认证名称:</strong><?php echo $output['cert_info']['short_name'];?>
                 </li>
 

data/resource/mobile/talk/js/certs.js

@@ -186,7 +186,7 @@ $(function () {
             return;
         }
         var inputs = {
-            talk_id : talk_id,
+            room_id : talk_id,
             ctype : ctype,
             cmobile:$('input[name="cmobile"]').val(),
             code:$('input[name="code"]').val(),
@@ -199,7 +199,15 @@ $(function () {
             client_type: 'ajax'
         };
         $.post('/mobile/index.php?act=member_talk&op=commit_certs', inputs, function (res) {
-            console.log(res);
+            var datas = JSON.parse(res);
+            if(datas.code == 200) {
+                $.toast('提交完成',1000);
+                setTimeout(function () {
+                    window.location.href= "/mobile/index.php?act=member_talk&op=room_detail&talk_type=room&talk_id="+talk_id;
+                },1000);
+            }else{
+                $.alert(result.message);
+            }
         });
     });
 });

helper/room/tpl_group_home.php

@@ -186,71 +186,139 @@ class tpl_group_home
             $name = $this->room_info->has_name() ? $this->room_info->name() : "未命名";
             $notice = empty($this->room_info->notice()) ? "未设置" : "已设置";
             $desc = empty($this->room_info->room_desc()) ? "未设置" : "已设置";
-            $level = $this->room_info->level() == 0 ? "未认证" : "已认证";
-            $level_sign = $this->room_info->level() == 0 ?  0 : 1;
-
             $cnt = $this->mod_room->applyCnts(['room_id'=>$this->room_id,"step"=>0]);
-            $apply = $cnt > 0 ? "待处理" . $cnt : "";
+            $apply = $cnt > 0 ? "待处理" . $cnt : "暂无申请";
+
+            $click = false;
+            $level = "已认证";
+            if($this->room_info->level() == 0) {
+                $certs = $this->mod_room->findCert(["room_id"=>$this->room_id]);
+                if(!empty($certs)) {
+                    if($certs['cstatus'] == 0) {
+                        $level = "待审核";
+                    }elseif($certs['cstatus'] == 2 || $certs['cstatus'] == 3){
+                        $click = true;
+                        $level = "待修改";
+                    }
+                }else{
+                    $click = true;
+                    $level = "未认证";
+                }
+            }
 
-            $html .= "<div class=\"weui-cells\">
-                        <a class=\"weui-cell weui-cell_access\" id='edit_group_name' href=\"javascript:;\">
-                            <div class=\"weui-cell__bd\">
-                                <p>群名称</p>
-                            </div>
-                            <div class=\"weui-cell__ft\">{$name}</div>
-                        </a>
-                        
-                        <a class=\"weui-cell weui-cell_access\" id=\"edit_group_avatar\" href=\"javascript:;\" onclick='uploader.click()'>
-                            <div class=\"weui-cell__bd\">
-                                <p>群头像</p>
-                            </div>
-                            <div class=\"weui-cell__ft\">
-                                <img src='{$avartar}' class='g_avatar' alt=''>
-                                <input type='file' name='file' enctype='multipart/form-data' id='uploader' style=\"display: none;\">
-                            </div>
-                        </a>
-                        
-                        <a class=\"weui-cell weui-cell_access\" id=\"group_AC\" href=\"javascript:;\" data-can-cert=\"{$level_sign}\">
-                            <div class=\"weui-cell__bd\">
-                                <p>群认证</p>
-                            </div>
-                            <div class=\"weui-cell__ft\" >{$level}</div>
-                        </a>
+
+            $html.= "<div class=\"weui-cells\">";
+            $html.= $this->room_name_btn($click,$name);
+            $html.= $this->room_avatar_btn($avartar);
+            $html.= $this->room_cert_btn($click,$level);
+            $html.= "</div>";
+
+            $html.= $this->room_manager_btn($desc,$notice,$apply,$cnt);
+
+        }
+        echo $html;
+    }
+
+    private function room_name_btn($click,$name)
+    {
+        if($click){
+            $html = "<div class=\"weui-cell weui-cell_access\" id='edit_group_name'>
+                        <div class=\"weui-cell__bd\">
+                            <p>群名称</p>
+                        </div>
+                        <div class=\"weui-cell__ft\">{$name}</div>
+                    </div>";
+        } else {
+            $html = "<div class=\"weui-cell\">
+                        <div class=\"weui-cell__bd\">
+                            <p>群名称</p>
+                        </div>
+                        <div class=\"weui-cell__ft\">{$name}</div>
                     </div>";
         }
+        return $html;
+    }
 
-        if ($this->isManager($this->cur_user)) {
-            $html.="<div class=\"weui-cells\">
-                    <a class=\"weui-cell weui-cell_access\" href=\"javascript:;\" id=\"edit_room_notice\">
+    private function room_avatar_btn($avartar){
+        $html = "<div class=\"weui-cell weui-cell_access\" id=\"edit_group_avatar\" onclick='uploader.click()'>
+                        <div class=\"weui-cell__bd\">
+                            <p>群头像</p>
+                        </div>
+                        <div class=\"weui-cell__ft\">
+                            <img src='{$avartar}' class='g_avatar' alt=''>
+                            <input type='file' name='file' enctype='multipart/form-data' id='uploader' style=\"display: none;\">
+                        </div>
+                </div>";
+        return $html;
+    }
+
+    private function room_cert_btn($click,$level)
+    {   if(!$this->isManager($this->cur_user)){
+            return "";
+        }
+        if($click){
+            $html = "<div class=\"weui-cell weui-cell_access\" id=\"group_AC\">
+                        <div class=\"weui-cell__bd\">
+                            <p>群认证</p>
+                        </div>
+                        <div class=\"weui-cell__ft\">{$level}</div>
+                     </div>";
+        }else{
+            $html = "<div class=\"weui-cell\">
+                        <div class=\"weui-cell__bd\">
+                            <p>群认证</p>
+                        </div>
+                        <div class=\"weui-cell__ft\">{$level}</div>
+                     </div>";
+        }
+        return $html;
+    }
+
+    private function room_manager_btn($desc,$notice,$apply,$cnt){
+        if ($this->isManager($this->cur_user))
+        {
+            $html = "<div class=\"weui-cells\">";
+            $html.= "<div class=\"weui-cell weui-cell_access\" href=\"javascript:;\" id=\"edit_room_notice\">
                         <div class=\"weui-cell__bd\">
                             <p>群公告</p>
                         </div>
                         <div class=\"weui-cell__ft\" id=\"room-notice-btn\">{$notice}</div>
-                    </a>
+                     </div>
                     
-                    <a class=\"weui-cell weui-cell_access\" href=\"javascript:;\" id=\"edit_room_desc\">
+                     <div class=\"weui-cell weui-cell_access\" href=\"javascript:;\" id=\"edit_room_desc\">
                         <div class=\"weui-cell__bd\">
                             <p>群介绍</p>
                         </div>
                         <div class=\"weui-cell__ft\" id=\"room-desc-btn\">{$desc}</div>
-                    </a>
-                    
-                    <a class=\"weui-cell weui-cell_access\" href=\"/mobile/index.php?act=member_talk&op=room_apply&talk_id={$this->room_id}\">
+                     </div>
+                    ";
+
+            if ($cnt > 0)
+            {
+                $html.="
+                    <div class=\"weui-cell weui-cell_access\" href=\"/mobile/index.php?act=member_talk&op=room_apply&talk_id={$this->room_id}\">
                         <div class=\"weui-cell__bd\">
                             <p>入群申请</p>
-                        </div>";
-                    if($cnt > 0) {
-                        $html.="<div class=\"weui-cell__ft\" id=\"room-apply-btn\" style=\"color: #FF4E4E\">{$apply}</div>
-                                </a>
-                                </div>";
-                    }else {
-                        $html.="<div class=\"weui-cell__ft\" id=\"room-apply-btn\">{$apply}</div>
-                                </a>
-                                </div>";
-                    }
+                        </div>
+                        <div class=\"weui-cell__ft\" id=\"room-apply-btn\" style=\"color: #FF4E4E\">{$apply}</div>
+                    </div>";
+            }
+            else
+            {
+                $html.="
+                    <div class=\"weui-cell weui-cell_access\" href=\"/mobile/index.php?act=member_talk&op=room_apply&talk_id={$this->room_id}\">
+                        <div class=\"weui-cell__bd\">
+                            <p>入群申请</p>
+                        </div>
+                        <div class=\"weui-cell__ft\" >{$apply}</div>
+                    </div>";
+            }
+            $html .="</div>";
+        }else{
+            $html = "";
         }
 
-        echo $html;
+        return $html;
     }
 
     public function show_personal_settings()
@@ -260,23 +328,23 @@ class tpl_group_home
         if (!empty($this->participants) && isset($this->participants[$this->cur_user])) {
             $html .= "
             <div class=\"weui-cells\">
-                <a class=\"weui-cell weui-cell_access\" href=\"javascript:;\" id='edit_nickname'>
+                <div class=\"weui-cell weui-cell_access\" href=\"javascript:;\" id='edit_nickname'>
                     <div class=\"weui-cell__bd\">
                         <p>我在本群的昵称</p>
                     </div>
                     <div class=\"weui-cell__ft group-nickname\">{$this->participants[$this->cur_user]['nickname']}</div>
-                </a>
+                </div>
             </div>";
         }
 
         if ($this->isManager($this->cur_user)) {
             $html .= "
             <div class=\"weui-cells\">
-                <a class=\"weui-cell weui-cell_access\" href=\"javascript:;\" id='change_owner' >
+                <div class=\"weui-cell weui-cell_access\" href=\"javascript:;\" id='change_owner' >
                     <div class=\"weui-cell__bd\">
                         <p>转让管理员</p>
                     </div>
-                </a>
+                </div>
             </div>";
         }
 

mobile/control/member_talk.php

@@ -1119,10 +1119,14 @@ class member_talkControl extends mbMemberControl
     {
         $type = intval($_GET['ctype']);
         $room_id = intval($_GET['talk_id']);
+
+        $cert = Model('room')->findCert(['room_id'=>$room_id,"ctype"=>$type]);
+        if(empty($cert)) $cert = [];
+
         if($type == 1){
-            return self::outsuccess(['room_id'=>$room_id],'talk/school_certs');
+            return self::outsuccess(['room_id'=>$room_id,"cert"=>$cert],'talk/school_certs');
         }elseif($type == 2){
-            return self::outsuccess(['room_id'=>$room_id],'talk/enterprise_certs');
+            return self::outsuccess(['room_id'=>$room_id,"cert"=>$cert],'talk/enterprise_certs');
         }else{
             return;
         }
@@ -1166,14 +1170,33 @@ class member_talkControl extends mbMemberControl
         }
 
         $mod_room = Model('room');
-        $item = $mod_room->findCert(["room_id"=>$room_id,"cstatus"=>0]);
-        if(!empty($item)) {
-            return self::outerr(errcode::ErrTalk,"您已提交一份认证申请，请耐心等待审核，勿重复提交");
-        }
+        $item = $mod_room->findCert(["room_id"=>$room_id]);
+        if(empty($item))
+        {
+            $insertId = $mod_room->addCert($ctype,$room_id,$short_name,$full_name,$cname,$cmobile,$cmail,$cinfo,$cimage);
 
-        $insertId = $mod_room->addCert($ctype,$room_id,$short_name,$full_name,$cname,$cmobile,$cmail,$cinfo,$cimage);
+            if($insertId){
+                return self::outsuccess(null);
+            }else{
+                return self::outerr(errcode::ErrDB,"提交失败");
+            }
+        }
 
-        if($insertId){
+        if($item['cstatus'] == 0){
+            return self::outerr(errcode::ErrTalk,"您已提交一份认证申请，请耐心等待审核，勿重复提交");
+        }
+        $updata['ctype']    = $ctype;
+        $updata['room_id']  = $room_id;
+        $updata["short_name"] = $short_name;
+        $updata["full_name"]  = $full_name;
+        $updata["cname"]      = $cname;
+        $updata["cmobile"]  = $cmobile;
+        $updata["cmail"]    = $cmail;
+        $updata["cinfo"]    = $cinfo;
+        $updata["cimage"]   = $cimage;
+        $updata["add_time"] = time();
+        $update = $mod_room->editCert(['cert_id'=>$item['cert_id']],$updata);
+        if($update){
             return self::outsuccess(null);
         }else{
             return self::outerr(errcode::ErrDB,"提交失败");

mobile/templates/default/talk/enterprise_certs.php

@@ -19,7 +19,7 @@
         <div class="weui-cells">
             <div class="weui-cell">
                 <div class="weui-cell__bd">
-                    <textarea class="weui-textarea" data-label="用户名称" name="short_name" placeholder="请使用体现企业特性的用户名称申请认证" rows="3"></textarea>
+                    <textarea class="weui-textarea" data-label="用户名称" name="short_name" placeholder="请使用体现企业特性的用户名称申请认证" rows="3"><?php echo $output['cert']['short_name'];?></textarea>
                 </div>
             </div>
         </div>
@@ -27,7 +27,7 @@
         <div class="weui-cells">
             <div class="weui-cell">
                 <div class="weui-cell__bd">
-                    <input class="weui-input" data-label="机构全称" name="full_name" type="text" placeholder="与中国大陆工商局颁发营业执照上的企业名称完全一致">
+                    <input class="weui-input" data-label="机构全称" name="full_name" type="text" placeholder="与中国大陆工商局颁发营业执照上的企业名称完全一致" value="<?php echo $output['cert']['full_name'];?>">
                 </div>
             </div>
         </div>
@@ -35,7 +35,7 @@
         <div class="weui-cells">
             <div class="weui-cell">
                 <div class="weui-cell__bd">
-                    <input class="weui-input" data-label="认证说明" name="cinfo" type="text" placeholder="请输入营业执照所示18位统一社会信用代码">
+                    <input class="weui-input" data-label="认证说明" name="cinfo" type="text" placeholder="请输入营业执照所示18位统一社会信用代码" value="<?php echo $output['cert']['cinfo'];?>">
                 </div>
             </div>
         </div>
@@ -48,7 +48,11 @@
                         <span class="line2"></span>
                     </div>
                     <input type='file' data-label="管理员身份证明" name='file' enctype='multipart/form-data' id='uploader' style="display: none;">
-                    <p class="uploader_tip">推荐尺寸800*800，支持jpg/png/jpeg/bmp格式，大小不超过1M</p>
+                    <?php if(!empty($output['cert']['cimage'])){
+                        echo '<p class="uploader_tip">请重新上传</p>';
+                    }else{
+                        echo '<p class="uploader_tip">推荐尺寸800*800，支持jpg/png/jpeg/bmp格式，大小不超过1M</p>';
+                    }?>
                 </div>
                 <input type="hidden" data-label="管理员身份证明" name="file_path" value="">
             </div>
@@ -61,7 +65,7 @@
         <div class="weui-cells">
             <div class="weui-cell">
                 <div class="weui-cell__bd">
-                    <input class="weui-input" data-label="管理员真实姓名" type="text" name="cname" placeholder="请输入管理员真实姓名">
+                    <input class="weui-input" data-label="管理员真实姓名" type="text" name="cname" placeholder="请输入管理员真实姓名" value="<?php echo $output['cert']['cname'];?>">
                 </div>
             </div>
         </div>
@@ -69,7 +73,7 @@
         <div class="weui-cells">
             <div class="weui-cell">
                 <div class="weui-cell__bd">
-                    <input class="weui-input" data-label="管理员手机号" name="cmobile" type="text" placeholder="请输入管理员手机号">
+                    <input class="weui-input" data-label="管理员手机号" name="cmobile" type="text" placeholder="请输入管理员手机号" value="<?php echo $output['cert']['cmobile'];?>">
                 </div>
             </div>
         </div>
@@ -85,7 +89,7 @@
         <div class="weui-cells">
             <div class="weui-cell">
                 <div class="weui-cell__bd">
-                    <input class="weui-input" name="cmail" data-label="邮箱" type="email" placeholder="请输入企业电子邮箱">
+                    <input class="weui-input" name="cmail" data-label="邮箱" type="email" placeholder="请输入企业电子邮箱" value="<?php echo $output['cert']['cmail'];?>">
                 </div>
             </div>
         </div>

mobile/templates/default/talk/school_certs.php

@@ -19,7 +19,7 @@
         <div class="weui-cells">
             <div class="weui-cell">
                 <div class="weui-cell__bd">
-                    <textarea class="weui-textarea" data-label="用户名称" name="short_name" placeholder="请使用体现学校官方、团委、院系、学生会等特性的用户名称申请认证" rows="3"></textarea>
+                    <textarea class="weui-textarea" data-label="用户名称" name="short_name" placeholder="请使用体现学校官方、团委、院系、学生会等特性的用户名称申请认证" rows="3"><?php echo $output['cert']['short_name'];?></textarea>
                 </div>
             </div>
         </div>
@@ -27,7 +27,7 @@
         <div class="weui-cells">
             <div class="weui-cell">
                 <div class="weui-cell__bd">
-                    <input class="weui-input" data-label="机构全称" name="full_name" type="text" placeholder="学校全称+机构全称，如：上海交通大学经管系学生会">
+                    <input class="weui-input" data-label="机构全称" name="full_name" type="text" placeholder="学校全称+机构全称，如：上海交通大学经管系学生会" value="<?php echo $output['cert']['full_name'];?>">
                 </div>
             </div>
         </div>
@@ -35,7 +35,7 @@
         <div class="weui-cells">
             <div class="weui-cell">
                 <div class="weui-cell__bd">
-                    <input class="weui-input" data-label="认证说明" name="cinfo" type="text" placeholder="一句话说明认证情况，限30字">
+                    <input class="weui-input" data-label="认证说明" name="cinfo" type="text" placeholder="一句话说明认证情况，限30字" value="<?php echo $output['cert']['cinfo'];?>">
                 </div>
             </div>
         </div>
@@ -48,7 +48,11 @@
                         <span class="line2"></span>
                     </div>
                     <input type='file' data-label="管理员身份证明" name='file' enctype='multipart/form-data' id='uploader' style="display: none;">
-                    <p class="uploader_tip">推荐尺寸800*800，支持jpg/png/jpeg/bmp格式，大小不超过1M</p>
+                    <?php if(!empty($output['cert']['cimage'])){
+                        echo '<p class="uploader_tip">请重新上传</p>';
+                    }else{
+                        echo '<p class="uploader_tip">推荐尺寸800*800，支持jpg/png/jpeg/bmp格式，大小不超过1M</p>';
+                    }?>
                 </div>
                 <input type="hidden" data-label="管理员身份证明" name="file_path" value="">
             </div>
@@ -61,7 +65,7 @@
         <div class="weui-cells">
             <div class="weui-cell">
                 <div class="weui-cell__bd">
-                    <input class="weui-input" data-label="管理员真实姓名" type="text" name="cname" placeholder="请输入管理员真实姓名">
+                    <input class="weui-input" data-label="管理员真实姓名" type="text" name="cname" placeholder="请输入管理员真实姓名" value="<?php echo $output['cert']['cname'];?>">
                 </div>
             </div>
         </div>
@@ -69,7 +73,7 @@
         <div class="weui-cells">
             <div class="weui-cell">
                 <div class="weui-cell__bd">
-                    <input class="weui-input" data-label="管理员手机号" name="cmobile" type="text" placeholder="请输入管理员手机号">
+                    <input class="weui-input" data-label="管理员手机号" name="cmobile" type="text" placeholder="请输入管理员手机号" value="<?php echo $output['cert']['cmobile'];?>">
                 </div>
             </div>
         </div>
@@ -85,7 +89,7 @@
         <div class="weui-cells">
             <div class="weui-cell">
                 <div class="weui-cell__bd">
-                    <input class="weui-input" name="cmail" data-label="邮箱" type="email" placeholder="请输入真实有效的邮箱账号">
+                    <input class="weui-input" name="cmail" data-label="邮箱" type="email" placeholder="请输入真实有效的邮箱账号" value="<?php echo $output['cert']['cmail'];?>">
                 </div>
             </div>
         </div>