diff --git a/vue/gold-system/src/views/audit/rechargeAudit.vue b/vue/gold-system/src/views/audit/rechargeAudit.vue
index 11a348d..41eb2d0 100644
--- a/vue/gold-system/src/views/audit/rechargeAudit.vue
+++ b/vue/gold-system/src/views/audit/rechargeAudit.vue
@@ -22,7 +22,7 @@ const rechargeVo = ref({});
// 搜索对象
const getObj = ref({
pageNum: 1,
- pageSize: 5,
+ pageSize: 10,
});
//分页总条目
const total = ref(100);
diff --git a/vue/gold-system/src/views/audit/refundAudit.vue b/vue/gold-system/src/views/audit/refundAudit.vue
index ddbba6d..69fe3c4 100644
--- a/vue/gold-system/src/views/audit/refundAudit.vue
+++ b/vue/gold-system/src/views/audit/refundAudit.vue
@@ -22,7 +22,7 @@ const consumeDetail = ref({});
// 搜索对象
const getObj = ref({
pageNum: 1,
- pageSize: 5,
+ pageSize: 10,
});
//分页总条目
const total = ref(100);
diff --git a/vue/gold-system/src/views/consume/allConsume.vue b/vue/gold-system/src/views/consume/allConsume.vue
index 5b982e1..d3c20bc 100644
--- a/vue/gold-system/src/views/consume/allConsume.vue
+++ b/vue/gold-system/src/views/consume/allConsume.vue
@@ -354,19 +354,27 @@ getGoods();
>
{{
- scope.row.taskCoin +
- scope.row.freeCoin +
- scope.row.rechargeCoin
+ scope.row.taskCoin * -1 +
+ scope.row.freeCoin * -1 +
+ scope.row.rechargeCoin * -1
}}
-
-
-
+
+
+ {{ scope.row.taskCoin * -1 }}
+
+
+
+
+ {{ scope.row.freeCoin * -1 }}
+
+
+
+ {{ scope.row.rechargeCoin * -1 }}
+
+
item == ""
? (ERPData.value[index] = {
- value: 0,
- name: "第" + (index + 1) + "学科" + 0,
- })
+ value: 0,
+ name: "第" + (index + 1) + "学科" + 0,
+ })
: (ERPData.value[index] = {
- value: item[0],
- name: "第" + (index + 1) + "学科" + item[0],
- })
+ value: item[0],
+ name: "第" + (index + 1) + "学科" + item[0],
+ })
);
console.log("ERPData", ERPData.value);
HCData.value = [
@@ -237,13 +237,13 @@ const get = async function () {
HCData.value.forEach((item, index) =>
item == ""
? (HCData.value[index] = {
- value: 0,
- name: "第" + (index + 1) + "学科" + 0,
- })
+ value: 0,
+ name: "第" + (index + 1) + "学科" + 0,
+ })
: (HCData.value[index] = {
- value: item[0],
- name: "第" + (index + 1) + "学科" + item[0],
- })
+ value: item[0],
+ name: "第" + (index + 1) + "学科" + item[0],
+ })
);
console.log("HCData", HCData.value);
LinkData.value = [
@@ -263,13 +263,13 @@ const get = async function () {
LinkData.value.forEach((item, index) =>
item == ""
? (LinkData.value[index] = {
- value: 0,
- name: "第" + (index + 1) + "学科" + 0,
- })
+ value: 0,
+ name: "第" + (index + 1) + "学科" + 0,
+ })
: (LinkData.value[index] = {
- value: item[0],
- name: "第" + (index + 1) + "学科" + item[0],
- })
+ value: item[0],
+ name: "第" + (index + 1) + "学科" + item[0],
+ })
);
console.log("LinkData", LinkData.value);
goldData.value = [
@@ -289,13 +289,13 @@ const get = async function () {
goldData.value.forEach((item, index) =>
item == ""
? (goldData.value[index] = {
- value: 0,
- name: "第" + (index + 1) + "学科" + 0,
- })
+ value: 0,
+ name: "第" + (index + 1) + "学科" + 0,
+ })
: (goldData.value[index] = {
- value: item[0],
- name: "第" + (index + 1) + "学科" + item[0],
- })
+ value: item[0],
+ name: "第" + (index + 1) + "学科" + item[0],
+ })
);
console.log("goldData", goldData.value);
allData.value = [
@@ -365,7 +365,7 @@ const get = async function () {
// 获取中间柱状图数据
const getMiddleBar = async function () {
const result = await API.post(
- "http://192.168.8.93:10010/statistics/getCoinTime",
+ "http://192.168.8.147:10010/statistics/getCoinTime",
getMiddleBarObj.value
);
@@ -373,14 +373,18 @@ const getMiddleBar = async function () {
console.log("getMiddleBarData", getMiddleBarData.value);
// 柱状图数据处理
- middleCategory.value = getMiddleBarData.value
- .map((item) => item.day == null ? item.month : item.day.substring(0, 10));
- middleRecharge.value = getMiddleBarData.value
- .map((item) => Math.abs(item.rechargeSumCoin));
- middleFree.value = getMiddleBarData.value
- .map((item) => Math.abs(item.freeSumCoin));
- middleTask.value = getMiddleBarData.value
- .map((item) => Math.abs(item.taskSumCoin));
+ middleCategory.value = getMiddleBarData.value.map((item) =>
+ item.day == null ? item.month : item.day.substring(0, 10)
+ );
+ middleRecharge.value = getMiddleBarData.value.map((item) =>
+ Math.abs(item.rechargeSumCoin)
+ );
+ middleFree.value = getMiddleBarData.value.map((item) =>
+ Math.abs(item.freeSumCoin)
+ );
+ middleTask.value = getMiddleBarData.value.map((item) =>
+ Math.abs(item.taskSumCoin)
+ );
middleTotalRecharge.value = 0;
middleTotalFree.value = 0;
@@ -694,28 +698,28 @@ const allTime = function () {
search();
};
// 时间选择器
-const changeTime=function(){
- console.log("changeTimeRatio",changeTimeRatio.value);
- if(changeTimeRatio.value=="allDays"){
+const changeTime = function () {
+ console.log("changeTimeRatio", changeTimeRatio.value);
+ if (changeTimeRatio.value == "allDays") {
allTime();
- }else if(changeTimeRatio.value=="week"){
+ } else if (changeTimeRatio.value == "week") {
thisWeek();
- }else if(changeTimeRatio.value=="month"){
+ } else if (changeTimeRatio.value == "month") {
thisMonth();
- }else if(changeTimeRatio.value=="year"){
+ } else if (changeTimeRatio.value == "year") {
thisYear();
- }else if(changeTimeRatio.value=="day"){
+ } else if (changeTimeRatio.value == "day") {
today();
}
-}
+};
// 根据时间搜索
const search = function () {
console.log(
"searchTime",
moment(searchTime.value[0]).format("YYYY-MM-DD") +
- "至" +
- moment(searchTime.value[1]).format("YYYY-MM-DD")
+ "至" +
+ moment(searchTime.value[1]).format("YYYY-MM-DD")
);
getMiddleBarObj.value.searchStartTime = moment(searchTime.value[0]).format(
@@ -1085,26 +1089,37 @@ onMounted(async function () {
较前一天 {{ formatNum(getSumCoin.coinDifference) }}
-
+
较前一天 {{ formatNum(getSumCoin.coinDifference) }}
-
+
较前一天 {{ formatNum(getSumCoin.coinDifference) }}
-
+
- 充值{{ formatNum(getSumCoin.todayRecharge) }} 免费{{
- formatNum(getSumCoin.todayFree)
- }}
- 任务{{ formatNum(getSumCoin.todayTask) }}
+ 充值{{ formatNum(getSumCoin.todayRecharge) }} 免费{{
+ formatNum(getSumCoin.todayFree)
+ }}
+ 任务{{ formatNum(getSumCoin.todayTask) }}
@@ -1114,9 +1129,11 @@ onMounted(async function () {
{{ formatNum(Math.abs(statistics.totalSumCoin)) }}
- 折合新币累计金额 {{ formatNum(Math.abs(statistics.rechargeSumCoin)) }}
+ 折合新币累计金额
+ {{ formatNum(Math.abs(statistics.rechargeSumCoin)) }}
- 昨日新增
+ 昨日新增
{{ formatNum(Math.abs(statistics.totalYesterdaySumCoin)) }}
,其中充值
{{ formatNum(Math.abs(statistics.rechargeYesterdaySumCoin)) }}
@@ -1133,10 +1150,12 @@ onMounted(async function () {
消费 {{ formatNum(Math.abs(getYearConsumeCoin.yearConsumeCoin)) }};
退款 {{ formatNum(Math.abs(getYearConsumeCoin.yearRefundCoin)) }}
- 昨日新增消耗
+ 昨日新增消耗
{{ formatNum(Math.abs(getDayConsumeCoin.daysumCoin)) }} ; 消费
{{ formatNum(Math.abs(getDayConsumeCoin.dayConsumeCoin)) }} ; 退款
- {{ formatNum(Math.abs(getDayConsumeCoin.dayRefundCoin)) }}
+ {{ formatNum(Math.abs(getDayConsumeCoin.dayRefundCoin)) }}
@@ -1149,46 +1168,66 @@ onMounted(async function () {
周同比 {{ statistics.weekOverWeekRate }}%
-
+
周同比 {{ statistics.weekOverWeekRate }}%
-
+
周同比 {{ statistics.weekOverWeekRate }}%
-
+
日环比{{ statistics.dayOverDayRate }}%
-
+
日环比{{ statistics.dayOverDayRate }}%
-
+
日环比{{ statistics.dayOverDayRate }}%
-
+
- 昨日充值人数
+ 昨日充值人数
{{ formatNum(Math.abs(statistics.rechargeCountYesterday)) }}
,其中首充
{{ formatNum(Math.abs(statistics.firstRechargeCountYesterday)) }}
- 人
+ 人
@@ -1196,23 +1235,59 @@ onMounted(async function () {
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
+
合计:充值金币:
@@ -1249,15 +1324,31 @@ onMounted(async function () {
-
+
{{
index + 1
@@ -1308,15 +1399,31 @@ onMounted(async function () {
-
+
{{
index + 1
@@ -1355,8 +1462,14 @@ onMounted(async function () {