+
- {{ 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) => {
-
+
-import { ref, onMounted, reactive, computed } from 'vue'
-import ElementPlus from 'element-plus'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import axios from 'axios'
-import moment from 'moment'
-import { ta } from 'element-plus/es/locales.mjs'
-import API from '../../api/index.js'
-import * as XLSX from 'xlsx'
+import { ref, onMounted, reactive, computed } from "vue";
+import ElementPlus from "element-plus";
+import { ElMessage, ElMessageBox } from "element-plus";
+import axios from "axios";
+import moment from "moment";
+import { ta } from "element-plus/es/locales.mjs";
+import API from "../../api/index.js";
+import * as XLSX from "xlsx";
// 变量
//这是获取用户信息的接口
-const adminData = ref({})
+const adminData = ref({});
const getAdminData = async function () {
try {
const result = await API.post(
- 'http://54.251.137.151:10702/admin/userinfo',
+ "http://54.251.137.151:10702/admin/userinfo",
{}
- )
- adminData.value = result
- console.log('请求成功', result)
- console.log('用户信息', adminData.value)
+ );
+ adminData.value = result;
+ console.log("请求成功", result);
+ console.log("用户信息", adminData.value);
} catch (error) {
- console.log('请求失败', error)
+ console.log("请求失败", error);
}
-}
+};
// 充值明细表格
-const tableData = ref([])
+const tableData = ref([]);
// 计算用户各金币总数的不分页对象
-const tableAllData = ref([])
+// const tableAllData = ref([]);
// 各金币总数
-const rechargeCoin = ref(0)
-const freeCoin = ref(0)
-const taskCoin = ref(0)
+const rechargeCoin = ref(0);
+const freeCoin = ref(0);
+const taskCoin = ref(0);
// 搜索===========================================
//分页总条目
-const total = ref(100)
+const total = ref(100);
// 搜索对象时间
-const getTime = ref([])
+const getTime = ref([]);
// 搜索detailY
-const detailY = ref({})
+const detailY = ref({});
// 不分页的搜索对象
-const getAllObj = ref({})
+const getAllObj = ref({});
// 搜索对象
const getObj = ref({
pageNum: 1,
- pageSize: 50
-})
+ pageSize: 50,
+});
//开启条件筛选导出excel
-const getPutEX = ref(false)
+const getPutEX = ref(false);
// 支付方式选项
const num = [
{
- value: '1',
- label: '增加'
+ value: "1",
+ label: "增加",
},
{
- value: '2',
- label: '减少'
- }
-]
+ value: "2",
+ label: "减少",
+ },
+];
// //表格高度
// const tableHeight = computed(function () {
@@ -71,173 +71,180 @@ const num = [
const get = async function (val) {
try {
// 地区赋值
- if (adminData.value.area === '泰国') {
- detailY.value.areas = ['泰国', '越南']
- } else if (adminData.value.area !== '总部') {
- detailY.value.area = adminData.value.area
+ if (adminData.value.area === "泰国") {
+ detailY.value.areas = ["泰国", "越南"];
+ } else if (adminData.value.area !== "总部") {
+ detailY.value.area = adminData.value.area;
}
// 搜索参数页码赋值
- if (typeof val === 'number') {
- getObj.value.pageNum = val
+ if (typeof val === "number") {
+ getObj.value.pageNum = val;
}
// 搜索参数时间赋值
if (getTime.value != null) {
- if (getTime.value.startDate != '' && getTime.value.endDate != '') {
- detailY.value.startDate = getTime.value[0]
- detailY.value.endDate = getTime.value[1]
+ if (getTime.value.startDate != "" && getTime.value.endDate != "") {
+ detailY.value.startDate = getTime.value[0];
+ detailY.value.endDate = getTime.value[1];
}
} else {
- detailY.value.startDate = ''
- detailY.value.endDate = ''
+ detailY.value.startDate = "";
+ detailY.value.endDate = "";
}
// 添加排序字段和排序方式到请求参数
- detailY.value.sortField = sortField.value
- detailY.value.sortOrder = sortOrder.value
- console.log('搜索参数', getObj.value)
+ detailY.value.sortField = sortField.value;
+ detailY.value.sortOrder = sortOrder.value;
+ console.log("搜索参数", getObj.value);
// 发送POST请求
- const result = await API.post('http://54.251.137.151:10702/detailY', {
+ const result = await API.post("http://54.251.137.151:10702/detailY", {
...getObj.value,
- detailY: { ...detailY.value }
- })
- const result2 = await API.post('http://54.251.137.151:10702/detailY', {
- ...getAllObj.value,
- detailY: { ...detailY.value }
- })
+ detailY: { ...detailY.value },
+ });
+ // const result2 = await API.post("http://54.251.137.151:10702/detailY", {
+ // ...getAllObj.value,
+ // detailY: { ...detailY.value },
+ // });
// 将响应结果存储到响应式数据中
- console.log('请求成功', result)
- console.log('请求成功2', result2)
+ console.log("请求成功", result);
+ // console.log("请求成功2", result2);
// 存储表格数据
- tableData.value = result.data.list
- console.log('tableData', tableData.value)
- tableAllData.value = result2.data
- console.log('tableAllData', tableAllData.value)
+ tableData.value = result.data.list;
+ console.log("tableData", tableData.value);
+ // tableAllData.value = result2.data;
+ // console.log("tableAllData", tableAllData.value);
// 存储分页总数
- total.value = result.data.total
- console.log('total', total.value)
+ total.value = result.data.total;
+ console.log("total", total.value);
// 计算各金币总数并除以100
// 下列各数除以100，并最多显示两位小数
- rechargeCoin.value = parseFloat((tableAllData.value.sumR / 100).toFixed(2))
- freeCoin.value = parseFloat((tableAllData.value.sumF / 100).toFixed(2))
- taskCoin.value = parseFloat((tableAllData.value.sumT / 100).toFixed(2))
+ // rechargeCoin.value = parseFloat((tableAllData.value.sumR / 100).toFixed(2));
+ // freeCoin.value = parseFloat((tableAllData.value.sumF / 100).toFixed(2));
+ // taskCoin.value = parseFloat((tableAllData.value.sumT / 100).toFixed(2));
// for (let i = 0; i < tableAllData.value.length; i++) {
// rechargeCoin.value += tableAllData.value[i].rechargeCoin;
// freeCoin.value += tableAllData.value[i].freeCoin;
// taskCoin.value += tableAllData.value[i].taskCoin;
// }
- console.log(
- '各金币总数',
- rechargeCoin.value,
- freeCoin.value,
- taskCoin.value
- )
+ // console.log(
+ // "各金币总数",
+ // rechargeCoin.value,
+ // freeCoin.value,
+ // taskCoin.value
+ // );
} catch (error) {
- console.log('请求失败', error)
+ console.log("请求失败", error);
// 在这里可以处理错误逻辑，比如显示错误提示等
}
-}
+};
// 搜索
const search = function () {
- getObj.value.pageNum = 1
- get()
-}
+ getObj.value.pageNum = 1;
+ get();
+};
// 重置
const reset = function () {
- detailY.value.jwcode = ''
- detailY.value.num = ''
- detailY.value.startDate = ''
- detailY.value.endDate = ''
- detailY.value.area = ''
- sortField.value = ''
- sortOrder.value = ''
- getTime.value = {}
- //重置平台信息
- detailY.value.consumePlatform = ''
-}
+ // 删除精网号字段
+ delete detailY.value.jwcode;
+ // 删除更新类型字段
+ delete detailY.value.num;
+ // 删除开始时间字段
+ delete detailY.value.startDate;
+ // 删除结束时间字段
+ delete detailY.value.endDate;
+ // 删除所属地区字段
+ delete detailY.value.area;
+ delete sortField.value;
+ delete sortOrder.value;
+ getTime.value = {};
+ // 删除平台信息字段
+ delete detailY.value.consumePlatform;
+};
// 今天
const getToday = function () {
- const today = new Date()
+ const today = new Date();
const startDate = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate()
- )
+ );
const endDate = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate() + 1
- )
- getTime.value = [startDate, endDate]
- console.log('getTime', getTime.value)
- get()
-}
+ );
+ getTime.value = [startDate, endDate];
+ console.log("getTime", getTime.value);
+ get();
+};
// 昨天
const getYesterday = function () {
- const yesterday = new Date()
- yesterday.setDate(yesterday.getDate() - 1)
+ const yesterday = new Date();
+ yesterday.setDate(yesterday.getDate() - 1);
const startDate = new Date(
yesterday.getFullYear(),
yesterday.getMonth(),
yesterday.getDate()
- )
+ );
const endDate = new Date(
yesterday.getFullYear(),
yesterday.getMonth(),
yesterday.getDate() + 1
- )
- getTime.value = [startDate, endDate]
- console.log('getTime', getTime.value)
- get()
-}
+ );
+ getTime.value = [startDate, endDate];
+ console.log("getTime", getTime.value);
+ get();
+};
// 近7天
const get7Days = function () {
- const today = new Date()
+ const today = new Date();
const startDate = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate() - 6
- )
+ );
const endDate = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate() + 1
- )
- getTime.value = [startDate, endDate]
- console.log('getTime', getTime.value)
- get()
-}
+ );
+ getTime.value = [startDate, endDate];
+ console.log("getTime", getTime.value);
+ get();
+};
// 验证跳转输入框的数字是否合法
const checkNumber = function () {
- if (typeof parseInt(getObj.value.pageNum) === 'number') {
- console.log('总共有多少页' + Math.ceil(total.value / getObj.value.pageSize))
+ if (typeof parseInt(getObj.value.pageNum) === "number") {
+ console.log(
+ "总共有多少页" + Math.ceil(total.value / getObj.value.pageSize)
+ );
if (
getObj.value.pageNum > 0 &&
getObj.value.pageNum <= Math.ceil(total.value / getObj.value.pageSize)
) {
- getObj.value.pageNum = parseInt(getObj.value.pageNum)
- console.log('输入的数字合法')
- get()
+ getObj.value.pageNum = parseInt(getObj.value.pageNum);
+ console.log("输入的数字合法");
+ get();
} else {
//提示
ElMessage({
- type: 'error',
- message: '请检查输入内容'
- })
+ type: "error",
+ message: "请检查输入内容",
+ });
}
} else {
//提示
ElMessage({
- type: 'error',
- message: '请检查输入内容'
- })
+ type: "error",
+ message: "请检查输入内容",
+ });
}
-}
+};
// 挂载
onMounted(async function () {
- await getAdminData()
- await get()
-})
+ await getAdminData();
+ await get();
+});
// 这是导出excel表格的方法
// 导出Excel的方法
@@ -247,251 +254,251 @@ const json_fields = (row) => {
row.jwcode, // 姓名
row.area, // 精网号
row.platform, // 所属地区
- row.count, // 平台信息
- row.updateType, // 更新数量
+ row.consumePlatform, // 平台信息
+ row.gold, // 更新数量
row.rechargeCoin, // 免费金币
row.freeCoin, // 永久金币
row.taskCoin, // 任务金币
row.createAdmin, // 提交人
row.createTime,
row.name,
- row.id
- ]
-}
+ row.id,
+ ];
+};
// 定义元数据
const json_meta = [
[
{
- key: 'charset',
- value: 'utf-8'
- }
- ]
-]
+ key: "charset",
+ value: "utf-8",
+ },
+ ],
+];
const headers = [
- '精网号',
- '地区',
- '平台信息',
- '数量',
- '更新类型',
- '永久金币',
- '免费金币',
- '任务金币',
- '提交人',
- '更新时间',
- '用户名',
- 'id'
-]
+ "精网号",
+ "地区",
+ "平台信息",
+ "数量",
+ "更新类型",
+ "永久金币",
+ "免费金币",
+ "任务金币",
+ "提交人",
+ "更新时间",
+ "用户名",
+ "id",
+];
const exportExcel = () => {
// 先将 json_fields 应用到数据上
- const data = excelInfo.value.map(json_fields)
- const ws = XLSX.utils.aoa_to_sheet(data)
+ const data = excelInfo.value.map(json_fields);
+ const ws = XLSX.utils.aoa_to_sheet(data);
// 添加表头到工作表
- XLSX.utils.sheet_add_aoa(ws, [headers], { origin: 'A1' })
- const wb = XLSX.utils.book_new()
- XLSX.utils.book_append_sheet(wb, ws, 'Sheet1')
- XLSX.writeFile(wb, '客户金币明细.xlsx')
-}
-const today = new Date()
+ XLSX.utils.sheet_add_aoa(ws, [headers], { origin: "A1" });
+ const wb = XLSX.utils.book_new();
+ XLSX.utils.book_append_sheet(wb, ws, "Sheet1");
+ XLSX.writeFile(wb, "客户金币明细.xlsx");
+};
+const today = new Date();
const startDate = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate()
-)
+);
const endDate = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate() + 1
-)
+);
const putExcel = ref({
startDate: startDate,
- endDate: endDate
-})
-const excelInfo = ref({})
-const loading = ref(false)
+ endDate: endDate,
+});
+const excelInfo = ref({});
+const loading = ref(false);
const areyour = async function () {
try {
- loading.value = true
+ loading.value = true;
const result = await API.post(
- 'http://54.251.137.151:10702/detailY/searchAll',
+ "http://54.251.137.151:10702/detailY/searchAll",
{
- ...putExcel.value
+ ...putExcel.value,
}
- )
- excelInfo.value = result.data
+ );
+ excelInfo.value = result.data;
// 处理 excelInfo 中的数据
if (Array.isArray(excelInfo.value)) {
excelInfo.value.forEach((item) => {
if (item.rechargeCoin) {
- item.rechargeCoin = item.rechargeCoin / 100
+ item.rechargeCoin = item.rechargeCoin / 100;
}
if (item.freeCoin) {
- item.freeCoin = item.freeCoin / 100
+ item.freeCoin = item.freeCoin / 100;
}
if (item.taskCoin) {
- item.taskCoin = item.taskCoin / 100
+ item.taskCoin = item.taskCoin / 100;
}
- })
+ });
}
- areyouright.value = true
+ areyouright.value = true;
ElMessage({
- type: 'success',
- message: '查询成功'
- })
- loading.value = false
+ type: "success",
+ message: "查询成功",
+ });
+ loading.value = false;
} catch (error) {
- console.log('请求失败', error)
- loading.value = false
+ console.log("请求失败", error);
+ loading.value = false;
}
-}
+};
-const areyouright = ref(false)
+const areyouright = ref(false);
//选地区
const area = [
{
- value: '马来西亚',
- label: '马来西亚'
+ value: "马来西亚",
+ label: "马来西亚",
},
{
- value: '新加坡',
- label: '新加坡'
+ value: "新加坡",
+ label: "新加坡",
},
{
- value: '香港',
- label: '香港'
+ value: "香港",
+ label: "香港",
},
{
- value: '泰国',
- label: '泰国'
+ value: "泰国",
+ label: "泰国",
},
{
- value: '加拿大',
- label: '加拿大'
+ value: "加拿大",
+ label: "加拿大",
},
{
- value: '越南HCM',
- label: '越南HCM'
- }
-]
+ value: "越南HCM",
+ label: "越南HCM",
+ },
+];
//选消费平台
const platform = [
{
- value: '4',
- label: '金币系统'
+ value: "4",
+ label: "金币系统",
},
{
- value: '1',
- label: 'ERP系统'
+ value: "1",
+ label: "ERP系统",
},
{
- value: '2',
- label: 'Homily Chart'
+ value: "2",
+ label: "Homily Chart",
},
{
- value: '3',
- label: 'Homily Link'
+ value: "3",
+ label: "Homily Link",
},
{
- value: '0',
- label: '初始化金币'
- }
-]
-const TimeGet = ref('1')
+ value: "0",
+ label: "初始化金币",
+ },
+];
+const TimeGet = ref("1");
// 今天
const getT = function () {
- const today = new Date()
+ const today = new Date();
const startDate = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate()
- )
+ );
const endDate = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate() + 1
- )
- putExcel.value.startDate = startDate
- putExcel.value.endDate = endDate
- console.log('putExcel', putExcel.value)
-}
+ );
+ putExcel.value.startDate = startDate;
+ putExcel.value.endDate = endDate;
+ console.log("putExcel", putExcel.value);
+};
//3天
const get3 = function () {
- const today = new Date()
+ const today = new Date();
const startDate = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate() - 2
- )
+ );
const endDate = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate() + 1
- )
- putExcel.value.startDate = startDate
- putExcel.value.endDate = endDate
- console.log('putExcel', putExcel.value)
-}
+ );
+ putExcel.value.startDate = startDate;
+ putExcel.value.endDate = endDate;
+ console.log("putExcel", putExcel.value);
+};
// 7天
const get7 = function () {
- const today = new Date()
+ const today = new Date();
const startDate = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate() - 6
- )
+ );
const endDate = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate() + 1
- )
- putExcel.value.startDate = startDate
- putExcel.value.endDate = endDate
- console.log('putExcel', putExcel.value)
-}
+ );
+ putExcel.value.startDate = startDate;
+ putExcel.value.endDate = endDate;
+ console.log("putExcel", putExcel.value);
+};
// 30天
const get30 = function () {
- const today = new Date()
+ const today = new Date();
const startDate = new Date(
today.getFullYear(),
today.getMonth() - 1,
today.getDate()
- )
+ );
const endDate = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate() + 1
- )
- putExcel.value.startDate = startDate
- putExcel.value.endDate = endDate
- console.log('putExcel', putExcel.value)
-}
+ );
+ putExcel.value.startDate = startDate;
+ putExcel.value.endDate = endDate;
+ console.log("putExcel", putExcel.value);
+};
// 新增排序字段和排序方式
-const sortField = ref('')
-const sortOrder = ref('')
+const sortField = ref("");
+const sortOrder = ref("");
// 处理排序事件
const handleSortChange = (column) => {
- console.log('排序字段：', column.prop)
- console.log('排序方式：', column.order)
- if (column.prop === 'rechargeCoin') {
- sortField.value = 'recharge_coin'
- } else if (column.prop === 'taskCoin') {
- sortField.value = 'task_coin'
- } else if (column.prop === 'freeCoin') {
- sortField.value = 'free_coin'
- } else if (column.prop === 'createTime') {
- sortField.value = 'create_time'
- } else if (column.prop === 'gold') {
- sortField.value = 'gold'
+ console.log("排序字段：", column.prop);
+ console.log("排序方式：", column.order);
+ if (column.prop === "rechargeCoin") {
+ sortField.value = "recharge_coin";
+ } else if (column.prop === "taskCoin") {
+ sortField.value = "task_coin";
+ } else if (column.prop === "freeCoin") {
+ sortField.value = "free_coin";
+ } else if (column.prop === "createTime") {
+ sortField.value = "create_time";
+ } else if (column.prop === "gold") {
+ sortField.value = "gold";
}
- sortOrder.value = column.order === 'ascending' ? 'ASC' : 'DESC'
- get()
-}
+ sortOrder.value = column.order === "ascending" ? "ASC" : "DESC";
+ get();
+};
@@ -778,7 +785,7 @@ const handleSortChange = (column) => {
>
{{
- moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss')
+ moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss")
}}
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 () {
-
+