Merge branch 'master' of http://git.huxiukeji.com/zhangxiaobin/ggyuyin

application/admin/controller/UserPower.php

@@ -0,0 +1,84 @@
+<?php
+
+namespace app\admin\controller;
+
+use app\common\controller\Backend;
+
+/**
+ * 会员权限管理
+ *
+ * @icon fa fa-circle-o
+ */
+class UserPower extends Backend
+{
+    
+    /**
+     * UserPower模型对象
+     * @var \app\admin\model\UserPower
+     */
+    protected $model = null;
+
+    public function _initialize()
+    {
+        parent::_initialize();
+        $this->model = new \app\admin\model\UserPower;
+        $this->view->assign("privateMessagesList", $this->model->getPrivateMessagesList());
+        $this->view->assign("barrageList", $this->model->getBarrageList());
+        $this->view->assign("speakList", $this->model->getSpeakList());
+        $this->view->assign("rechargeList", $this->model->getRechargeList());
+        $this->view->assign("raffleList", $this->model->getRaffleList());
+        $this->view->assign("giveGiftList", $this->model->getGiveGiftList());
+        $this->view->assign("transferList", $this->model->getTransferList());
+        $this->view->assign("payorderList", $this->model->getPayorderList());
+        $this->view->assign("attireList", $this->model->getAttireList());
+        $this->view->assign("nobleList", $this->model->getNobleList());
+        $this->view->assign("withdrawList", $this->model->getWithdrawList());
+    }
+
+    public function import()
+    {
+        parent::import();
+    }
+
+    /**
+     * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法
+     * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑
+     * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改
+     */
+    
+
+    /**
+     * 查看
+     */
+    public function index()
+    {
+        //当前是否为关联查询
+        $this->relationSearch = true;
+        //设置过滤方法
+        $this->request->filter(['strip_tags', 'trim']);
+        if ($this->request->isAjax()) {
+            //如果发送的来源是Selectpage，则转发到Selectpage
+            if ($this->request->request('keyField')) {
+                return $this->selectpage();
+            }
+            list($where, $sort, $order, $offset, $limit) = $this->buildparams();
+
+            $list = $this->model
+                    ->with(['user'])
+                    ->where($where)
+                    ->order($sort, $order)
+                    ->paginate($limit);
+
+            foreach ($list as $row) {
+                
+                $row->getRelation('user')->visible(['nickname','mobile','avatar']);
+            }
+
+            $result = array("total" => $list->total(), "rows" => $list->items());
+
+            return json($result);
+        }
+        return $this->view->fetch();
+    }
+
+}

application/admin/controller/user/User.php

@@ -134,4 +134,46 @@ class User extends Backend
         $this->view->assign("row", $row);
         return $this->view->fetch();
     }
+
+    /**
+     * 编辑
+     */
+    public function infoCheck($ids = null)
+    {
+        $row = $this->model->get($ids);
+        if (!$row) {
+            $this->error(__('No Results were found'));
+        }
+        $adminIds = $this->getDataLimitAdminIds();
+        if (is_array($adminIds)) {
+            if (!in_array($row[$this->dataLimitField], $adminIds)) {
+                $this->error(__('You have no permission'));
+            }
+        }
+        if ($this->request->isPost()) {
+            $params = $this->request->post("row/a");
+            if (!$params) {
+                $this->error(__('Parameter %s can not be empty', ''));
+            }
+            $params = $this->preExcludeFields($params);
+            $result = false;
+            try {
+                //是否采用模型验证
+                if ($this->modelValidate) {
+                    $name = str_replace("\\model\\", "\\validate\\", get_class($this->model));
+                    $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.edit' : $name) : $this->modelValidate;
+                    $row->validateFailException(true)->validate($validate);
+                }
+                $result = $row->allowField(true)->save($params);
+            } catch (ValidateException|PDOException|Exception $e) {
+                $this->error($e->getMessage());
+            }
+            if ($result == false) {
+                $this->error(__('No rows were updated'));
+            }
+            $this->success();
+        }
+        $this->view->assign("row", $row);
+        return $this->view->fetch();
+    }
 }

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

