+
- {{ Number(user.totalRechargeGold) / 100 }}
+ {{ Number(user.totalRechargeGold/100) }}
@@ -1122,11 +1122,11 @@ onMounted(async function () {
-
+
diff --git a/gold-system/src/views/recharge/adminRecharge.vue b/gold-system/src/views/recharge/adminRecharge.vue
index cc1cf73..8637122 100644
--- a/gold-system/src/views/recharge/adminRecharge.vue
+++ b/gold-system/src/views/recharge/adminRecharge.vue
@@ -85,14 +85,25 @@ const delObj = ref({});
// 方法
// 合计数存储
-const totalData = ref({
- totalmoney: 0,
- totalRcoin: 0,
- totalFcoin: 0,
-});
+const trueGold = ref(0);
+const trueRGold = ref(0);
+const trueFGold = ref(0);
+//全部
const totalmoney = ref(0);
const totalRcoin = ref(0);
const totalFcoin = ref(0);
+//待审核
+const pendingGold = ref(0);
+const pendingRGold = ref(0);
+const pendingFGold = ref(0);
+// 已通过金币数
+const approvedGold = ref(0);
+const approvedRGold = ref(0);
+const approvedFGold = ref(0);
+// 已驳回金币数
+const rejectedGold = ref(0);
+const rejectedRGold = ref(0);
+const rejectedFGold = ref(0);
// 搜索===========================================================================
// 搜索方法
const get = async function (val) {
@@ -148,18 +159,37 @@ const get = async function (val) {
totalmoney.value = 0;
totalRcoin.value = 0;
totalFcoin.value = 0;
- } else {
- // 做一个判断，如果result2.data[i].flag="待审核"，那么 totalData.value = result2.data[i]，否则就赋值为0
- for (let i = 0; i < result2.data.length; i++) {
- if (result2.data[i].flag == "已通过") {
- totalData.value = result2.data[i];
- totalmoney.value = totalData.value.sumRaudit1;
- totalRcoin.value = totalData.value.sumRaudit1;
- totalFcoin.value = totalData.value.sumRaudit2;
- break;
+ }
+ if (result2.data) {
+ result2.data.forEach((item) => {
+ switch (item.flag) {
+ case "待审核":
+ // 若 item.raudit 为空则赋值为 0
+ // 若 item.sumRaudit 为空则赋值为 0
+ pendingGold.value = item.sumRaudit || 0;
+ pendingRGold.value = item.sumRaudit1 || 0;
+ pendingFGold.value = item.sumRaudit2 || 0;
+ break;
+ case "已通过":
+ approvedGold.value = item.sumRaudit || 0;
+ approvedRGold.value = item.sumRaudit1 || 0;
+ approvedFGold.value = item.sumRaudit2 || 0;
+ break;
+ case "已驳回":
+ rejectedGold.value = item.sumRaudit || 0;
+ rejectedRGold.value = item.sumRaudit1 || 0;
+ rejectedFGold.value = item.sumRaudit2 || 0;
+ break;
}
- }
+ });
}
+ trueGold.value =
+ pendingGold.value + approvedGold.value + rejectedGold.value;
+ trueRGold.value =
+ pendingRGold.value + approvedRGold.value + rejectedRGold.value;
+ trueFGold.value =
+ pendingFGold.value + approvedFGold.value + rejectedFGold.value;
+
// 将响应结果存储到响应式数据中
console.log("请求成功", result);
// 存储表格数据
@@ -180,13 +210,13 @@ const search = function () {
};
// 重置
const reset = function () {
- rechargeVo.value.activityId = "";
- rechargeVo.value.payWay = "";
- rechargeVo.value.area = "";
- rechargeVo.value.startDate = "";
- rechargeVo.value.endDate = "";
- sortField.value = "";
- sortOrder.value = "";
+ delete rechargeVo.value.activityId;
+ delete rechargeVo.value.payWay;
+ delete rechargeVo.value.area;
+ delete rechargeVo.value.startDate;
+ delete rechargeVo.value.endDate;
+ delete sortField.value;
+ delete sortOrder.value;
getTime.value = {};
};
// 今天
@@ -249,25 +279,35 @@ const adminAll = function () {
get();
};
//待审核充值明细
-const adminWait = function () {
+const adminWait = async function () {
rechargeVo.value.status = 0;
getObj.value.pageNum = 1;
- get();
+ await get();
console.log("adminWait");
+
+ trueGold.value = pendingGold.value;
+ trueRGold.value = pendingRGold.value;
+ trueFGold.value = pendingFGold.value;
};
//已通过充值明细
-const adminPass = function () {
+const adminPass = async function () {
rechargeVo.value.status = 1;
getObj.value.pageNum = 1;
- get();
+ await get();
+ trueGold.value = approvedGold.value;
+ trueRGold.value = approvedRGold.value;
+ trueFGold.value = approvedFGold.value;
console.log("adminPass");
};
//已驳回充值明细
-const adminReject = function () {
+const adminReject = async function () {
rechargeVo.value.status = 2;
getObj.value.pageNum = 1;
- get();
+ await get();
console.log("adminReject");
+ trueGold.value = rejectedGold.value;
+ trueRGold.value = rejectedRGold.value;
+ trueFGold.value = rejectedFGold.value;
};
//点击标签页
const handleClick = function (tab, event) {
@@ -505,11 +545,11 @@ const handleSortChange = (column) => {
-
+
+ 充值金额：{{ trueRGold }}新币，永久金币：{{
+ trueRGold
+ }}金币，免费金币：{{ trueFGold }}金币
+
diff --git a/gold-system/src/views/recharge/allRecharge.vue b/gold-system/src/views/recharge/allRecharge.vue
index 55e2da9..589a14a 100644
--- a/gold-system/src/views/recharge/allRecharge.vue
+++ b/gold-system/src/views/recharge/allRecharge.vue
@@ -70,14 +70,26 @@ const getPayWay = async function () {
// 方法
// 合计数存储
-const totalData = ref({
- totalmoney: 0,
- totalRcoin: 0,
- totalFcoin: 0,
-});
+// 合计数存储
+const trueGold = ref(0);
+const trueRGold = ref(0);
+const trueFGold = ref(0);
+//全部
const totalmoney = ref(0);
const totalRcoin = ref(0);
const totalFcoin = ref(0);
+//待审核
+const pendingGold = ref(0);
+const pendingRGold = ref(0);
+const pendingFGold = ref(0);
+// 已通过金币数
+const approvedGold = ref(0);
+const approvedRGold = ref(0);
+const approvedFGold = ref(0);
+// 已驳回金币数
+const rejectedGold = ref(0);
+const rejectedRGold = ref(0);
+const rejectedFGold = ref(0);
// 搜索==============================================================
// 搜索方法
const get = async function (val) {
@@ -134,18 +146,36 @@ const get = async function (val) {
totalmoney.value = 0;
totalRcoin.value = 0;
totalFcoin.value = 0;
- } else {
- // 做一个判断，如果result2.data[i].flag="待审核"，那么 totalData.value = result2.data[i]，否则就赋值为0
- for (let i = 0; i < result2.data.length; i++) {
- if (result2.data[i].flag == "已通过") {
- totalData.value = result2.data[i];
- totalmoney.value = totalData.value.sumRaudit1;
- totalRcoin.value = totalData.value.sumRaudit1;
- totalFcoin.value = totalData.value.sumRaudit2;
- break;
+ }
+ if (result2.data) {
+ result2.data.forEach((item) => {
+ switch (item.flag) {
+ case "待审核":
+ // 若 item.raudit 为空则赋值为 0
+ // 若 item.sumRaudit 为空则赋值为 0
+ pendingGold.value = item.sumRaudit || 0;
+ pendingRGold.value = item.sumRaudit1 || 0;
+ pendingFGold.value = item.sumRaudit2 || 0;
+ break;
+ case "已通过":
+ approvedGold.value = item.sumRaudit || 0;
+ approvedRGold.value = item.sumRaudit1 || 0;
+ approvedFGold.value = item.sumRaudit2 || 0;
+ break;
+ case "已驳回":
+ rejectedGold.value = item.sumRaudit || 0;
+ rejectedRGold.value = item.sumRaudit1 || 0;
+ rejectedFGold.value = item.sumRaudit2 || 0;
+ break;
}
- }
+ });
}
+ trueGold.value =
+ pendingGold.value + approvedGold.value + rejectedGold.value;
+ trueRGold.value =
+ pendingRGold.value + approvedRGold.value + rejectedRGold.value;
+ trueFGold.value =
+ pendingFGold.value + approvedFGold.value + rejectedFGold.value;
// 将响应结果存储到响应式数据中
console.log("请求成功", result);
@@ -236,24 +266,33 @@ const adminAll = function () {
get();
};
//待审核充值明细
-const adminWait = function () {
+const adminWait = async function () {
rechargeVo.value.status = 0;
getObj.value.pageNum = 1;
- get();
+ await get();
console.log("adminWait");
+ trueGold.value = pendingGold.value;
+ trueRGold.value = pendingRGold.value;
+ trueFGold.value = pendingFGold.value;
};
//已通过充值明细
-const adminPass = function () {
+const adminPass = async function () {
rechargeVo.value.status = 1;
getObj.value.pageNum = 1;
- get();
+ await get();
console.log("adminPass");
+ trueGold.value = approvedGold.value;
+ trueRGold.value = approvedRGold.value;
+ trueFGold.value = approvedFGold.value;
};
//已驳回充值明细
-const adminReject = function () {
+const adminReject = async function () {
rechargeVo.value.status = 2;
getObj.value.pageNum = 1;
- get();
+ await get();
+ trueGold.value = rejectedGold.value;
+ trueRGold.value = rejectedRGold.value;
+ trueFGold.value = rejectedFGold.value;
console.log("adminReject");
};
//点击标签页
@@ -472,11 +511,11 @@ const handleSortChange = (column) => {
-
+
diff --git a/gold-system/src/views/refund/addRefund.vue b/gold-system/src/views/refund/addRefund.vue
index 9f339a2..bde75bd 100644
--- a/gold-system/src/views/refund/addRefund.vue
+++ b/gold-system/src/views/refund/addRefund.vue
@@ -414,7 +414,7 @@ onMounted(async function () {
- {{ Number(user.totalRechargeGold) / 100 }}
+ {{ Number(user.totalRechargeGold / 100) }}
@@ -471,11 +471,11 @@ onMounted(async function () {
-
+
diff --git a/gold-system/src/views/refund/allRefund.vue b/gold-system/src/views/refund/allRefund.vue
index 261c874..2ff1792 100644
--- a/gold-system/src/views/refund/allRefund.vue
+++ b/gold-system/src/views/refund/allRefund.vue
@@ -533,13 +533,13 @@ const handleSortChange = (column) => {
-
+
{
row.jwcode, // 姓名
row.area, // 精网号
row.platform, // 所属地区
- row.count, // 平台信息
- row.updateType, // 更新数量
+ row.consumePlatform, // 平台信息
+ row.gold, // 更新数量
row.rechargeCoin, // 免费金币
row.freeCoin, // 永久金币
row.taskCoin, // 任务金币
diff --git a/gold-system/src/views/usergoldInfo/index.vue b/gold-system/src/views/usergoldInfo/index.vue
index e62dd90..3421ff3 100644
--- a/gold-system/src/views/usergoldInfo/index.vue
+++ b/gold-system/src/views/usergoldInfo/index.vue
@@ -275,11 +275,11 @@ onMounted(async function () {
-
+
" +
params.name +
- (params.value == getSumCoin.value.todayFree
+ (params.value == oneData.value.freegold
? "6月到期 | " +
- statistics.value.free6SumCoin +
+ oneData.value.sfreegold / 100 +
" ; 12月到期 | " +
- statistics.value.free12SumCoin
+ oneData.value.dfreegold / 100
: "")
);
},
@@ -1127,7 +1127,7 @@ onMounted(async function () {
{
name:
"当前金币余量(个)\n" +
- formatNum(Math.abs(getSumCoin.value.todayTotalCoin)),
+ formatNum(Math.abs(oneData.value.sumgold / 100)),
type: "pie",
radius: ["60%", "80%"],
avoidLabelOverlap: false,
@@ -1261,9 +1261,11 @@ onMounted(async function () {
>昨日新增消耗{{
formatNum(
Math.abs(
- threeData.yesterdayCoin !== undefined &&
- threeData.yesterdayCoin !== null
- ? threeData.yesterdayCoin / 100
+ threeData.yesterdayGold + threeData.yesterdayrefund !==
+ undefined &&
+ threeData.yesterdayGold + threeData.yesterdayrefund !== null
+ ? (threeData.yesterdayGold + threeData.yesterdayrefund) /
+ 100
: 0
)
)
@@ -1577,7 +1579,7 @@ onMounted(async function () {
-
+