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

application/admin/controller/Feedback.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace app\admin\controller;
+
+use app\common\controller\Backend;
+
+/**
+ * 意见反馈
+ *
+ * @icon fa fa-circle-o
+ */
+class Feedback extends Backend
+{
+    
+    /**
+     * Feedback模型对象
+     * @var \app\admin\model\Feedback
+     */
+    protected $model = null;
+
+    public function _initialize()
+    {
+        parent::_initialize();
+        $this->model = new \app\admin\model\Feedback;
+        $this->view->assign("statusList", $this->model->getStatusList());
+    }
+
+    public function import()
+    {
+        parent::import();
+    }
+
+    /**
+     * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法
+     * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑
+     * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改
+     */
+    
+
+}

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

@@ -0,0 +1,13 @@
+<?php
+
+return [
+    'Id'         => 'ID',
+    'User_id'    => '用户ID',
+    'Content'    => '内容',
+    'Images'     => '图片',
+    'Status'     => '状态',
+    'Status 0'   => '待处理',
+    'Status 1'   => '已处理',
+    'Createtime' => '创建时间',
+    'Updatetime' => '更新时间'
+];

application/admin/model/Feedback.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace app\admin\model;
+
+use think\Model;
+
+
+class Feedback extends Model
+{
+
+    
+
+    
+
+    // 表名
+    protected $name = 'feedback';
+    
+    // 自动写入时间戳字段
+    protected $autoWriteTimestamp = 'int';
+
+    // 定义时间戳字段名
+    protected $createTime = 'createtime';
+    protected $updateTime = 'updatetime';
+    protected $deleteTime = false;
+
+    // 追加属性
+    protected $append = [
+        'status_text'
+    ];
+    
+
+    
+    public function getStatusList()
+    {
+        return ['0' => __('Status 0'), '1' => __('Status 1')];
+    }
+
+
+    public function getStatusTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['status']) ? $data['status'] : '');
+        $list = $this->getStatusList();
+        return isset($list[$value]) ? $list[$value] : '';
+    }
+
+
+
+
+}

application/admin/validate/Feedback.php

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

application/admin/view/feedback/add.html

@@ -0,0 +1,48 @@
+<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">{:__('Content')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-content" data-rule="required" class="form-control" name="row[content]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Images')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <div class="input-group">
+                <input id="c-images" data-rule="required" class="form-control" size="50" name="row[images]" type="text" value="">
+                <div class="input-group-addon no-border no-padding">
+                    <span><button type="button" id="faupload-images" class="btn btn-danger faupload" data-input-id="c-images" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="true" data-preview-id="p-images"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
+                    <span><button type="button" id="fachoose-images" class="btn btn-primary fachoose" data-input-id="c-images" data-mimetype="image/*" data-multiple="true"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
+                </div>
+                <span class="msg-box n-right" for="c-images"></span>
+            </div>
+            <ul class="row list-inline faupload-preview" id="p-images"></ul>
+        </div>
+    </div>
+    <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="0"}checked{/in} /> {$vo}</label> 
+            {/foreach}
+            </div>
+
+        </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/feedback/edit.html

@@ -0,0 +1,48 @@
+<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">{:__('Content')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-content" data-rule="required" class="form-control" name="row[content]" type="text" value="{$row.content|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Images')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <div class="input-group">
+                <input id="c-images" data-rule="required" class="form-control" size="50" name="row[images]" type="text" value="{$row.images|htmlentities}">
+                <div class="input-group-addon no-border no-padding">
+                    <span><button type="button" id="faupload-images" class="btn btn-danger faupload" data-input-id="c-images" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="true" data-preview-id="p-images"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
+                    <span><button type="button" id="fachoose-images" class="btn btn-primary fachoose" data-input-id="c-images" data-mimetype="image/*" data-multiple="true"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
+                </div>
+                <span class="msg-box n-right" for="c-images"></span>
+            </div>
+            <ul class="row list-inline faupload-preview" id="p-images"></ul>
+        </div>
+    </div>
+    <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>
+    </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/feedback/index.html

