stanley-king 6 роки тому
батько
коміт
65a5b36103

+ 1 - 18
data/model/room.model.php

@@ -168,24 +168,7 @@ class roomModel extends Model
         return $this->table('room_face')->where($cond)->update($data);
     }
 
-    /////////////////////////////////////////////
-    public function applyCnts($cond){
-        return $this->table('room_apply')->where($cond)->count();
-    }
-    public function roomApplys($cond,$field="*",$page=20,$order='apply_id desc')
-    {
-        return $this->table('room_apply')->field($field)->where($cond)->page($page)->order($order)->select();
-    }
-    public function findApply($apply_id){
-        return $this->table('room_apply')->field('*')->where(['apply_id' => $apply_id])->find();
-    }
-    public function addApply($room,$member,$msg,$viewer=0){
-        return $this->table('room_apply')->insert(['room_id' => $room,'member_id' => $member,'msg' => $msg,'viewer'=>$viewer,'add_time'=>time()]);
-    }
-    public function editApply($apply,$viewer,$step){
-        return $this->table('room_apply')->where(['apply_id' => $apply])->update(["viewer"=> $viewer,"step" => $step]);
-    }
-    ////////////////////////////////////////////
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     public function roomSteps($cond,$field="*",$page=20,$order='steps_id desc') {
         return $this->table('room_steps')->field($field)->where($cond)->page($page)->order($order)->limit($page)->select();
     }

+ 0 - 8
helper/room/tpl_group_home.php

@@ -343,10 +343,6 @@ class tpl_group_home
         if (!empty($this->room_info) && isset($this->participants[$this->cur_user])) {
             $avartar = $this->room_info->avatar();
             $name = $this->room_info->has_name() ? $this->room_info->name() : "未命名";
-            $notice = empty($this->room_info->notice()) ? "未设置" : "已设置";
-            $desc = empty($this->room_info->room_desc()) ? "未设置" : "已设置";
-            $cnt = $this->mod_room->applyCnts(['room_id'=>$this->room_id,"step"=>0]);
-            $apply = $cnt > 0 ? "待处理" . $cnt : "暂无申请";
 
             $click = false;
             $level = "已认证";
@@ -365,7 +361,6 @@ class tpl_group_home
                 }
             }
 
-
             $html.= "<div class=\"weui-cells\">";
             $html.= $this->room_name_btn($click,$name);
             $html.= $this->room_avatar_btn($avartar);
@@ -375,10 +370,7 @@ class tpl_group_home
 
             if ($this->isManager($this->cur_user)) {
                 $html .= "<div class=\"weui-cells\">";
-//                $html.= $this->room_desc_btn($desc);
-//                $html.= $this->room_notice_btn($notice);
                 $html.= $this->room_cert_btn($click,$level);
-//                $html.= $this->room_apply_btn($apply,$cnt);
                 $html.="</div>";
             }
         }

+ 2 - 2
mobile/control/control.php

@@ -331,9 +331,9 @@ class mbMemberControl extends mobileControl
 
 function bonus_version()
 {
-    return "v=2018100905";
+    return "v=20181016";
 }
 function shop_version()
 {
-    return "v=2018100905";
+    return "v=20181016";
 }