派对，重建

application/admin/controller/party/Party.php

@@ -25,28 +25,15 @@ class Party extends Backend
     {
         parent::_initialize();
         $this->model = new \app\admin\model\party\Party;
-        $this->view->assign("isCoolList", $this->model->getIsCoolList());
         $this->view->assign("roomTypeList", $this->model->getRoomTypeList());
+        $this->view->assign("isCoolList", $this->model->getIsCoolList());
         $this->view->assign("isOnlineList", $this->model->getIsOnlineList());
         $this->view->assign("statusList", $this->model->getStatusList());
         $this->view->assign("isRecommendList", $this->model->getIsRecommendList());
         $this->view->assign("isCloseList", $this->model->getIsCloseList());
         $this->view->assign("isScreenList", $this->model->getIsScreenList());
         $this->view->assign("onModelList", $this->model->getOnModelList());
-        $partyTypeModel = new \app\admin\model\party\Type();
-        $partyTypeData = $partyTypeModel->select();
-        $partyTypeList = [];
-        if (!empty($partyTypeData)) {
-            foreach ($partyTypeData as $key => $value) {
-                $partyTypeList[$key] = [
-                    'id' => $value['name'],
-                    'name' => $value['name'],
-                ];
-            }
-        }
-        $this->assignconfig([
-            'partyTypeList' => $partyTypeList,
-        ]);
+        $this->view->assign("isPublicList", $this->model->getIsPublicList());
     }
 
     public function import()
@@ -76,24 +63,17 @@ class Party extends Backend
                 return $this->selectpage();
             }
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
-            $party = 'party';
-            $user = 'user';
-            $partyType = 'party_type';
-            $field = $party.'.id,'.$party.'.room_type,party_id,party_hot,party_name,party_logo,party_notice,party_notice_detail,naming,
-            '.$party.'.is_online,'.$party.'.status,'. $party .'.is_cool,is_close,is_recommend,party_type,platRate,guilderRate,party_pass,is_screen,on_model,
-            background,'.$party.'.updatetime,'.$party.'.createtime,'.$user.'.u_id as `'.$user.'.u_id`,'.
-            $user.'.nickname as `'.$user.'.nickname`,'.$partyType.'.name as `'.$partyType.'.name`';
-            $list = $this->model->alias($party)->field($field)
-                    ->join($user, $user.'.id = '.$party.'.user_id', 'LEFT')
-                    ->join($partyType, $partyType.'.id = '.$party.'.party_type', 'LEFT')
+
+            $list = $this->model
+                    ->with(['user'])
                     ->where($where)
                     ->order($sort, $order)
                     ->paginate($limit);
 
-            /*foreach ($list as $row) {
-
-                $row->getRelation('user')->visible(['u_id', 'nickname']);
-            }*/
+            foreach ($list as $row) {
+                
+                $row->getRelation('user')->visible(['username']);
+            }
 
             $result = array("total" => $list->total(), "rows" => $list->items());
 

application/admin/lang/zh-cn/party/background.php

@@ -3,6 +3,6 @@
 return [
     'Image'       => '房间背景图',
     'Room_type'   => '房间类型',
-    'Room_type 1' => '派对',
-    'Room_type 2' => '直播间'
+    'Room_type 1' => '公会房',
+    'Room_type 2' => 'K歌房'
 ];

application/admin/lang/zh-cn/party/party.php