@@ -0,0 +1,45 @@
+<div class="panel panel-default panel-intro">
+    
+    <div class="panel-heading">
+        {:build_heading(null,FALSE)}
+        <ul class="nav nav-tabs" data-field="status">
+            <li class="{:$Think.get.status === null ? 'active' : ''}"><a href="#t-all" data-value="" data-toggle="tab">{:__('All')}</a></li>
+            {foreach name="statusList" item="vo"}
+            <li class="{:$Think.get.status === (string)$key ? 'active' : ''}"><a href="#t-{$key}" data-value="{$key}" data-toggle="tab">{$vo}</a></li>
+            {/foreach}
+        </ul>
+    </div>
+
+
+    <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('feedback/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('feedback/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('feedback/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
+                        <a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('feedback/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('feedback/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('feedback/edit')}" 
+                           data-operate-del="{:$auth->check('feedback/del')}" 
+                           width="100%">
+                    </table>
+                </div>
+            </div>
+
+        </div>
+    </div>
+</div>

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

@@ -2,6 +2,12 @@
     {:token()}
     <input type="hidden" name="row[id]" value="{$row.id}">
     <div class="form-group">
+        <label for="c-u_id" class="control-label col-xs-12 col-sm-2">{:__('Uid')}:</label>
+        <div class="col-xs-12 col-sm-4">
+            <input id="c-u_id" data-rule="required" class="form-control" name="row[u_id]" type="text" value="{$row.u_id|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-nickname" data-rule="required" class="form-control" name="row[nickname]" type="text" value="{$row.nickname|htmlentities}">

application/api/controller/Feedback.php

@@ -32,7 +32,7 @@ class Feedback extends Api
             if(!$validate->check($this->request->param(),[],'add')){
                 throw new Exception($validate->getError());
             }
-            $userId  = isset($this->auth->id) ? $this->auth->id : 0;
+            $userId  = $this->auth->id;
             $content = $content;
             $images  = $images;
             $limitNum = 100;//限制每月反馈数量

application/api/controller/Money.php

@@ -57,6 +57,13 @@ class Money extends Common
         if (!preg_match("/^-?\d+$/",$amounts)) {
             $this->error('金额必须是整数');
         }
+
+        if ($this->auth->is_auth != 2) {//实名后允许充值
+            throw new Exception('请先实名认证');
+        }
+        if ($this->power->recharge == 1) {//禁止充值
+            throw new Exception('禁止充值');
+        }
         $user_id = $this->auth->id;
         // 获取充值金额配置信息
         if (!empty($rechar_id)) {

application/api/controller/Usercenter.php

@@ -1149,11 +1149,11 @@ class UserCenter extends Common
      * 提现配置列表
      * @return void
      */
-    public function withdrawalList()
+    public function withdrawalConfigList()
     {
         try {
             $field = 'id,money,real_money';
-            $result = model('Withdrawal')->field($field)->autopage()->order('weigh asc')->select();
+            $result = model('WithdrawalConfig')->field($field)->autopage()->order('weigh asc')->select();
 
             $this->success('获取成功',$result);
         } catch (Exception $e) {
@@ -1167,11 +1167,14 @@ class UserCenter extends Common
      */
     public function withdrawal()
     {
+        Db::startTrans();
         try {
             $withdrawConfigId = $this->request->param('id',0);
             $money = $this->request->param('money',0.00);
+            $type = $this->request->param('type',0);
             $userId = $this->auth->id;
             $isAnchor = $this->auth->is_anchor;
+            $userMoney = $this->auth->money;
             if (empty($withdrawConfigId) && empty($money)) {
                 throw new Exception('参数错误');
             }
@@ -1179,23 +1182,106 @@ class UserCenter extends Common
             if ($isAnchor != 2) {
                 throw new Exception('您不是主播不允许提现');
             }
+            //验证提现类型
+            $withdrawTypeConfig = config('wallet.withdraw_type');
+            $typeIds = array_keys($withdrawTypeConfig);
+            if (!in_array($type,$typeIds)) {
+                throw new Exception('未知的提现类型');
+            }
+            $typeStr = isset($withdrawTypeConfig[$type]) ? $withdrawTypeConfig[$type] : '';
+            $withdrawRateConfig = config('site.withdrawRate');//用户获取的金额比例(需要/100)
+            $withdrawRate = bcdiv($withdrawRateConfig,100,2);
+            if (!empty($money)) {//自定义金额
+                if ($money <= 0) {
+                    throw new Exception('金额有误');
+                }
+                $moneys = bcmul($money,$withdrawRate,2);
+                $platformMoney = bcsub($money,$moneys,2);
+            } else {//提现配置
+                $where['id'] = $withdrawConfigId;
+                $withdrawalConfig = model('WithdrawalConfig')->where($where)->find();
+                if (empty($withdrawalConfig)) {
+                    throw new Exception('未知的配置信息');
+                }
+                $moneys = $withdrawalConfig['money'];
+                $platformMoney = bcsub($moneys,$withdrawalConfig['real_money'],2);;
+            }
+            if ($moneys <= 0) {
+                throw new Exception('申请金额异常');
+            }
+            //扣减余额 记录余额日志
+            $walletRes = model('wallet')->lockChangeAccountRemain($userId, $moneys, '-', $userMoney, '申请提现', 104,'money');
+            if (!$walletRes['status']) {
+                throw new Exception($walletRes['msg']);
+            }
+            $account = $name = '';
+            if ($type == 1) {//微信
+                $account = '';
+                $name = '';
+            } elseif ($type == 2) {//支付宝
+                $userAlipayWhere['user_id'] = $userId;
+                $userAlipay = model('UserAlipay')->where($userAlipayWhere)->find();
+                if (empty($userAlipay)) {
+                    throw new Exception('请绑定支付宝');
+                }
+                $account = $userAlipay['pay_no'];
+                $name = $userAlipay['realname'];
+            } elseif ($type == 3) {//银行
+                $userBankWhere['user_id'] = $userId;
+                $userBank = model('UserBank')->where($userBankWhere)->find();
+                if (empty($userBank)) {
+                    throw new Exception('请绑定银行卡');
+                }
+                $account = $userBank['bank_no'];
+                $name = $userBank['realname'];
+            }
             $data = [
                 'user_id'       => $userId,//用户ID
-                'money'         => '',//金额
-                'handingfee'    => '',//手续费
-                'taxes'         => '',//税费
-                'type'          => '',//类型
-                'account'       => '',//提现账户
-                'name'          => '',//真实姓名
-                'memo'          => '',//备注
-                'orderid'       => '',//订单号
-                'transactionid' => '',//流水号
-                'status'        => '',//状态:created=申请中,successed=成功,rejected=已拒绝
-                'transfertime'  => '',//转账时间
-                'createtime'    => '',//添加时间
+                'money'         => $moneys,//金额
+                'handingfee'    => $platformMoney,//手续费
+                'taxes'         => 0.00,//税费
+                'type'          => $typeStr,//类型
+                'account'       => $account,//提现账户
+                'name'          => $name,//真实姓名
+                //'memo'          => '',//备注
+                //'orderid'       => '',//订单号
+                //'transactionid' => '',//流水号
+                'status'        => 'created',//状态:created=申请中,successed=成功,rejected=已拒绝
+                //'transfertime'  => '',//转账时间
+                'createtime'    => time(),//添加时间
             ];
+            $withdrawRes = model('Withdraw')->insertGetId($data);
+            if (!$withdrawRes) {
+                throw new Exception('提现失败');
+            }
+            Db::commit();
             $this->success('操作成功待审核');
         } catch (Exception $e) {
+            Db::rollback();
+            $this->error($e->getMessage());
+        }
+    }
+
+    /**
+     * 提现列表
+     * @return void
+     */
+    public function withdrawalList()
+    {
+        try {
+            $field = 'id,money,type,status,createtime,transfertime';
+            $where=[];
+            //$where['status'] = 'successed';//状态:created=申请中,successed=成功,rejected=已拒绝
+            $result = model('Withdraw')->field($field)->where($where)->autopage()->order('createtime desc')->select();
+            if (!empty($result)) {
+                foreach ($result as $key => &$value) {
+                    $value['money'] = '-'.$value['money'];
+                    $value['createtime'] = !empty($value['createtime']) ? date('Y-m-d H:i', $value['createtime']) : '';
+                    $value['transfertime'] = !empty($value['transfertime']) ? date('Y-m-d H:i', $value['transfertime']) : '';
+                }
+            }
+            $this->success('获取成功',$result);
+        } catch (Exception $e) {
             $this->error($e->getMessage());
         }
     }

application/common/model/Withdraw.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace app\common\model;
+
+use think\Model;
+
+
+class Withdraw extends Model
+{
+
+
+    // 表名
+    protected $name = 'withdraw';
+
+    // 自动写入时间戳字段
+    protected $autoWriteTimestamp = 'int';
+
+    // 定义时间戳字段名
+    protected $createTime = 'createtime';
+    protected $updateTime = 'updatetime';
+    protected $deleteTime = false;
+
+    // 追加属性
+    protected $append = [
+        'status_text',
+        'type_text',
+    ];
+
+    public function getStatusList()
+    {
+        return ['created'=>'申请中', 'successed'=>'成功', 'rejected'=>'已拒绝'];
+    }
+
+    public function getStatusTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['status']) ? $data['status'] : '');
+        $list = $this->getStatusList();
+        return isset($list[$value]) ? $list[$value] : '';
+    }
+
+    public function getTypeList()
+    {
+        return ['wechat'=>'微信', 'alipay'=>'支付宝', 'bank'=> '银行'];
+    }
+
+    public function getTypeTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['type']) ? $data['type'] : '');
+        $list = $this->getTypeList();
+        return isset($list[$value]) ? $list[$value] : '';
+    }
+}

