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

admin/control/room_manage.php

@@ -58,20 +58,18 @@ class room_manageControl extends SystemControl
     public function certs_listOp()
     {
         $condition["cstatus"]  = intval($_GET['cstatus']);
-        if($_GET['room_id']) {
-            $condition['room_id'] = intval($_GET['room_id']);
-        }
-        if($_GET['room_name']) {
-            $condition['room_name'] = intval($_GET['room_name']);
-        }
-        if($_GET['from']) {
-            $condition['from'] = intval($_GET['from']);
-        }
-        if($_GET['to']) {
-            $condition['to'] = intval($_GET['to']);
+
+        if($_GET['searchid'])
+        {
+            $condition['room_id'] = intval($_GET['searchid']);
         }
-        if($_GET['users']) {
-            $condition['users'] = intval($_GET['users']);
+        elseif($_GET['searchname'])
+        {
+            $name = trim($_GET['searchname']);
+            $condition['short_name|full_name'] = ['like',"%{$name}%"];
+        }elseif($_GET['searchmobile'])
+        {
+            $condition['cmobile'] = trim($_GET['searchmobile']);
         }
 
         $certs_list = $this->mod_room->roomCerts($condition,$field='*');
@@ -80,8 +78,12 @@ class room_manageControl extends SystemControl
         Tpl::showpage('room_certs.list');
     }
 
-    public function show_certsOp(){
-
+    public function show_certsOp()
+    {
+        $cert_id = intval($_GET['cert_id']);
+        $info = $this->mod_room->findCert($cert_id);
+        Tpl::output('cert_info', $info);
+        Tpl::showpage('room_cert.view');
     }
 
     public function edit_certsOp()

admin/templates/default/room.list.php

@@ -6,7 +6,6 @@
             <h3><?php echo $lang['nc_room_manage'];?></h3>
             <ul class="tab-base">
                 <li><a href="JavaScript:void(0);" class="current"><span><?php echo $lang['nc_manage'];?></span></a></li>
-                <li><a href="" ><span><?php echo $lang['nc_new'];?></span></a></li>
                 <li><a href=""><span></span></a></li>
             </ul>
         </div>

admin/templates/default/room_cert.view.php

@@ -0,0 +1,91 @@
+<?php defined('InShopNC') or exit('Access Invalid!');?>
+
+<div class="page">
+  <table class="table tb-type2 order">
+    <tbody>
+      <tr class="space">
+        <th colspan="2"><?php echo $lang['nc_room_detail'];?></th>
+      </tr>
+      <tr>
+        <th>群基本信息</th>
+      </tr>
+      <tr>
+        <td colspan="2">
+            <ul>
+                <li style="width: 20%">
+                    <img style="width: 100px" src="<?php echo $output['cert_info']['avatar'];?>">
+                </li>
+                <li>
+                    <strong><?php echo $lang['nc_room_id'];?>:</strong><?php echo $output['cert_info']['room_id'];?>
+                </li>
+                <li>
+                    <strong><?php echo $lang['nc_room_name'];?>:</strong><?php echo $output['room_info']['room_name'];?>
+                </li>
+                <li>
+                    <strong><?php echo $lang['nc_room_users'];?>:</strong><?php echo $output['room_info']['users'];?>
+                </li>
+                <li>
+                    <strong><?php echo $lang['nc_room_addtime'];?>:</strong><?php echo date('Y-m-d H:i:s',$output['room_info']['add_time']);?>
+                </li>
+                <li>
+                    <strong><?php echo $lang['nc_room_level'];?>:</strong>
+                    <?php switch ($output['room_info']['room_level']){
+                        case 1:echo "校园认证";break;
+                        case 2:echo "企业认证";break;
+                        default:"未通过任何认证";
+                    }
+                    ?>
+                </li>
+            </ul>
+        </td>
+      </tr>
+      <tr>
+          <th>群描述信息</th>
+      </tr>
+      <tr>
+        <td colspan="2">
+            <ul>
+                <li style="width: 80%;">
+                    <strong><?php echo $lang['nc_room_desc'];?>:</strong><?php echo $output['room_info']['room_desc'];?>
+                </li>
+                <li style="width: 80%;"></li>
+                <li style="width: 80%;">
+                    <strong><?php echo $lang['nc_room_notice'];?>:</strong><?php echo $output['room_info']['notice'];?>
+                </li>
+          </ul>
+        </td>
+      </tr>
+      <tr>
+          <th>群运动</th>
+      </tr>
+      <tr>
+          <td colspan="2">
+              <ul>
+                  <li style="width: 80%;">
+                      <strong><?php echo $lang['nc_room_steps'];?>:</strong><?php echo $output['room_info']['steps'];?>
+                  </li>
+                  <li style="width: 80%;"></li>
+              </ul>
+          </td>
+      </tr>
+      <tr>
+          <th>共享基金</th>
+      </tr>
+      <tr>
+          <td colspan="2">
+              <ul>
+                  <li style="width: 80%;">
+                      <strong><?php echo $lang['nc_room_bonus'];?>:</strong><?php echo $output['room_info']['shared_bonus'];?>
+                  </li>
+                  <li style="width: 80%;"></li>
+              </ul>
+          </td>
+      </tr>
+    </tbody>
+    <tfoot>
+      <tr class="tfoot">
+        <td><a href="JavaScript:void(0);" class="btn" onclick="history.go(-1)"><span><?php echo $lang['nc_back'];?></span></a></td>
+      </tr>
+    </tfoot>
+  </table>
+</div>

admin/templates/default/room_certs.list.php

@@ -15,23 +15,17 @@
     <div class="fixed-empty"></div>
     <form method="get" name="formSearch">
         <input type="hidden" name="act" value="room_manage">
-        <input type="hidden" name="op" value="room_list">
+        <input type="hidden" name="op" value="certs_list">
         <table class="tb-type1 noborder search">
             <tbody>
             <tr>
-                <th><label for="searchtitle">群房间号</label></th>
+                <th><label for="searchtitle">群房间号(精确查找)</label></th>
+                <td><input type="text" name="searchid" id="searchid" class="txt" value='<?php echo $_GET['searchid'];?>'></td>
+                <th><label for="searchtitle">认证名称(模糊查找)</label></th>
                 <td><input type="text" name="searchname" id="searchname" class="txt" value='<?php echo $_GET['searchname'];?>'></td>
-                <th><label for="searchtitle">认证名称</label></th>
-                <td><input type="text" name="searchmaster" id="searchmaster" class="txt" value='<?php echo $_GET['searchmaster'];?>'></td>
+                <th><label for="searchtitle">申请人电话(精确查找)</label></th>
+                <td><input type="text" name="searchmobile" id="searchname" class="txt" value='<?php echo $_GET['searchmobile'];?>'></td>
                 <th><label><?php echo $lang['circle_status'];?></label></th>
-                <td><select name="searchstatus">
-                        <option value=""><?php echo $lang['nc_common_pselect'];?></option>
-                        <option value="1" <?php if ($_GET['searchstatus'] == '1'){echo 'selected=selected';}?>><?php echo $lang['nc_open'];?></option>
-                        <option value="0" <?php if ($_GET['searchstatus'] == '0'){echo 'selected=selected';}?>><?php echo $lang['nc_close'];?></option>
-                        <option value="2" <?php if ($_GET['searchstatus'] == '2'){echo 'selected=selected';}?>><?php echo $lang['circle_waiting_verify'];?></option>
-                        <option value="3" <?php if ($_GET['searchstatus'] == '3'){echo 'selected=selected';}?>><?php echo $lang['circle_verify_fail'];?></option>
-                    </select>
-                </td>
                 <td><a href="javascript:document.formSearch.submit();" class="btn-search " title="<?php echo $lang['nc_query']; ?>">&nbsp;</a></td>
             </tr>
             </tbody>
@@ -47,6 +41,7 @@
         <tr>
             <td>
                 <ul>
+                    <li>搜索功能三项内容均只能独立使用 不使用的请留空 优先级从左至右依次从高到低</li>
                     <li>点击 群房间号 前往查看群聊基本信息</li>
                     <li>点击 操作-查看 按钮进入查看认证信息</li>
                 </ul></td>

data/model/room.model.php

@@ -197,7 +197,7 @@ class roomModel extends Model
     }
 
     /////////////////
-    public function roomCerts($cond,$field='*',$page=20,$order='cert_id asc')
+    public function roomCerts($cond,$field='*',$page=20,$order='cert_id desc')
     {
         return $this->table('room_certs')->field($field)->where($cond)->page($page)->order($order)->limit($page)->select();
     }