@@ -4,25 +4,25 @@ return [
     'Id'                  => '主键ID',
     'User_id'             => '用户ID',
     'Room_type'           => '房间类型',
-    'Room_type 1'         => '派对',
-    'Room_type 2'         => '直播',
-    'Party_id'            => '派对ID',
+    'Room_type 1'         => '工会房',
+    'Room_type 2'         => 'K歌厅',
     'Is_cool'             => '靓号',
-    'Is_cool 0'           => '否',
     'Is_cool 1'           => '是',
-    'Party_type'          => '派对分类',
-    'Party_hot'           => '派对热度',
-    'Party_name'          => '派对名称',
-    'Party_logo'          => '派对logo',
-    'Party_notice'        => '派对公告标题',
-    'Party_notice_detail' => '派对公告描述',
+    'Is_cool 0'           => '否',
+    'Party_id'            => '房间ID',
+    'Party_hot'           => '房间热度',
+    'Party_name'          => '房间名称',
+    'Party_logo'          => '房间logo',
+    'Party_notice'        => '房间公告标题',
+    'Party_notice_detail' => '房间公告描述',
+    'Platrate'            => '平台抽成(%)',
+    'Guilderrate'         => '工会长抽成(%)',
     'Naming'              => '派对冠名',
     'Is_online'           => '在线状态',
     'Is_online 1'         => '在线',
     'Is_online 0'         => '离线',
     'Status'              => '派对状态',
     'Status -1'           => '封禁',
-    'Status 0'            => '预创建',
     'Status 1'            => '正常',
     'Is_recommend'        => '是否推荐',
     'Is_recommend 1'      => '是',
@@ -41,6 +41,12 @@ return [
     'Background'          => '派对背景',
     'Updatetime'          => '更新时间',
     'Createtime'          => '创建时间',
-    'User.u_id'           => '前端用户ID',
-    'User.nickname'       => '房主昵称'
+    'Type'                => 'type',
+    'Sign_time'           => 'sign_time',
+    'Easemob_room_id'     => '环信聊天室id',
+    'Is_public'           => '是否公开',
+    'Is_public 1'         => '是',
+    'Is_public 0'         => '否',
+    'Seatnum'             => '麦位数量',
+    'User.username'       => '用户名'
 ];

application/admin/model/party/Party.php

@@ -25,25 +25,30 @@ class Party extends Model
 
     // 追加属性
     protected $append = [
-        'is_cool_text',
         'room_type_text',
+        'is_cool_text',
         'is_online_text',
         'status_text',
         'is_recommend_text',
+        'is_close_text',
         'is_screen_text',
-        'on_model_text'
+        'on_model_text',
+        'sign_time_text',
+        'is_public_text'
     ];
+    
 
-
-    public function getIsCoolList()
-    {
-        return ['0' => __('Is_cool 0'), '1' => __('Is_cool 1')];
-    }
+    
     public function getRoomTypeList()
     {
         return ['1' => __('Room_type 1'), '2' => __('Room_type 2')];
     }
 
+    public function getIsCoolList()
+    {
+        return ['1' => __('Is_cool 1'), '0' => __('Is_cool 0')];
+    }
+
     public function getIsOnlineList()
     {
         return ['1' => __('Is_online 1'), '0' => __('Is_online 0')];
@@ -74,13 +79,12 @@ class Party extends Model
         return ['1' => __('On_model 1'), '2' => __('On_model 2')];
     }
 
-    public function getIsCoolTextAttr($value, $data)
+    public function getIsPublicList()
     {
-        $value = $value ? $value : (isset($data['is_cool']) ? $data['is_cool'] : '');
-        $list = $this->getIsCoolList();
-        return isset($list[$value]) ? $list[$value] : '';
+        return ['1' => __('Is_public 1'), '0' => __('Is_public 0')];
     }
 
+
     public function getRoomTypeTextAttr($value, $data)
     {
         $value = $value ? $value : (isset($data['room_type']) ? $data['room_type'] : '');
@@ -89,6 +93,14 @@ class Party extends Model
     }
 
 
+    public function getIsCoolTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['is_cool']) ? $data['is_cool'] : '');
+        $list = $this->getIsCoolList();
+        return isset($list[$value]) ? $list[$value] : '';
+    }
+
+
     public function getIsOnlineTextAttr($value, $data)
     {
         $value = $value ? $value : (isset($data['is_online']) ? $data['is_online'] : '');
@@ -113,6 +125,14 @@ class Party extends Model
     }
 
 
+    public function getIsCloseTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['is_close']) ? $data['is_close'] : '');
+        $list = $this->getIsCloseList();
+        return isset($list[$value]) ? $list[$value] : '';
+    }
+
+
     public function getIsScreenTextAttr($value, $data)
     {
         $value = $value ? $value : (isset($data['is_screen']) ? $data['is_screen'] : '');
@@ -129,15 +149,28 @@ class Party extends Model
     }
 
 
+    public function getSignTimeTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['sign_time']) ? $data['sign_time'] : '');
+        return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value;
+    }
 
 
-    public function user()
+    public function getIsPublicTextAttr($value, $data)
     {
-        return $this->belongsTo('app\admin\model\User', 'user_id', 'id', [], 'LEFT')->setEagerlyType(0);
+        $value = $value ? $value : (isset($data['is_public']) ? $data['is_public'] : '');
+        $list = $this->getIsPublicList();
+        return isset($list[$value]) ? $list[$value] : '';
+    }
+
+    protected function setSignTimeAttr($value)
+    {
+        return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value);
     }
