提现

application/admin/controller/Takecash.php

@@ -57,14 +57,14 @@ class Takecash extends Backend
 
             foreach ($list as $row) {
                 
-                $row->getRelation('user')->visible(['username']);
+                $row->getRelation('user')->visible(['username','nickname']);
             }
 
             $list2 = collection($list->items())->toArray();
             foreach($list2 as $key => &$info){
                 $account_info = json_decode($info['acount_json'],true);
                 if($info['type'] == 2){
-                    $info['account_info'] = '姓名:'.$account_info['truename'].'，身份证:'.$account_info['idcard'].'，账号:'.$account_info['bank_no'].'，开户行:'.$account_info['open_bank'];
+                    $info['account_info'] = '姓名:'.$account_info['truename'].'，身份证:'.$account_info['idcard'].'，账号:'.$account_info['bank_no'];
                 }else{
                     $info['account_info'] = '姓名:'.$account_info['truename'].'，身份证:'.$account_info['idcard'].'，账号:'.$account_info['pay_no'];
                 }
@@ -117,7 +117,7 @@ class Takecash extends Backend
 
         $account_info = json_decode($info['acount_json'],true);
         if($info['type'] == 2){
-            $info['account_info'] = '姓名:'.$account_info['truename'].'，身份证:'.$account_info['idcard'].'，账号:'.$account_info['bank_no'].'，开户行:'.$account_info['open_bank'];
+            $info['account_info'] = '姓名:'.$account_info['truename'].'，身份证:'.$account_info['idcard'].'，账号:'.$account_info['bank_no'];
         }else{
             $info['account_info'] = '姓名:'.$account_info['truename'].'，身份证:'.$account_info['idcard'].'，账号:'.$account_info['pay_no'];
         }

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

@@ -3,8 +3,8 @@
 return [
     'Id'            => 'ID',
     'User_id'       => '用户ID',
-    'Money'         => '金额',
-    'Get_money'     => '实得金额',
+    'Money'         => '提现人民币金额',
+    'Jewel'         => '扣除收益金额',
     'Type'          => '提现方式',
     'Type 1'        => '支付宝',
     'Type 2'        => '银行卡',
@@ -17,5 +17,6 @@ return [
     'Status 2'      => '审核驳回',
     'Audittime'     => '审核时间',
     'Auditremark'   => '审核备注',
-    'User.username' => '用户名'
+    'User.username' => '用户名',
+    'User.nickname' => '昵称'
 ];

application/admin/view/takecash/add.html

@@ -9,13 +9,13 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Money')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-money" data-rule="required" class="form-control" step="0.01" name="row[money]" type="number" value="0.00">
+            <input id="c-money" data-rule="required" class="form-control" name="row[money]" type="number" value="0">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Get_money')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Jewel')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-get_money" data-rule="required" class="form-control" step="0.01" name="row[get_money]" type="number" value="0.00">
+            <input id="c-jewel" data-rule="required" class="form-control" name="row[jewel]" type="number" value="0">
         </div>
     </div>
     <div class="form-group">

application/admin/view/takecash/audit.html

@@ -9,13 +9,13 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Money')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-money" data-rule="required" class="form-control" disabled step="0.01" name="row[money]" type="number" value="{$row.money|htmlentities}">
+            <input id="c-money" data-rule="required" disabled class="form-control" name="row[money]" type="number" value="{$row.money|htmlentities}">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Get_money')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Jewel')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-get_money" data-rule="required" class="form-control" disabled step="0.01" name="row[get_money]" type="number" value="{$row.get_money|htmlentities}">
+            <input id="c-jewel" data-rule="required" disabled class="form-control" name="row[jewel]" type="number" value="{$row.jewel|htmlentities}">
         </div>
     </div>
     <div class="form-group">

application/admin/view/takecash/edit.html

@@ -9,13 +9,13 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Money')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-money" data-rule="required" class="form-control" step="0.01" name="row[money]" type="number" value="{$row.money|htmlentities}">
+            <input id="c-money" data-rule="required" class="form-control" name="row[money]" type="number" value="{$row.money|htmlentities}">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Get_money')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Jewel')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-get_money" data-rule="required" class="form-control" step="0.01" name="row[get_money]" type="number" value="{$row.get_money|htmlentities}">
+            <input id="c-jewel" data-rule="required" class="form-control" name="row[jewel]" type="number" value="{$row.jewel|htmlentities}">
         </div>
     </div>
     <div class="form-group">

application/admin/view/takecash/index.html

@@ -35,6 +35,7 @@
                     <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
                            data-operate-edit="{:$auth->check('takecash/edit')}" 
                            data-operate-del="{:$auth->check('takecash/del')}" 
+                           data-operate-audit="{:$auth->check('takecash/audit')}"
                            width="100%">
                     </table>
                 </div>

public/assets/js/backend/takecash.js

@@ -28,8 +28,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'id', title: __('Id')},
                         {field: 'user_id', title: __('User_id')},
                         {field: 'user.username', title: __('User.username'), operate: 'LIKE'},
-                        {field: 'money', title: __('Money'), operate:'BETWEEN'},
-                        {field: 'get_money', title: __('Get_money'), operate:'BETWEEN'},
+                        {field: 'user.nickname', title: __('User.nickname'), operate: 'LIKE'},
+                        {field: 'money', title: __('Money')},
+                        {field: 'jewel', title: __('Jewel')},
                         {field: 'type', title: __('Type'), searchList: {"1":__('Type 1'),"2":__('Type 2')}, formatter: Table.api.formatter.normal},
                         {field: 'account_info', title: '账号信息', operate:false},
                         {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
@@ -48,8 +49,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                     url:'takecash/audit/id/{ids}?dialog=1',
                                     target:'_self',
                                     hidden:function(row){
-                                     return row.status==0 ? false : true;
-                                     }
+                                        return row.status==0 ? false : true;
+                                    }
                                 }
                             ],
                             events: Table.api.events.operate, formatter: Table.api.formatter.operate}