application/common/model/Withdrawal.php → application/common/model/WithdrawalConfig.php

@@ -5,7 +5,7 @@ namespace app\common\model;
 use think\Model;
 
 
-class Withdrawal extends Model
+class WithdrawalConfig extends Model
 {
 
 

application/common/service/RoomService.php

@@ -217,22 +217,19 @@ class RoomService
             $partyId = isset($params['party_id']) ? $params['party_id'] : 0;
             $userIds = $this->redis->zRange("party_user_".$partyId,0,-1);
             $field = 'id,avatar,nickname';
-            $fieldArr = explode(',',$field);
             $userWhere['id'] = ['in', $userIds];
             $userModel = new \app\common\model\User();
             $userData = $userModel->field($field)->where($userWhere)->select();
             $userDatas = [];
             if (!empty($userData)) {
                 foreach($userData as $key => $value) {
-                    foreach ($fieldArr as $fieldk => $fieldv) {
-                        $userDatas[$key][$fieldv] = $value[$fieldv];
-                    }
+                    $userDatas[$key] = $value;
                 }
                 $userDatas = list_domain_image($userDatas,['avatar']);
             }
             $partyUserList = [
                 'member_list' => $userDatas,
-                'online_num' => count($userData),
+                'online_num' => !empty($userDatas) ? count($userDatas) : 0,
             ];
             $result['data'] = $partyUserList;
         } catch (Exception $e) {

application/common/service/UserService.php

@@ -164,7 +164,7 @@ class UserService
                         if (!empty($preUser)) {
                             //查看是否赠送过金额
                             $moneyLogWhere['invite_user_id'] = $userId;
-                            $moneyLogWhere['type'] = 15;
+                            $moneyLogWhere['type'] = 103;
                             $moneyLog = model('UserMoneyLog')->where($moneyLogWhere)->find();
                             if (empty($moneyLog)) {
                                 $money = config('site.invite_money');

application/extra/site.php

@@ -99,7 +99,7 @@ return [
     'withdraw' => '<p>提现说明</p><p>1、GG语音服务人员随时可以申请提现，到账时间为T+1，如果遇到双休日或者国家法定节假日，则会在休假完毕后的第一个工作日的当日24：00前到账，如提现申请过多，可能会延迟到账，可联系官方在线客服进行咨询；</p><p>2、GG语音服务人员在平台内可以使用声币进行提现，提现收取5%的手续费</p><p>3、收益支持银行卡提现，GG语音服务人员需要先绑定本人经过实名认证的身份证信息才可以提现，绑定时务必确保所填信息真实有效，因为填写资料错误导致的提现失败损失由伴声服务人员自行承担。注意：同一个银行卡只能绑定一个实名认证用户，修改是不支持对账号主体（即真实姓名和身份证号）进行修改；</p><p>4、提现金额仅限整数，当前可提现额度小于30元时，不可进行收益体现，当日提现金额最高50000元；</p><p>5、如公司检测到GG语音服务人员的GG账户有作弊或者异常，或者违反国家法律法规的异常情况，公司将拒绝该GG语音服务人员对收入进行提现；</p><p>6、收益提现规则最终解释权归GG语音所有。</p>',
     'uidsale' => '11111111,22222222,33333333,44444444,55555555,66666666,77777777,88888888,99999999,12345678,10000000,20000000,30000000,400000000,50000000,60000000,70000000,80000000,90000000',
     'getempirical' => '1',
-    'withdrawRate' => '100',
+    'withdrawRate' => '99',
     'switch' => '1',
     'appShare' => '/uploads/20210422/75744fbe87ee36e52ffffcb82acdc403.png',
     'roomLimit' => '50',

application/extra/wallet.php

@@ -19,14 +19,21 @@ return [
         12 => '私聊到账',  //增加
         13 => '抽奖箱子和转盘', //减少
         14 => '余额兑换钻石', //增加
-        15 => '邀请用户充值赠送金额', //增加
+
         //money
         101 => '获赠礼物', //增加
         102 => '房间礼物抽成', //增加
+        103 => '邀请用户充值赠送金额', //增加
+        104 => '申请提现', //减少
+        105 => '申请提现驳回', //增加
     ],
     'moneyname' => [
         'jewel'    => '钻石',
         'money'    => '余额',
     ],
-
+    'withdraw_type' => [
+        1 => 'wechat',//微信
+        2 => 'alipay',//支付宝
+        3 => 'bank',  //银行
+    ],
 ];

public/assets/js/backend/feedback.js

@@ -0,0 +1,56 @@
+define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
+
+    var Controller = {
+        index: function () {
+            // 初始化表格参数配置
+            Table.api.init({
+                extend: {
+                    index_url: 'feedback/index' + location.search,
+                    add_url: 'feedback/add',
+                    edit_url: 'feedback/edit',
+                    del_url: 'feedback/del',
+                    multi_url: 'feedback/multi',
+                    import_url: 'feedback/import',
+                    table: 'feedback',
+                }
+            });
+
+            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: 'content', title: __('Content'), operate: 'LIKE'},
+                        {field: 'images', title: __('Images'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.images},
+                        {field: 'status', title: __('Status'), searchList: {"0":__('Status 0'),"1":__('Status 1')}, formatter: Table.api.formatter.status},
+                        {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {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;
+});