-    //关联派对类型表
-    public function partyType()
+
+
+    public function user()
     {
-        return $this->hasOne(Type::class, 'id', 'party_type',[],'LEFT');
+        return $this->belongsTo('app\admin\model\User', 'user_id', 'id', [], 'LEFT')->setEagerlyType(0);
     }
 }

application/admin/view/party/party/add.html

@@ -19,24 +19,24 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Party_id')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-party_id" data-rule="required" data-source="party/index" class="form-control selectpage" name="row[party_id]" type="text" value="">
-        </div>
-    </div>
-    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Is_cool')}:</label>
         <div class="col-xs-12 col-sm-8">
-
+                        
             <select  id="c-is_cool" data-rule="required" class="form-control selectpicker" name="row[is_cool]">
                 {foreach name="isCoolList" item="vo"}
-                <option value="{$key}" {in name="key" value="0"}selected{/in}>{$vo}</option>
+                    <option value="{$key}" {in name="key" value="0"}selected{/in}>{$vo}</option>
                 {/foreach}
             </select>
 
         </div>
     </div>
     <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Party_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-party_id" data-rule="required" data-source="party/index" class="form-control selectpage" name="row[party_id]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Party_hot')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-party_hot" data-rule="required" class="form-control" name="row[party_hot]" type="number" value="0">
@@ -45,25 +45,37 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Party_name')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-party_name" data-rule="required" class="form-control" name="row[party_name]" type="text">
+            <input id="c-party_name" data-rule="required" class="form-control" name="row[party_name]" type="text" value="">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Party_logo')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-party_logo" data-rule="required" class="form-control" name="row[party_logo]" type="text">
+            <input id="c-party_logo" data-rule="required" class="form-control" name="row[party_logo]" type="text" value="">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Party_notice')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-party_notice" class="form-control" name="row[party_notice]" type="text">
+            <input id="c-party_notice" class="form-control" name="row[party_notice]" type="text" value="">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Party_notice_detail')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-party_notice_detail" class="form-control" name="row[party_notice_detail]" type="text">
+            <input id="c-party_notice_detail" class="form-control" name="row[party_notice_detail]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Platrate')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-platRate" class="form-control" name="row[platRate]" type="number" value="10">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Guilderrate')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-guilderRate" class="form-control" name="row[guilderRate]" type="number" value="30">
         </div>
     </div>
     <div class="form-group">
@@ -109,6 +121,18 @@
         </div>
     </div>
     <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Is_close')}:</label>
+        <div class="col-xs-12 col-sm-8">
+                        
+            <select  id="c-is_close" class="form-control selectpicker" name="row[is_close]">
+                {foreach name="isCloseList" item="vo"}
+                    <option value="{$key}" {in name="key" value="0"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
+        </div>
+    </div>
+    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Party_type')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-party_type" data-rule="required" class="form-control" name="row[party_type]" type="number" value="-1">
@@ -150,6 +174,42 @@
             <input id="c-background" class="form-control" name="row[background]" type="text">
         </div>
     </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Type')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-type" class="form-control" name="row[type]" type="number" value="0">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Sign_time')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-sign_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[sign_time]" type="text" value="{:date('Y-m-d H:i:s')}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Easemob_room_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-easemob_room_id" data-rule="required" data-source="easemob/room/index" class="form-control selectpage" name="row[easemob_room_id]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Is_public')}:</label>
+        <div class="col-xs-12 col-sm-8">
+                        
+            <select  id="c-is_public" data-rule="required" class="form-control selectpicker" name="row[is_public]">
+                {foreach name="isPublicList" item="vo"}
+                    <option value="{$key}" {in name="key" value="1"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Seatnum')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-seatnum" class="form-control" name="row[seatnum]" type="number" value="8">
+        </div>
+    </div>
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">

application/admin/view/party/party/edit.html

@@ -3,14 +3,14 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('User_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input disabled id="c-user_id" data-rule="required" data-source="user/user/index" data-field="nickname" class="form-control selectpage" name="row[user_id]" type="text" value="{$row.user_id|htmlentities}">
+            <input id="c-user_id" data-rule="required" data-source="user/user/index" data-field="nickname" class="form-control selectpage" name="row[user_id]" type="text" value="{$row.user_id|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Room_type')}:</label>
         <div class="col-xs-12 col-sm-8">
                         
-            <select disabled  id="c-room_type" data-rule="required" class="form-control selectpicker" name="row[room_type]">
+            <select  id="c-room_type" data-rule="required" class="form-control selectpicker" name="row[room_type]">
                 {foreach name="roomTypeList" item="vo"}
                     <option value="{$key}" {in name="key" value="$row.room_type"}selected{/in}>{$vo}</option>
                 {/foreach}
@@ -19,27 +19,21 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Party_id')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-party_id" data-rule="required" class="form-control" name="row[party_id]" type="text" value="{$row.party_id|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Is_cool')}:</label>
         <div class="col-xs-12 col-sm-8">
