正在显示
5 个修改的文件
包含
31 行增加
和
31 行删除
| @@ -16,19 +16,19 @@ | @@ -16,19 +16,19 @@ | ||
| 16 | <div class="tab-pane fade active in" id="one"> | 16 | <div class="tab-pane fade active in" id="one"> |
| 17 | <div class="widget-body no-padding"> | 17 | <div class="widget-body no-padding"> |
| 18 | <div id="toolbar" class="toolbar"> | 18 | <div id="toolbar" class="toolbar"> |
| 19 | - <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a> | ||
| 20 | - <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('deposit/deposit_order/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a> | ||
| 21 | - <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('deposit/deposit_order/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a> | ||
| 22 | - <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('deposit/deposit_order/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a> | ||
| 23 | - <a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('deposit/deposit_order/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> | 19 | +<!-- <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>--> |
| 20 | +<!-- <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('deposit/deposit_order/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>--> | ||
| 21 | +<!-- <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('deposit/deposit_order/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>--> | ||
| 22 | +<!-- <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('deposit/deposit_order/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>--> | ||
| 23 | +<!-- <a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('deposit/deposit_order/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>--> | ||
| 24 | 24 | ||
| 25 | - <div class="dropdown btn-group {:$auth->check('deposit/deposit_order/multi')?'':'hide'}"> | ||
| 26 | - <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a> | ||
| 27 | - <ul class="dropdown-menu text-left" role="menu"> | ||
| 28 | - <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> | ||
| 29 | - <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> | ||
| 30 | - </ul> | ||
| 31 | - </div> | 25 | +<!-- <div class="dropdown btn-group {:$auth->check('deposit/deposit_order/multi')?'':'hide'}">--> |
| 26 | +<!-- <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>--> | ||
| 27 | +<!-- <ul class="dropdown-menu text-left" role="menu">--> | ||
| 28 | +<!-- <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>--> | ||
| 29 | +<!-- <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>--> | ||
| 30 | +<!-- </ul>--> | ||
| 31 | +<!-- </div>--> | ||
| 32 | 32 | ||
| 33 | 33 | ||
| 34 | </div> | 34 | </div> |
| @@ -17,18 +17,18 @@ | @@ -17,18 +17,18 @@ | ||
| 17 | <div class="widget-body no-padding"> | 17 | <div class="widget-body no-padding"> |
| 18 | <div id="toolbar" class="toolbar"> | 18 | <div id="toolbar" class="toolbar"> |
| 19 | <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a> | 19 | <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a> |
| 20 | - <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('user/user_withdraw/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a> | ||
| 21 | - <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('user/user_withdraw/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a> | ||
| 22 | - <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('user/user_withdraw/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a> | ||
| 23 | - <a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('user/user_withdraw/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> | 20 | +<!-- <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('user/user_withdraw/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>--> |
| 21 | +<!-- <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('user/user_withdraw/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>--> | ||
| 22 | +<!-- <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('user/user_withdraw/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>--> | ||
| 23 | +<!-- <a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('user/user_withdraw/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>--> | ||
| 24 | 24 | ||
| 25 | - <div class="dropdown btn-group {:$auth->check('user/user_withdraw/multi')?'':'hide'}"> | ||
| 26 | - <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a> | ||
| 27 | - <ul class="dropdown-menu text-left" role="menu"> | ||
| 28 | - <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> | ||
| 29 | - <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> | ||
| 30 | - </ul> | ||
| 31 | - </div> | 25 | +<!-- <div class="dropdown btn-group {:$auth->check('user/user_withdraw/multi')?'':'hide'}">--> |
| 26 | +<!-- <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>--> | ||
| 27 | +<!-- <ul class="dropdown-menu text-left" role="menu">--> | ||
| 28 | +<!-- <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>--> | ||
| 29 | +<!-- <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>--> | ||
| 30 | +<!-- </ul>--> | ||
| 31 | +<!-- </div>--> | ||
| 32 | 32 | ||
| 33 | 33 | ||
| 34 | </div> | 34 | </div> |
| @@ -1463,7 +1463,7 @@ class Store extends Api | @@ -1463,7 +1463,7 @@ class Store extends Api | ||
| 1463 | ]; | 1463 | ]; |
| 1464 | $result = $withdraw_model->isUpdate(false)->save($withdraw); | 1464 | $result = $withdraw_model->isUpdate(false)->save($withdraw); |
| 1465 | // 记录用户余额 | 1465 | // 记录用户余额 |
| 1466 | - $result_user = $user_model->isUpdate(true)->save(['money' => $user['money'] - $param['money'] * $withdraw_percent]); | 1466 | + $result_user = $user_model->isUpdate(true)->save(['id'=>$this->auth->id,'score' => $user['score'] - $param['money'] * $withdraw_percent]); |
| 1467 | // 记录余额变更 | 1467 | // 记录余额变更 |
| 1468 | $insert_data = array( | 1468 | $insert_data = array( |
| 1469 | 'user_id' => $this->auth->id, | 1469 | 'user_id' => $this->auth->id, |
| @@ -688,7 +688,7 @@ class User extends Api | @@ -688,7 +688,7 @@ class User extends Api | ||
| 688 | * @ApiTitle (提现) | 688 | * @ApiTitle (提现) |
| 689 | * @ApiSummary (提现) | 689 | * @ApiSummary (提现) |
| 690 | * @ApiMethod (POST) | 690 | * @ApiMethod (POST) |
| 691 | - * @ApiRoute (/api/store/withdraw) | 691 | + * @ApiRoute (/api/user/withdraw) |
| 692 | * @ApiHeaders (name=token, type=string, required=true, description="请求的Token") | 692 | * @ApiHeaders (name=token, type=string, required=true, description="请求的Token") |
| 693 | * @ApiParams (name="money", type="integer", required=true, description="提现金额") | 693 | * @ApiParams (name="money", type="integer", required=true, description="提现金额") |
| 694 | * @ApiReturnParams (name="code", type="integer", required=true, sample="0") | 694 | * @ApiReturnParams (name="code", type="integer", required=true, sample="0") |
| @@ -739,11 +739,11 @@ class User extends Api | @@ -739,11 +739,11 @@ class User extends Api | ||
| 739 | ]; | 739 | ]; |
| 740 | $result = $withdraw_model->isUpdate(false)->save($withdraw); | 740 | $result = $withdraw_model->isUpdate(false)->save($withdraw); |
| 741 | // 记录用户余额 | 741 | // 记录用户余额 |
| 742 | - $result_user = $user_model->isUpdate(true)->save(['money' => $user['money'] - $param['money']]); | 742 | + $result_user = $user_model->isUpdate(true)->save(['id'=>$this->auth->id,'money' => $user['money'] - $param['money']]); |
| 743 | // 记录余额变更 | 743 | // 记录余额变更 |
| 744 | $insert_data = array( | 744 | $insert_data = array( |
| 745 | 'user_id' => $this->auth->id, | 745 | 'user_id' => $this->auth->id, |
| 746 | - 'score' => $param['money'], | 746 | + 'money' => $param['money'], |
| 747 | 'before' => $this->auth->money, | 747 | 'before' => $this->auth->money, |
| 748 | 'after' => $this->auth->money - $param['money'], | 748 | 'after' => $this->auth->money - $param['money'], |
| 749 | 'createtime' => time(), | 749 | 'createtime' => time(), |
| @@ -6,10 +6,10 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin | @@ -6,10 +6,10 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin | ||
| 6 | Table.api.init({ | 6 | Table.api.init({ |
| 7 | extend: { | 7 | extend: { |
| 8 | index_url: 'deposit/deposit_order/index' + location.search, | 8 | index_url: 'deposit/deposit_order/index' + location.search, |
| 9 | - add_url: 'deposit/deposit_order/add', | ||
| 10 | - edit_url: 'deposit/deposit_order/edit', | ||
| 11 | - del_url: 'deposit/deposit_order/del', | ||
| 12 | - multi_url: 'deposit/deposit_order/multi', | 9 | + // add_url: 'deposit/deposit_order/add', |
| 10 | + // edit_url: 'deposit/deposit_order/edit', | ||
| 11 | + // del_url: 'deposit/deposit_order/del', | ||
| 12 | + // multi_url: 'deposit/deposit_order/multi', | ||
| 13 | table: 'deposit_order', | 13 | table: 'deposit_order', |
| 14 | } | 14 | } |
| 15 | }); | 15 | }); |
-
请 注册 或 登录 后发表评论