申请主播/贵族特权调整

application/admin/controller/user/Anchor.php

@@ -58,7 +58,7 @@ class Anchor extends Backend
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
 
             $list = $this->model
-                ->with(['user', 'useranchortype'])
+                ->with(['user', 'useranchortype','partytype'])
                 ->where($where)
                 ->order($sort, $order)
                 ->paginate($limit);
@@ -66,6 +66,7 @@ class Anchor extends Backend
             foreach ($list as $row) {
                 $row->getRelation('user')->visible(['u_id', 'nickname']);
                 $row->getRelation('useranchortype')->visible(['name']);
+                $row->getRelation('partytype')->visible(['name']);
             }
 
             $result = array("total" => $list->total(), "rows" => $list->items());

application/admin/lang/zh-cn/user/anchor.php

@@ -13,5 +13,6 @@ return [
     'Createtime'          => '创建时间',
     'User.u_id'           => '前端用户ID',
     'User.nickname'       => '用户昵称',
-    'Useranchortype.name' => '名称'
+    'Useranchortype.name' => '名称',
+    'Partytype.name'      => '房间类型',
 ];

application/admin/model/user/Anchor.php

@@ -56,4 +56,9 @@ class Anchor extends Model
     {
         return $this->belongsTo('app\admin\model\user\AnchorType', 'type_id', 'id', [], 'LEFT')->setEagerlyType(0);
     }
+
+    public function partyType()
+    {
+        return $this->belongsTo('app\admin\model\party\Type', 'party_type_id', 'id', [], 'LEFT')->setEagerlyType(0);
+    }
 }

application/admin/view/attire/attire/add.html

@@ -32,9 +32,9 @@
         </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">{:__('贵族等级赠送特权')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-use_id" data-rule="required" class="form-control" name="row[use_id]" type="number" value="0">
+            <input id="c-use_id" data-source="noble/level/index" class="form-control selectpage" name="row[use_id]" type="text" value="0">
         </div>
     </div>
 

application/admin/view/attire/attire/edit.html

@@ -32,9 +32,9 @@
         </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">{:__('贵族等级赠送特权')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-use_id" data-rule="required" class="form-control" name="row[use_id]" type="number" value="{$row.use_id|htmlentities}">
+            <input id="c-use_id" data-source="noble/level/index" class="form-control selectpage" name="row[use_id]" type="text" value="{$row.use_id|htmlentities}">
         </div>
     </div>
 

application/admin/view/user/anchor/add.html

@@ -6,11 +6,17 @@
             <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="">
         </div>
     </div>
-    <div class="form-group">
+    <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Type_id')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-type_id" data-rule="required" data-source="type/index" class="form-control selectpage" name="row[type_id]" type="text" value="">
         </div>
+    </div>-->
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Partytype.name')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-party_type_id" disabled data-rule="required" data-source="party/type/index" class="form-control selectpage" name="row[party_type_id]" type="text" value="0">
+        </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Desc')}:</label>

application/admin/view/user/anchor/edit.html

@@ -6,11 +6,17 @@
             <input id="c-user_id" disabled 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">
+    <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Type_id')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-type_id" disabled data-rule="required" data-source="user/Anchor_type/index" class="form-control selectpage" name="row[type_id]" type="text" value="{$row.type_id|htmlentities}">
         </div>
+    </div>-->
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Partytype.name')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-party_type_id" disabled data-rule="required" data-source="party/type/index" class="form-control selectpage" name="row[party_type_id]" type="text" value="{$row.party_type_id|htmlentities}">
+        </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Desc')}:</label>

application/api/controller/Noble.php

@@ -191,8 +191,12 @@ class Noble extends Api
                 // 赠送聊天气泡
                 if($noblelevelInfo->tqgq) {
                     $params_from = $this->request->request("params_from"); // 贵族等级ID
-                    $attireInfo = \app\common\model\Attire::where(["use"=>1,"use_id"=>$level_id])->find();
-                    $attireInfo && \app\common\model\AttireBack::addToMyBack($attireInfo->id,$this->auth->id,$params_from);
+                    $attireInfo = \app\common\model\Attire::where(["use"=>1,"use_id"=>$level_id])->select();
+                    if (!empty($attireInfo)) {
+                        foreach ($attireInfo as $attireInfoKey => $attireInfoVal) {
+                            \app\common\model\AttireBack::addToMyBack($attireInfoVal->id,$this->auth->id,$params_from);
+                        }
+                    }
                 }
 
 

public/assets/js/backend/user/anchor.js

@@ -31,8 +31,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'user_id', title: __('User_id')},
                         {field: 'user.u_id', title: __('User.u_id')},
                         {field: 'user.nickname', title: __('User.nickname'), operate: 'LIKE'},
+                        {field: 'partytype.name', title: __('Partytype.name'), operate: 'LIKE'},
                         // {field: 'type_id', title: __('Type_id')},
-                        {field: 'useranchortype.name', title: __('Type_id'), operate: 'LIKE'},
+                        /*{field: 'useranchortype.name', title: __('Type_id'), operate: 'LIKE'},
                         {
                             field: 'desc', title: __('Desc'), operate: 'LIKE',
                             formatter: function (value, row, index, field) {
@@ -48,7 +49,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                     }
                                 };
                             }
-                        },
+                        },*/
                         {field: 'status', title: __('Status'), searchList: {"0":__('Status 0'),"1":__('Status 1'),"2":__('Status 2')}, formatter: Table.api.formatter.status},
                         {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},