-
+                        
             <select  id="c-is_cool" data-rule="required" class="form-control selectpicker" name="row[is_cool]">
                 {foreach name="isCoolList" item="vo"}
-                <option value="{$key}" {in name="key" value="$row.is_cool"}selected{/in}>{$vo}</option>
+                    <option value="{$key}" {in name="key" value="$row.is_cool"}selected{/in}>{$vo}</option>
                 {/foreach}
             </select>
 
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Party_type')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Party_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-party_type" data-rule="required" min="0" data-source="party/type/index" class="form-control selectpage" name="row[party_type]" type="text" value="{$row.party_type|htmlentities}">
+            <input id="c-party_id" data-rule="required" data-source="party/index" class="form-control selectpage" name="row[party_id]" type="text" value="{$row.party_id|htmlentities}">
         </div>
     </div>
     <div class="form-group">
@@ -57,15 +51,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Party_logo')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <div class="input-group">
-                <input id="c-party_logo" data-rule="required" class="form-control" size="50" name="row[party_logo]" type="text" value="{$row.party_logo|htmlentities}">
-                <div class="input-group-addon no-border no-padding">
-                    <span><button type="button" id="faupload-party_logo" class="btn btn-danger faupload" data-input-id="c-party_logo" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-party_logo"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
-                    <span><button type="button" id="fachoose-party_logo" class="btn btn-primary fachoose" data-input-id="c-party_logo" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
-                </div>
-                <span class="msg-box n-right" for="c-party_logo"></span>
-            </div>
-            <ul class="row list-inline faupload-preview" id="p-party_logo"></ul>
+            <input id="c-party_logo" data-rule="required" class="form-control" name="row[party_logo]" type="text" value="{$row.party_logo|htmlentities}">
         </div>
     </div>
     <div class="form-group">
@@ -81,29 +67,59 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('平台抽成(%)')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Platrate')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-platRate" data-rule="required" class="form-control" name="row[platRate]" type="number" value="{$row.platRate|htmlentities}">
+            <input id="c-platRate" class="form-control" name="row[platRate]" type="number" value="{$row.platRate|htmlentities}">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('族长抽成(%)')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Guilderrate')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-guilderRate" data-rule="required" class="form-control" name="row[guilderRate]" type="number" value="{$row.guilderRate|htmlentities}">
+            <input id="c-guilderRate" class="form-control" name="row[guilderRate]" type="number" value="{$row.guilderRate|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Naming')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-naming" class="form-control" name="row[naming]" type="number" value="{$row.naming|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Is_online')}:</label>
+        <div class="col-xs-12 col-sm-8">
+                        
+            <select  id="c-is_online" class="form-control selectpicker" name="row[is_online]">
+                {foreach name="isOnlineList" item="vo"}
+                    <option value="{$key}" {in name="key" value="$row.is_online"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
         </div>
     </div>
-<!--    <div class="form-group">-->
-<!--        <label class="control-label col-xs-12 col-sm-2">{:__('关闭状态')}:</label>-->
-<!--        <div class="col-xs-12 col-sm-8">-->
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            
+            <div class="radio">
+            {foreach name="statusList" item="vo"}
+            <label for="row[status]-{$key}"><input id="row[status]-{$key}" name="row[status]" type="radio" value="{$key}" {in name="key" value="$row.status"}checked{/in} /> {$vo}</label> 
+            {/foreach}
+            </div>
 
-<!--            <div class="radio">-->
-<!--            {foreach name="statusList" item="vo"}-->
-<!--            <label for="row[status]-{$key}"><input id="row[status]-{$key}" name="row[status]" type="radio" value="{$key}" {in name="key" value="$row.status"}checked{/in} /> {$vo}</label>-->
-<!--            {/foreach}-->
-<!--            </div>-->
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Is_recommend')}:</label>
+        <div class="col-xs-12 col-sm-8">
+                        
+            <select  id="c-is_recommend" class="form-control selectpicker" name="row[is_recommend]">
+                {foreach name="isRecommendList" item="vo"}
+                    <option value="{$key}" {in name="key" value="$row.is_recommend"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
 
-<!--        </div>-->
-<!--    </div>-->
+        </div>
+    </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Is_close')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -117,18 +133,83 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Is_recommend')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Party_type')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-party_type" data-rule="required" class="form-control" name="row[party_type]" type="number" value="{$row.party_type|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Party_pass')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-party_pass" class="form-control" name="row[party_pass]" type="text" value="{$row.party_pass|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Is_screen')}:</label>
         <div class="col-xs-12 col-sm-8">
+                        
+            <select  id="c-is_screen" class="form-control selectpicker" name="row[is_screen]">
+                {foreach name="isScreenList" item="vo"}
+                    <option value="{$key}" {in name="key" value="$row.is_screen"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
 
-            <select  id="c-is_recommend" class="form-control selectpicker" name="row[is_recommend]">
-                {foreach name="isRecommendList" item="vo"}
-                <option value="{$key}" {in name="key" value="$row.is_recommend"}selected{/in}>{$vo}</option>
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('On_model')}:</label>
+        <div class="col-xs-12 col-sm-8">
+                        
+            <select  id="c-on_model" class="form-control selectpicker" name="row[on_model]">
+                {foreach name="onModelList" item="vo"}
+                    <option value="{$key}" {in name="key" value="$row.on_model"}selected{/in}>{$vo}</option>
                 {/foreach}
             </select>
 
         </div>
     </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Background')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-background" class="form-control" name="row[background]" type="text" value="{$row.background|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Type')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-type" class="form-control" name="row[type]" type="number" value="{$row.type|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Sign_time')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-sign_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[sign_time]" type="text" value="{:$row.sign_time?datetime($row.sign_time):''}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Easemob_room_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-easemob_room_id" data-rule="required" data-source="easemob/room/index" class="form-control selectpage" name="row[easemob_room_id]" type="text" value="{$row.easemob_room_id|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Is_public')}:</label>
