From d41358fce9a436d81b9341d06fc1d8f3ddff92ff Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期一, 25 九月 2023 16:17:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/webapp/static/modular/system/finance/rechargeRecords.js | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/finance/rechargeRecords.js b/cloud-server-management/src/main/webapp/static/modular/system/finance/rechargeRecords.js
index 8c313a3..a71b48a 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/finance/rechargeRecords.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/finance/rechargeRecords.js
@@ -19,10 +19,14 @@
{title: '所在省市', field: 'provinceAndCity', visible: true, align: 'center', valign: 'middle'},
{title: '充值用户', field: 'name', visible: true, align: 'center', valign: 'middle'},
{title: '联系方式', field: 'phone', visible: true, align: 'center', valign: 'middle'},
- {title: '充值时间', field: 'time', visible: true, align: 'center', valign: 'middle'},
+ {title: '充值时间', field: 'insertTime', visible: true, align: 'center', valign: 'middle'},
{title: '充值金额', field: 'amount', visible: true, align: 'center', valign: 'middle'},
{title: '玩湃币数量', field: 'playPaiCoins', visible: true, align: 'center', valign: 'middle'},
- {title: '充值类型', field: 'type', visible: true, align: 'center', valign: 'middle'},
+ {title: '充值类型', field: 'type', visible: true, align: 'center', valign: 'middle',
+ formatter:function (data) {
+ return {1:"会员充值",0:"非会员充值"}[data]
+ }
+ },
];
};
function currentTime(timestamp){
@@ -308,18 +312,15 @@
TCompetition.table.refresh({query: queryData});
};
TCompetition.getAmount = function () {
-
var ajax = new $ax(Feng.ctxPath + "/finance/getAmount", function (data) {
var amountElement = document.getElementById("amount");
- amountElement.innerText = data;
- }, function (data) {
-
+ amountElement.innerText = "充值总金额:"+data+"元";
});
ajax.set("province",$("#pCode").val());
ajax.set("city",$("#cCode").val());
ajax.set("name",$("#name").val());
ajax.set("phone",$("#phone").val());
- ajax.set("time",$("#beginTime").val());
+ ajax.set("beginTime",$("#beginTime").val());
ajax.set("type",$("#type").val());
ajax.start();
};
@@ -329,7 +330,8 @@
$("#cCode").val("");
$("#name").val("");
$("#phone").val("");
- $("#shopName").val("");
+ $("#type").val("");
+ $("#beginTime").val("");
TCompetition.search();
};
@@ -337,8 +339,10 @@
$(function () {
var defaultColunms = TCompetition.initColumn();
var table = new BSTable(TCompetition.id, "/finance/listAll", defaultColunms);
- table.setPaginationType("server");
+ table.setPaginationType("client");
TCompetition.table = table.init();
+ TCompetition.getAmount();
+
});
/**
--
Gitblit v1.7.1