diff --git a/addons/epay/config.php b/addons/epay/config.php index 6422814..3386fdf 100755 --- a/addons/epay/config.php +++ b/addons/epay/config.php @@ -20,11 +20,11 @@ return [ 'content' => [], 'value' => [ 'appid' => '', - 'app_id' => 'wx183e3fbc925f1ba3', + 'app_id' => 'wx15043fd052209ad4', 'app_secret' => '', 'miniapp_id' => '', - 'mch_id' => '482572', - 'key' => 'udiigvdhrhreehhtrtrjjrjrrrrhjheh', + 'mch_id' => '1656836065', + 'key' => 'LOfqDyekO4EbQmw3z8ZGPRiDmVDPd0NP', 'key_v3' => '', 'mode' => 'normal', 'sub_mch_id' => '', diff --git a/application/admin/controller/income/Expend.php b/application/admin/controller/income/Expend.php old mode 100644 new mode 100755 diff --git a/application/admin/controller/user/Recharge.php b/application/admin/controller/user/Recharge.php old mode 100644 new mode 100755 diff --git a/application/admin/controller/user/Withdraw.php b/application/admin/controller/user/Withdraw.php new file mode 100644 index 0000000..f02bd6a --- /dev/null +++ b/application/admin/controller/user/Withdraw.php @@ -0,0 +1,37 @@ +model = new \app\admin\model\user\Withdraw; + + } + + + + /** + * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法 + * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑 + * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改 + */ + + +} diff --git a/application/admin/lang/zh-cn/income/expend.php b/application/admin/lang/zh-cn/income/expend.php old mode 100644 new mode 100755 diff --git a/application/admin/lang/zh-cn/user/recharge.php b/application/admin/lang/zh-cn/user/recharge.php old mode 100644 new mode 100755 diff --git a/application/admin/lang/zh-cn/user/withdraw.php b/application/admin/lang/zh-cn/user/withdraw.php new file mode 100644 index 0000000..71f4896 --- /dev/null +++ b/application/admin/lang/zh-cn/user/withdraw.php @@ -0,0 +1,7 @@ + '用户id', + 'Amount' => '金额', + 'Status' => '状态值0待审核1提现成功2提现失败' +]; diff --git a/application/admin/model/income/Expend.php b/application/admin/model/income/Expend.php old mode 100644 new mode 100755 diff --git a/application/admin/model/user/Recharge.php b/application/admin/model/user/Recharge.php old mode 100644 new mode 100755 diff --git a/application/admin/model/user/Withdraw.php b/application/admin/model/user/Withdraw.php new file mode 100644 index 0000000..7bb53a6 --- /dev/null +++ b/application/admin/model/user/Withdraw.php @@ -0,0 +1,61 @@ + [], + 'edit' => [], + ]; + +} diff --git a/application/admin/view/income/expend/add.html b/application/admin/view/income/expend/add.html old mode 100644 new mode 100755 diff --git a/application/admin/view/income/expend/edit.html b/application/admin/view/income/expend/edit.html old mode 100644 new mode 100755 diff --git a/application/admin/view/income/expend/index.html b/application/admin/view/income/expend/index.html old mode 100644 new mode 100755 diff --git a/application/admin/view/user/recharge/add.html b/application/admin/view/user/recharge/add.html old mode 100644 new mode 100755 diff --git a/application/admin/view/user/recharge/edit.html b/application/admin/view/user/recharge/edit.html old mode 100644 new mode 100755 diff --git a/application/admin/view/user/recharge/index.html b/application/admin/view/user/recharge/index.html old mode 100644 new mode 100755 diff --git a/application/admin/view/user/withdraw/add.html b/application/admin/view/user/withdraw/add.html new file mode 100644 index 0000000..b62c24f --- /dev/null +++ b/application/admin/view/user/withdraw/add.html @@ -0,0 +1,57 @@ +
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
diff --git a/application/admin/view/user/withdraw/edit.html b/application/admin/view/user/withdraw/edit.html new file mode 100644 index 0000000..3fb5a51 --- /dev/null +++ b/application/admin/view/user/withdraw/edit.html @@ -0,0 +1,57 @@ +
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
diff --git a/application/admin/view/user/withdraw/index.html b/application/admin/view/user/withdraw/index.html new file mode 100644 index 0000000..5ec2dad --- /dev/null +++ b/application/admin/view/user/withdraw/index.html @@ -0,0 +1,29 @@ +
+ {:build_heading()} + +
+
+
+ +
+ +
+
+
diff --git a/public/.well-known/acme-challenge/6-UdYhBlI2XGul_Oj-2SMgLX-4b4E1MLgIQewU2jm18 b/public/.well-known/acme-challenge/6-UdYhBlI2XGul_Oj-2SMgLX-4b4E1MLgIQewU2jm18 old mode 100644 new mode 100755 diff --git a/public/assets/js/backend/income/expend.js b/public/assets/js/backend/income/expend.js old mode 100644 new mode 100755 diff --git a/public/assets/js/backend/user/recharge.js b/public/assets/js/backend/user/recharge.js old mode 100644 new mode 100755 diff --git a/public/assets/js/backend/user/withdraw.js b/public/assets/js/backend/user/withdraw.js new file mode 100644 index 0000000..634dc32 --- /dev/null +++ b/public/assets/js/backend/user/withdraw.js @@ -0,0 +1,58 @@ +define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) { + + var Controller = { + index: function () { + // 初始化表格参数配置 + Table.api.init({ + extend: { + index_url: 'user/withdraw/index' + location.search, + add_url: 'user/withdraw/add', + edit_url: 'user/withdraw/edit', + del_url: 'user/withdraw/del', + multi_url: 'user/withdraw/multi', + import_url: 'user/withdraw/import', + table: 'user_withdraw', + } + }); + + var table = $("#table"); + + // 初始化表格 + table.bootstrapTable({ + url: $.fn.bootstrapTable.defaults.extend.index_url, + pk: 'id', + sortName: 'id', + columns: [ + [ + {checkbox: true}, + {field: 'id', title: __('Id')}, + {field: 'method', title: __('Method'), operate: 'LIKE'}, + {field: 'user_id', title: __('User_id')}, + {field: 'amount', title: __('Amount'), operate:'BETWEEN'}, + {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, + {field: 'update_time', title: __('Update_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, + {field: 'status', title: __('Status')}, + {field: 'picUrl', title: __('Picurl'), operate: 'LIKE', formatter: Table.api.formatter.url}, + {field: 'reason', title: __('Reason'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, + {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; +});