+        <div class="col-xs-12 col-sm-8">
+                        
+            <select  id="c-is_public" data-rule="required" class="form-control selectpicker" name="row[is_public]">
+                {foreach name="isPublicList" item="vo"}
+                    <option value="{$key}" {in name="key" value="$row.is_public"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
 
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Seatnum')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-seatnum" class="form-control" name="row[seatnum]" type="number" value="{$row.seatnum|htmlentities}">
+        </div>
+    </div>
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">

application/admin/view/party/party/index.html

@@ -17,13 +17,24 @@
                 <div class="widget-body no-padding">
                     <div id="toolbar" class="toolbar">
                         <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
+                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('party/party/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
                         <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('party/party/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
+                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('party/party/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
+                        <a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('party/party/import')?'':'hide'}" title="{:__('Import')}" id="btn-import-file" data-url="ajax/upload" data-mimetype="csv,xls,xlsx" data-multiple="false"><i class="fa fa-upload"></i> {:__('Import')}</a>
 
+                        <div class="dropdown btn-group {:$auth->check('party/party/multi')?'':'hide'}">
+                            <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
+                            <ul class="dropdown-menu text-left" role="menu">
+                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>
+                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>
+                            </ul>
+                        </div>
 
                         
                     </div>
                     <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
-                           data-operate-edit="{:$auth->check('party/party/edit')}"
+                           data-operate-edit="{:$auth->check('party/party/edit')}" 
+                           data-operate-del="{:$auth->check('party/party/del')}" 
                            width="100%">
                     </table>
                 </div>

public/assets/js/backend/party/party.js

@@ -8,7 +8,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     index_url: 'party/party/index' + location.search,
                     add_url: 'party/party/add',
                     edit_url: 'party/party/edit',
-                    // del_url: 'party/party/del',
+                    del_url: 'party/party/del',
                     multi_url: 'party/party/multi',
                     import_url: 'party/party/import',
                     table: 'party',
@@ -26,31 +26,35 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     [
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
-                        {field: 'user.u_id', title: __('User_id')},
-                        {field: 'user.nickname', title: __('User.nickname'), operate: 'LIKE'},
+                        {field: 'user_id', title: __('User_id')},
                         {field: 'room_type', title: __('Room_type'), searchList: {"1":__('Room_type 1'),"2":__('Room_type 2')}, formatter: Table.api.formatter.normal},
+                        {field: 'is_cool', title: __('Is_cool'), searchList: {"1":__('Is_cool 1'),"0":__('Is_cool 0')}, formatter: Table.api.formatter.normal},
                         {field: 'party_id', title: __('Party_id')},
-                        {field: 'is_cool', title: __('Is_cool'), searchList: {"0":__('Is_cool 0'),"1":__('Is_cool 1')}, formatter: Table.api.formatter.normal},
-                        {field: 'party_type.name', title: __('Party_type'), searchList: Config.partyTypeList},
                         {field: 'party_hot', title: __('Party_hot')},
                         {field: 'party_name', title: __('Party_name'), operate: 'LIKE'},
-                        {field: 'party_logo', title: __('Party_logo'), events: Table.api.events.image, formatter: Table.api.formatter.image, operate: false},
-                        // {field: 'party_notice', title: __('Party_notice'), operate: 'LIKE'},
-                        // {field: 'party_notice_detail', title: __('Party_notice_detail'), operate: 'LIKE'},
-                        //{field: 'naming', title: __('Naming')},
-                        // {field: 'is_online', title: __('Is_online'), searchList: {"1":__('Is_online 1'),"0":__('Is_online 0')}, formatter: Table.api.formatter.normal},
+                        {field: 'party_logo', title: __('Party_logo'), operate: 'LIKE'},
+                        {field: 'party_notice', title: __('Party_notice'), operate: 'LIKE'},
+                        {field: 'party_notice_detail', title: __('Party_notice_detail'), operate: 'LIKE'},
+                        {field: 'platRate', title: __('Platrate')},
+                        {field: 'guilderRate', title: __('Guilderrate')},
+                        {field: 'naming', title: __('Naming')},
+                        {field: 'is_online', title: __('Is_online'), searchList: {"1":__('Is_online 1'),"0":__('Is_online 0')}, formatter: Table.api.formatter.normal},
                         {field: 'status', title: __('Status'), searchList: {"-1":__('Status -1'),"1":__('Status 1')}, formatter: Table.api.formatter.status},
-                        {field: 'is_close', title: __('Is_close'), searchList: {"1":__('Is_close 1'),"0":__('Is_close 0')}, formatter: Table.api.formatter.normal},
                         {field: 'is_recommend', title: __('Is_recommend'), searchList: {"1":__('Is_recommend 1'),"0":__('Is_recommend 0')}, formatter: Table.api.formatter.normal},
-                        //{field: 'party_type', title: __('Party_type')},
-                        {field: 'platRate', title: __('平台抽成(%)')},
-                        {field: 'guilderRate', title: __('族长抽成(%)')},
-                        // {field: 'party_pass', title: __('Party_pass'), operate: 'LIKE'},
-                        // {field: 'is_screen', title: __('Is_screen'), searchList: {"1":__('Is_screen 1'),"0":__('Is_screen 0')}, formatter: Table.api.formatter.normal},
+                        {field: 'is_close', title: __('Is_close'), searchList: {"1":__('Is_close 1'),"0":__('Is_close 0')}, formatter: Table.api.formatter.normal},
+                        {field: 'party_type', title: __('Party_type')},
+                        {field: 'party_pass', title: __('Party_pass'), operate: 'LIKE'},
+                        {field: 'is_screen', title: __('Is_screen'), searchList: {"1":__('Is_screen 1'),"0":__('Is_screen 0')}, formatter: Table.api.formatter.normal},
                         {field: 'on_model', title: __('On_model'), searchList: {"1":__('On_model 1'),"2":__('On_model 2')}, formatter: Table.api.formatter.normal},
-                        // {field: 'background', title: __('Background'), events: Table.api.events.image, formatter: Table.api.formatter.image, operate: false},
-                        // {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {field: 'background', title: __('Background'), operate: 'LIKE'},
+                        {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {field: 'type', title: __('Type')},
+                        {field: 'sign_time', title: __('Sign_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {field: 'easemob_room_id', title: __('Easemob_room_id'), operate: 'LIKE'},
+                        {field: 'is_public', title: __('Is_public'), searchList: {"1":__('Is_public 1'),"0":__('Is_public 0')}, formatter: Table.api.formatter.normal},
+                        {field: 'seatnum', title: __('Seatnum')},
+                        {field: 'user.username', title: __('User.username'), operate: 'LIKE'},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]
@@ -67,9 +71,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
         },
         api: {
             bindevent: function () {
-                /*$("#c-party_type").data("params",function(){
-                    return {custom:{room_type:$("#c-room_type").val()}};
-                });*/
                 Form.api.bindevent($("form[role=form]"));
             }
         }