diff --git a/doc/sql/20230413.sql b/doc/sql/20230413.sql
index 53e2717..3338d31 100644
--- a/doc/sql/20230413.sql
+++ b/doc/sql/20230413.sql
@@ -76,4 +76,17 @@ VALUES (401, 400, '会员列表', 'novel/user', 'novel:user:user', '1', 'fa', '6
INSERT INTO sys_role_menu (role_id, menu_id)
VALUES (1, 400);
INSERT INTO sys_role_menu (role_id, menu_id)
-VALUES (1, 401);
\ No newline at end of file
+VALUES (1, 401);
+
+
+INSERT INTO sys_menu (menu_id, parent_id, name, url, perms, type, icon, order_num, gmt_create, gmt_modified)
+VALUES (500, 0, '订单管理', '', '', 0, 'fa fa-money', 19, null, null);
+
+INSERT
+INTO `sys_menu`(`menu_id`, `parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
+VALUES (501, 500, '订单列表', 'novel/pay', 'novel:pay:pay', '1', 'fa', '6');
+
+INSERT INTO sys_role_menu (role_id, menu_id)
+VALUES (1, 500);
+INSERT INTO sys_role_menu (role_id, menu_id)
+VALUES (1, 501);
\ No newline at end of file
diff --git a/doc/sql/novel_plus.sql b/doc/sql/novel_plus.sql
index 28269fe..d650bb0 100644
--- a/doc/sql/novel_plus.sql
+++ b/doc/sql/novel_plus.sql
@@ -2896,3 +2896,27 @@ INSERT INTO sys_role_menu (role_id, menu_id)
VALUES (1, 314);
INSERT INTO sys_role_menu (role_id, menu_id)
VALUES (1, 315);
+
+INSERT INTO sys_menu (menu_id, parent_id, name, url, perms, type, icon, order_num, gmt_create, gmt_modified)
+VALUES (400, 0, '会员管理', '', '', 0, 'fa fa-vcard', 9, null, null);
+
+INSERT
+INTO `sys_menu`(`menu_id`, `parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
+VALUES (401, 400, '会员列表', 'novel/user', 'novel:user:user', '1', 'fa', '6');
+
+INSERT INTO sys_role_menu (role_id, menu_id)
+VALUES (1, 400);
+INSERT INTO sys_role_menu (role_id, menu_id)
+VALUES (1, 401);
+
+INSERT INTO sys_menu (menu_id, parent_id, name, url, perms, type, icon, order_num, gmt_create, gmt_modified)
+VALUES (500, 0, '订单管理', '', '', 0, 'fa fa-money', 19, null, null);
+
+INSERT
+INTO `sys_menu`(`menu_id`, `parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
+VALUES (501, 500, '订单列表', 'novel/pay', 'novel:pay:pay', '1', 'fa', '6');
+
+INSERT INTO sys_role_menu (role_id, menu_id)
+VALUES (1, 500);
+INSERT INTO sys_role_menu (role_id, menu_id)
+VALUES (1, 501);
\ No newline at end of file
diff --git a/novel-admin/src/main/resources/static/js/appjs/novel/pay/pay.js b/novel-admin/src/main/resources/static/js/appjs/novel/pay/pay.js
index a53fc20..5dc5b39 100644
--- a/novel-admin/src/main/resources/static/js/appjs/novel/pay/pay.js
+++ b/novel-admin/src/main/resources/static/js/appjs/novel/pay/pay.js
@@ -59,82 +59,50 @@ function load() {
return arguments[2] + 1;
}
},
- {
- field: 'id',
- title: '主键'
- },
-
- {
- field: 'outTradeNo',
- title: '保留'
- },
+ {
+ field: 'outTradeNo',
+ title: '订单号'
+ },
-
- {
- field: 'tradeNo',
- title: '订单号'
- },
-
- {
- field: 'payChannel',
- title: '保留'
- },
-
-
- {
- field: 'totalAmount',
- title: '交易香蕉币'
- },
-
-
- {
- field: 'userId',
- title: '支付用户ID'
- },
-
-
- {
- field: 'payStatus',
- title: '支付状态：0：支付失败，1：支付成功，2：待支付'
- },
-
-
- {
- field: 'createTime',
- title: '创建时间'
- },
-
-
- {
- field: 'updateTime',
- title: '更新时间'
- },
-
-
- {
- title: '操作',
- field: 'id',
- align: 'center',
+ {
+ field: 'totalAmount',
+ title: '充值金额',
formatter: function (value, row, index) {
- var d = ' ';
- var e = ' ';
- var r = ' ';
- return d + e + r;
+ return '¥' + value;
}
- }]
+ },
+
+
+ {
+ field: 'userId',
+ title: '充值用户ID'
+ },
+
+ {
+ field: 'payStatus',
+ title: '状态',
+ formatter: function (value, row, index) {
+ return value === 0 ? '充值失败' : value === 1 ? '充值成功' : value === 2 ? '待支付' : '其它';
+ }
+ },
+
+
+ {
+ field: 'createTime',
+ title: '创建时间'
+ }
+
+
+ ]
});
}
+
function reLoad() {
$('#exampleTable').bootstrapTable('refresh');
}
+
function add() {
layer.open({
type: 2,
@@ -145,6 +113,7 @@ function add() {
content: prefix + '/add' // iframe的url
});
}
+
function detail(id) {
layer.open({
type: 2,
@@ -155,6 +124,7 @@ function detail(id) {
content: prefix + '/detail/' + id // iframe的url
});
}
+
function edit(id) {
layer.open({
type: 2,
@@ -165,6 +135,7 @@ function edit(id) {
content: prefix + '/edit/' + id // iframe的url
});
}
+
function remove(id) {
layer.confirm('确定要删除选中的记录？', {
btn: ['确定', '取消']
@@ -189,6 +160,7 @@ function remove(id) {
function resetPwd(id) {
}
+
function batchRemove() {
var rows = $('#exampleTable').bootstrapTable('getSelections'); // 返回所有选择的行，当没有选择的记录时，返回一个空数组
if (rows.length == 0) {
diff --git a/novel-admin/src/main/resources/templates/novel/pay/pay.html b/novel-admin/src/main/resources/templates/novel/pay/pay.html
index 9ae7ae5..fb2048e 100644
--- a/novel-admin/src/main/resources/templates/novel/pay/pay.html
+++ b/novel-admin/src/main/resources/templates/novel/pay/pay.html
@@ -7,30 +7,7 @@