@@ -0,0 +1,42 @@
+<?php
+
+return [
+    'Id'                 => 'ID',
+    'User_id'            => '用户ID',
+    'Private_messages'   => '禁止私聊',
+    'Private_messages 0' => '正常',
+    'Private_messages 1' => '禁止',
+    'Barrage'            => '禁止弹幕',
+    'Barrage 0'          => '正常',
+    'Barrage 1'          => '禁止',
+    'Speak'              => '禁言',
+    'Speak 0'            => '正常',
+    'Speak_time'         => '禁言时间',
+    'Recharge'           => '充值',
+    'Recharge 0'         => '正常',
+    'Recharge 1'         => '禁止',
+    'Raffle'             => '抽奖',
+    'Raffle 0'           => '正常',
+    'Raffle 1'           => '禁止',
+    'Give_gift'          => '赠送礼物',
+    'Give_gift 0'        => '正常',
+    'Give_gift 1'        => '禁止',
+    'Transfer'           => '转账',
+    'Transfer 0'         => '正常',
+    'Transfer 1'         => '禁止',
+    'Payorder'           => '下单',
+    'Payorder 0'         => '正常',
+    'Payorder 1'         => '禁止',
+    'Attire'             => '购买装扮',
+    'Attire 0'           => '正常',
+    'Attire 1'           => '禁止',
+    'Noble'              => '开通贵族',
+    'Noble 0'            => '正常',
+    'Noble 1'            => '禁止',
+    'Withdraw'           => '提现',
+    'Withdraw 0'         => '允许',
+    'Withdraw 1'         => '禁止',
+    'User.nickname'      => '昵称',
+    'User.mobile'        => '手机号',
+    'User.avatar'        => '头像'
+];

application/admin/model/UserPower.php

@@ -0,0 +1,204 @@
+<?php
+
+namespace app\admin\model;
+
+use think\Model;
+
+
+class UserPower extends Model
+{
+
+    
+
+    
+
+    // 表名
+    protected $name = 'user_power';
+    
+    // 自动写入时间戳字段
+    protected $autoWriteTimestamp = false;
+
+    // 定义时间戳字段名
+    protected $createTime = false;
+    protected $updateTime = false;
+    protected $deleteTime = false;
+
+    // 追加属性
+    protected $append = [
+        'private_messages_text',
+        'barrage_text',
+        'speak_text',
+        'speak_time_text',
+        'recharge_text',
+        'raffle_text',
+        'give_gift_text',
+        'transfer_text',
+        'payorder_text',
+        'attire_text',
+        'noble_text',
+        'withdraw_text'
+    ];
+    
+
+    
+    public function getPrivateMessagesList()
+    {
+        return ['0' => __('Private_messages 0'), '1' => __('Private_messages 1')];
+    }
+
+    public function getBarrageList()
+    {
+        return ['0' => __('Barrage 0'), '1' => __('Barrage 1')];
+    }
+
+    public function getSpeakList()
+    {
+        return ['0' => __('Speak 0')];
+    }
+
+    public function getRechargeList()
+    {
+        return ['0' => __('Recharge 0'), '1' => __('Recharge 1')];
+    }
+
+    public function getRaffleList()
+    {
+        return ['0' => __('Raffle 0'), '1' => __('Raffle 1')];
+    }
+
+    public function getGiveGiftList()
+    {
+        return ['0' => __('Give_gift 0'), '1' => __('Give_gift 1')];
+    }
+
+    public function getTransferList()
+    {
+        return ['0' => __('Transfer 0'), '1' => __('Transfer 1')];
+    }
+
+    public function getPayorderList()
+    {
+        return ['0' => __('Payorder 0'), '1' => __('Payorder 1')];
+    }
+
+    public function getAttireList()
+    {
+        return ['0' => __('Attire 0'), '1' => __('Attire 1')];
+    }
+
+    public function getNobleList()
+    {
+        return ['0' => __('Noble 0'), '1' => __('Noble 1')];
+    }
+
+    public function getWithdrawList()
+    {
+        return ['0' => __('Withdraw 0'), '1' => __('Withdraw 1')];
+    }
+
+
+    public function getPrivateMessagesTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['private_messages']) ? $data['private_messages'] : '');
+        $list = $this->getPrivateMessagesList();
+        return isset($list[$value]) ? $list[$value] : '';
+    }
+
+
+    public function getBarrageTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['barrage']) ? $data['barrage'] : '');
+        $list = $this->getBarrageList();
+        return isset($list[$value]) ? $list[$value] : '';
+    }
+
+
+    public function getSpeakTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['speak']) ? $data['speak'] : '');
+        $list = $this->getSpeakList();
+        return isset($list[$value]) ? $list[$value] : '';
+    }
+
+
+    public function getSpeakTimeTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['speak_time']) ? $data['speak_time'] : '');
+        return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value;
+    }
+
+
+    public function getRechargeTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['recharge']) ? $data['recharge'] : '');
+        $list = $this->getRechargeList();
+        return isset($list[$value]) ? $list[$value] : '';
+    }
+
+
+    public function getRaffleTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['raffle']) ? $data['raffle'] : '');
+        $list = $this->getRaffleList();
+        return isset($list[$value]) ? $list[$value] : '';
+    }
+
+
+    public function getGiveGiftTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['give_gift']) ? $data['give_gift'] : '');
+        $list = $this->getGiveGiftList();
+        return isset($list[$value]) ? $list[$value] : '';
+    }
+
+
+    public function getTransferTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['transfer']) ? $data['transfer'] : '');
+        $list = $this->getTransferList();
+        return isset($list[$value]) ? $list[$value] : '';
+    }
+
+
+    public function getPayorderTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['payorder']) ? $data['payorder'] : '');
+        $list = $this->getPayorderList();
+        return isset($list[$value]) ? $list[$value] : '';
+    }
+
+
+    public function getAttireTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['attire']) ? $data['attire'] : '');
+        $list = $this->getAttireList();
+        return isset($list[$value]) ? $list[$value] : '';
+    }
+
+
+    public function getNobleTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['noble']) ? $data['noble'] : '');
+        $list = $this->getNobleList();
+        return isset($list[$value]) ? $list[$value] : '';
+    }
+
+
+    public function getWithdrawTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['withdraw']) ? $data['withdraw'] : '');
+        $list = $this->getWithdrawList();
+        return isset($list[$value]) ? $list[$value] : '';
+    }
+
+    protected function setSpeakTimeAttr($value)
+    {
+        return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value);
+    }
+
+
+    public function user()
+    {
+        return $this->belongsTo('User', 'user_id', 'id', [], 'LEFT')->setEagerlyType(0);
+    }
+}

application/admin/validate/UserPower.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace app\admin\validate;
+
+use think\Validate;
+
+class UserPower extends Validate
+{
+    /**
+     * 验证规则
+     */
+    protected $rule = [
+    ];
+    /**
+     * 提示消息
+     */
+    protected $message = [
+    ];
+    /**
+     * 验证场景
+     */
+    protected $scene = [
+        'add'  => [],
+        'edit' => [],
+    ];
+    
+}

application/admin/view/user/user/info_check.html

@@ -0,0 +1,57 @@
+<form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
+    {:token()}
+    <input type="hidden" name="row[id]" value="{$row.id}">
+    <div class="form-group">
+        <label for="c-nickname" class="control-label col-xs-12 col-sm-2">{:__('Nickname')}:</label>
+        <div class="col-xs-12 col-sm-4">
+            <input id="c-nickname" data-rule="required" disabled class="form-control" name="row[nickname]" type="text" value="{$row.nickname|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label for="c-nickname" class="control-label col-xs-12 col-sm-2">{:__('Nickname')}:</label>
+        <div class="col-xs-12 col-sm-4">
+            <input id="c-pre_nickname" class="form-control" name="row[pre_nickname]" type="text" value="{$row.pre_nickname|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label for="c-avatar" class="control-label col-xs-12 col-sm-2">{:__('Avatar')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <div class="input-group">
+                <input id="c-avatar" data-rule="" class="form-control" size="50" name="row[avatar]" type="text" value="{$row.avatar}">
+                <div class="input-group-addon no-border no-padding">
+                    <span><button type="button" id="faupload-avatar" class="btn btn-danger faupload" data-input-id="c-avatar" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-avatar"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
+                    <span><button type="button" id="fachoose-avatar" class="btn btn-primary fachoose" data-input-id="c-avatar" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
+                </div>
+                <span class="msg-box n-right" for="c-avatar"></span>
+            </div>
+            <ul class="row list-inline faupload-preview" id="p-avatar"></ul>
+        </div>
+    </div>
+    <div class="form-group">
+        <label for="c-avatar" class="control-label col-xs-12 col-sm-2">{:__('Avatar')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <div class="input-group">
+                <input id="c-pre_avatar" data-rule="" class="form-control" size="50" name="row[pre_avatar]" type="text" value="{$row.pre_avatar}">
+                <div class="input-group-addon no-border no-padding">
+                    <span><button type="button" id="faupload-pre_avatar" class="btn btn-danger faupload" data-input-id="c-pre_avatar" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-pre_avatar"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
+                    <span><button type="button" id="fachoose-pre_avatar" class="btn btn-primary fachoose" data-input-id="c-pre_avatar" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
+                </div>
+                <span class="msg-box n-right" for="c-pre_avatar"></span>
+            </div>
+            <ul class="row list-inline faupload-preview" id="p-pre_avatar"></ul>
+        </div>
+    </div>
+    <div class="form-group">
+        <label for="content" class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            {:build_radios('row[status]', ['normal'=>__('Normal'), 'hidden'=>__('Hidden')], $row['status'])}
+        </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">
+            <button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button>
+            <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
+        </div>
+    </div>
+</form>

application/admin/view/user_power/add.html

@@ -0,0 +1,154 @@
+<form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
+
+    <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 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">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Private_messages')}:</label>
+        <div class="col-xs-12 col-sm-8">
+                        
+            <select  id="c-private_messages" data-rule="required" class="form-control selectpicker" name="row[private_messages]">
+                {foreach name="privateMessagesList" 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">{:__('Barrage')}:</label>
+        <div class="col-xs-12 col-sm-8">
+                        
+            <select  id="c-barrage" data-rule="required" class="form-control selectpicker" name="row[barrage]">
+                {foreach name="barrageList" 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">{:__('Speak')}:</label>
+        <div class="col-xs-12 col-sm-8">
+                        
+            <select  id="c-speak" data-rule="required" class="form-control selectpicker" name="row[speak]">
+                {foreach name="speakList" 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">{:__('Speak_time')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-speak_time" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[speak_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">{:__('Recharge')}:</label>
+        <div class="col-xs-12 col-sm-8">
+                        
+            <select  id="c-recharge" data-rule="required" class="form-control selectpicker" name="row[recharge]">
+                {foreach name="rechargeList" 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">{:__('Raffle')}:</label>
+        <div class="col-xs-12 col-sm-8">
+                        
+            <select  id="c-raffle" data-rule="required" class="form-control selectpicker" name="row[raffle]">
+                {foreach name="raffleList" 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">{:__('Give_gift')}:</label>
+        <div class="col-xs-12 col-sm-8">
+                        
+            <select  id="c-give_gift" data-rule="required" class="form-control selectpicker" name="row[give_gift]">
+                {foreach name="giveGiftList" 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">{:__('Transfer')}:</label>
+        <div class="col-xs-12 col-sm-8">
+                        
+            <select  id="c-transfer" data-rule="required" class="form-control selectpicker" name="row[transfer]">
+                {foreach name="transferList" 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">{:__('Payorder')}:</label>
+        <div class="col-xs-12 col-sm-8">
+                        
+            <select  id="c-payorder" data-rule="required" class="form-control selectpicker" name="row[payorder]">
+                {foreach name="payorderList" 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">{:__('Attire')}:</label>
+        <div class="col-xs-12 col-sm-8">
+                        
+            <select  id="c-attire" data-rule="required" class="form-control selectpicker" name="row[attire]">
+                {foreach name="attireList" 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">{:__('Noble')}:</label>
+        <div class="col-xs-12 col-sm-8">
+                        
+            <select  id="c-noble" data-rule="required" class="form-control selectpicker" name="row[noble]">
+                {foreach name="nobleList" 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">{:__('Withdraw')}:</label>
+        <div class="col-xs-12 col-sm-8">
+                        
+            <select  id="c-withdraw" data-rule="required" class="form-control selectpicker" name="row[withdraw]">
+                {foreach name="withdrawList" item="vo"}
+                    <option value="{$key}" {in name="key" value="0"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
+        </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">
+            <button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button>
+            <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
+        </div>
+    </div>
+</form>

application/admin/view/user_power/edit.html

@@ -0,0 +1,154 @@
+<form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
+
+    <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 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">{:__('Private_messages')}:</label>
+        <div class="col-xs-12 col-sm-8">
+                        
+            <select  id="c-private_messages" data-rule="required" class="form-control selectpicker" name="row[private_messages]">
+                {foreach name="privateMessagesList" item="vo"}
+                    <option value="{$key}" {in name="key" value="$row.private_messages"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Barrage')}:</label>
+        <div class="col-xs-12 col-sm-8">
+                        
+            <select  id="c-barrage" data-rule="required" class="form-control selectpicker" name="row[barrage]">
+                {foreach name="barrageList" item="vo"}
+                    <option value="{$key}" {in name="key" value="$row.barrage"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Speak')}:</label>
+        <div class="col-xs-12 col-sm-8">
+                        
+            <select  id="c-speak" data-rule="required" class="form-control selectpicker" name="row[speak]">
+                {foreach name="speakList" item="vo"}
+                    <option value="{$key}" {in name="key" value="$row.speak"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Speak_time')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-speak_time" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[speak_time]" type="text" value="{:$row.speak_time?datetime($row.speak_time):''}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Recharge')}:</label>
+        <div class="col-xs-12 col-sm-8">
+                        
+            <select  id="c-recharge" data-rule="required" class="form-control selectpicker" name="row[recharge]">
+                {foreach name="rechargeList" item="vo"}
+                    <option value="{$key}" {in name="key" value="$row.recharge"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Raffle')}:</label>
+        <div class="col-xs-12 col-sm-8">
+                        
+            <select  id="c-raffle" data-rule="required" class="form-control selectpicker" name="row[raffle]">
+                {foreach name="raffleList" item="vo"}
+                    <option value="{$key}" {in name="key" value="$row.raffle"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Give_gift')}:</label>
+        <div class="col-xs-12 col-sm-8">
+                        
+            <select  id="c-give_gift" data-rule="required" class="form-control selectpicker" name="row[give_gift]">
+                {foreach name="giveGiftList" item="vo"}
+                    <option value="{$key}" {in name="key" value="$row.give_gift"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Transfer')}:</label>
+        <div class="col-xs-12 col-sm-8">
+                        
+            <select  id="c-transfer" data-rule="required" class="form-control selectpicker" name="row[transfer]">
+                {foreach name="transferList" item="vo"}
+                    <option value="{$key}" {in name="key" value="$row.transfer"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Payorder')}:</label>
+        <div class="col-xs-12 col-sm-8">
+                        
+            <select  id="c-payorder" data-rule="required" class="form-control selectpicker" name="row[payorder]">
+                {foreach name="payorderList" item="vo"}
+                    <option value="{$key}" {in name="key" value="$row.payorder"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Attire')}:</label>
+        <div class="col-xs-12 col-sm-8">
+                        
+            <select  id="c-attire" data-rule="required" class="form-control selectpicker" name="row[attire]">
+                {foreach name="attireList" item="vo"}
+                    <option value="{$key}" {in name="key" value="$row.attire"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Noble')}:</label>
+        <div class="col-xs-12 col-sm-8">
+                        
+            <select  id="c-noble" data-rule="required" class="form-control selectpicker" name="row[noble]">
+                {foreach name="nobleList" item="vo"}
+                    <option value="{$key}" {in name="key" value="$row.noble"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Withdraw')}:</label>
+        <div class="col-xs-12 col-sm-8">
+                        
+            <select  id="c-withdraw" data-rule="required" class="form-control selectpicker" name="row[withdraw]">
+                {foreach name="withdrawList" item="vo"}
+                    <option value="{$key}" {in name="key" value="$row.withdraw"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
+        </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">
+            <button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button>
+            <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
+        </div>
+    </div>
+</form>

application/admin/view/user_power/index.html

@@ -0,0 +1,35 @@
+<div class="panel panel-default panel-intro">
+    {:build_heading()}
+
+    <div class="panel-body">
+        <div id="myTabContent" class="tab-content">
+            <div class="tab-pane fade active in" id="one">
+                <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('user_power/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('user_power/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('user_power/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
+                        <a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('user_power/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('user_power/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('user_power/edit')}" 
+                           data-operate-del="{:$auth->check('user_power/del')}" 
+                           width="100%">
+                    </table>
+                </div>
+            </div>
+
+        </div>
+    </div>
+</div>

application/api/controller/Money.php

@@ -961,7 +961,7 @@ class Money extends Common
             // 查询余额
             $userModel = new \app\common\model\User();
             $userInfo = $userModel->lock('lock in share mode')->find($userId);
-            if ($scoin > $userInfo["money"]) {
+            if ($exchangeMoney > $userInfo["money"]) {
                 throw new Exception("余额不足！");
             }
 

application/api/controller/Party.php

@@ -63,7 +63,7 @@ class Party extends Common
 
         if($room_type == 1) {
             // 2。开厅申请
-            $authInfo = \app\common\model\Guild::where(["user_id"=>$user_id])->order('id desc')->find();
+            $authInfo = model('Guild')->where(["user_id"=>$user_id])->order('id desc')->find();
             if($authInfo) {
                 if($authInfo->status == 0) {
                     $this->error("您的家族申请还在这审核中...，请耐心等待！");
@@ -113,6 +113,17 @@ class Party extends Common
             if($party_id > 9999) {
                 $this->error("派对超限，请联系客服");
             }
+            if ($room_type == 1) {//家族房间获取家族信息
+                $guildWhere['user_id'] = $user_id;
+                $guildWhere['status'] = 1;
+                $guild = model('Guild')->where($guildWhere)->order('id desc')->find();
+                if (!empty($guild)) {
+                    $party_name = $guild['name'].'的房间';
+                    $party_logo = $guild['image'];
+                    $party_notice = $guild['desc'];
+                    $party_notice_detail = $guild['notice'];
+                }
+            }
             $data = [];
             $data["user_id"] = $this->auth->id;
             $data["room_type"] = $room_type;
@@ -167,9 +178,9 @@ class Party extends Common
                 /*\app\common\model\Guild::createGuild($partyInfo["id"], $partyInfo["party_name"], $user_id);
                 \app\common\model\User::update(["is_guild" => 3,'guild_id'], ["id" => $user_id]);*/
                 //更新家族 party_id
-                $guildWhere['id'] = $user_id;
-                $guildWhere['status'] = ['in',[0,1]];
-                $guild = model('Guild')->where($guildWhere)->find();
+                $guildWhere['user_id'] = $user_id;
+                $guildWhere['status'] = 1;
+                $guild = model('Guild')->where($guildWhere)->order('id desc')->find();
                 if (!empty($guild)) {
                     model('Guild')->where($guildWhere)->update(['party_id'=>$partyInfo['id']]);
                 }
@@ -783,6 +794,7 @@ class Party extends Common
             $this->error(__('Invalid parameters'));
         }
         $user_u_id = $this->auth->u_id;
+        $userId = $this->auth->id;
         $redis = new Redis();
         $redisconfig = config("redis");
         $redis->connect($redisconfig["host"], $redisconfig["port"]);
@@ -793,7 +805,7 @@ class Party extends Common
             $redis->select($redisconfig['redis_selectdb']);
         }
 
-        $redis->zRem("party_user_".$party_id,$user_u_id);
+        $redis->zRem("party_user_".$party_id,$userId);
 
         // 处理online_party_id
         //$redis->connect($redisconfig["host"], $redisconfig["port"]);

application/api/controller/Usercenter.php

@@ -110,7 +110,7 @@ class UserCenter extends Common
         //动态
         //技能
         //礼物
-
+        $userInfo['user_power'] = $this->auth->power;
         //访客记录
         if ($this->auth->id != $user_id) {
             $visit_data = [

application/common/library/Auth.php

@@ -523,7 +523,7 @@ class Auth
         if($own_guild_id){
             $userinfo['own_guild_id'] = $own_guild_id;
         }
-
+        $userinfo['user_power'] = $this->power;
         //
         return $userinfo;
     }

application/common/service/RoomService.php

@@ -158,6 +158,7 @@ class RoomService
                         ];
                         $redisPartyInfo[] = [
                             "id" => $foreachData["id"],
+                            "room_type" => $v['room_type'],
                             "party_id" => $foreachData["party_id"],
                             "r_id" => $foreachData["party_id"],
                             "party_name" => $foreachData["party_name"],

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

@@ -72,7 +72,20 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                     classname: 'btn btn-xs btn-primary btn-dialog',
                                     icon: 'fa fa-list',
                                     url: 'user/user/detail',
-                                },
+                                }, /*{
+                                    name: 'info_check',
+                                    title: __('信息审核'),
+                                    classname: 'btn btn-xs btn-warning btn-dialog',
+                                    icon: 'fa fa-bars',
+                                    url: 'user/user/infoCheck',
+                                    visible: function (row) {
+                                        if ((row.pre_nickname != '' && row.pre_nickname != row.nickname) || (row.pre_avatar != '' && row.pre_avatar != row.avatar)) {
+                                            return true;
+                                        } else  {
+                                            return false;
+                                        }
+                                    }
+                                },*/
                             ], table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate
                         }
                     ]

public/assets/js/backend/user_power.js

@@ -0,0 +1,66 @@
+define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
+
+    var Controller = {
+        index: function () {
+            // 初始化表格参数配置
+            Table.api.init({
+                extend: {
+                    index_url: 'user_power/index' + location.search,
+                    //add_url: 'user_power/add',
+                    edit_url: 'user_power/edit',
+                    /*del_url: 'user_power/del',
+                    multi_url: 'user_power/multi',
+                    import_url: 'user_power/import',*/
+                    table: 'user_power',
+                }
+            });
+
+            var table = $("#table");
+
+            // 初始化表格
+            table.bootstrapTable({
+                url: $.fn.bootstrapTable.defaults.extend.index_url,
+                pk: 'id',
+                sortName: 'id',
+                columns: [
+                    [
+                        {checkbox: true},
+                        {field: 'id', title: __('Id')},
+                        {field: 'user_id', title: __('User_id')},
+                        {field: 'user.nickname', title: __('User.nickname'), operate: 'LIKE'},
+                        {field: 'user.avatar', title: __('User.avatar'), operate: 'LIKE', events: Table.api.events.image, formatter: Table.api.formatter.image},
+                        {field: 'user.mobile', title: __('User.mobile'), operate: 'LIKE'},
+                        {field: 'private_messages', title: __('Private_messages'), searchList: {"0":__('Private_messages 0'),"1":__('Private_messages 1')}, formatter: Table.api.formatter.normal},
+                        {field: 'barrage', title: __('Barrage'), searchList: {"0":__('Barrage 0'),"1":__('Barrage 1')}, formatter: Table.api.formatter.normal},
+                        {field: 'speak', title: __('Speak'), searchList: {"0":__('Speak 0')}, formatter: Table.api.formatter.normal},
+                        {field: 'speak_time', title: __('Speak_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {field: 'recharge', title: __('Recharge'), searchList: {"0":__('Recharge 0'),"1":__('Recharge 1')}, formatter: Table.api.formatter.normal},
+                        {field: 'raffle', title: __('Raffle'), searchList: {"0":__('Raffle 0'),"1":__('Raffle 1')}, formatter: Table.api.formatter.normal},
+                        {field: 'give_gift', title: __('Give_gift'), searchList: {"0":__('Give_gift 0'),"1":__('Give_gift 1')}, formatter: Table.api.formatter.normal},
+                        {field: 'transfer', title: __('Transfer'), searchList: {"0":__('Transfer 0'),"1":__('Transfer 1')}, formatter: Table.api.formatter.normal},
+                        {field: 'payorder', title: __('Payorder'), searchList: {"0":__('Payorder 0'),"1":__('Payorder 1')}, formatter: Table.api.formatter.normal},
+                        {field: 'attire', title: __('Attire'), searchList: {"0":__('Attire 0'),"1":__('Attire 1')}, formatter: Table.api.formatter.normal},
+                        {field: 'noble', title: __('Noble'), searchList: {"0":__('Noble 0'),"1":__('Noble 1')}, formatter: Table.api.formatter.normal},
+                        {field: 'withdraw', title: __('Withdraw'), searchList: {"0":__('Withdraw 0'),"1":__('Withdraw 1')}, formatter: Table.api.formatter.normal},
+                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+                    ]
+                ]
+            });
+
+            // 为表格绑定事件
+            Table.api.bindevent(table);
+        },
+        add: function () {
+            Controller.api.bindevent();
+        },
+        edit: function () {
+            Controller.api.bindevent();
+        },
+        api: {
+            bindevent: function () {
+                Form.api.bindevent($("form[role=form]"));
+            }
+        }
+    };
+    return Controller;
+});