diff --git a/gold-system/package-lock.json b/gold-system/package-lock.json index ff3fee8..4d481a3 100644 --- a/gold-system/package-lock.json +++ b/gold-system/package-lock.json @@ -29,6 +29,7 @@ "@types/vue": "^2.0.0", "@vitejs/plugin-legacy": "^6.0.2", "@vitejs/plugin-vue": "^5.1.4", + "file-saver": "^2.0.5", "rollup-plugin-visualizer": "^5.14.0", "sass": "^1.86.3", "terser": "^5.38.1", @@ -3642,6 +3643,12 @@ "node": ">=0.10.0" } }, + "node_modules/file-saver": { + "version": "2.0.5", + "resolved": "https://registry.npmmirror.com/file-saver/-/file-saver-2.0.5.tgz", + "integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==", + "dev": true + }, "node_modules/fill-range": { "version": "7.1.1", "resolved": "https://registry.npmmirror.com/fill-range/-/fill-range-7.1.1.tgz", diff --git a/gold-system/package.json b/gold-system/package.json index c0825f0..a47c39c 100644 --- a/gold-system/package.json +++ b/gold-system/package.json @@ -33,6 +33,7 @@ "@types/vue": "^2.0.0", "@vitejs/plugin-legacy": "^6.0.2", "@vitejs/plugin-vue": "^5.1.4", + "file-saver": "^2.0.5", "rollup-plugin-visualizer": "^5.14.0", "sass": "^1.86.3", "terser": "^5.38.1", diff --git a/gold-system/src/views/audit/rechargeAudit.vue b/gold-system/src/views/audit/rechargeAudit.vue index 414a3dd..d54379d 100644 --- a/gold-system/src/views/audit/rechargeAudit.vue +++ b/gold-system/src/views/audit/rechargeAudit.vue @@ -515,6 +515,7 @@ onMounted(async function () { await getAdminData() await getActivity() await get() + await getArea() }) // 新增排序字段和排序方式 const sortField = ref('') diff --git a/gold-system/src/views/goldBeen/goldenBeenConsum.vue b/gold-system/src/views/goldBeen/goldenBeenConsum.vue index b178a89..5ba635f 100644 --- a/gold-system/src/views/goldBeen/goldenBeenConsum.vue +++ b/gold-system/src/views/goldBeen/goldenBeenConsum.vue @@ -85,7 +85,7 @@
-

金豆总数:充值金豆总数:合计新币数

+

合计数:实际用户金豆数:

- - - - - - - + + - + - + - - - + - @@ -151,42 +123,32 @@ }} + + +
@@ -256,7 +218,15 @@ const search = function () {} const reset = function (formEl) { formEl.resetFields() } - +const handlePageSizeChange = (val) => { + getObj.value.pageSize = val + getObj.value.pageNum = 1 + getInit({}) +} +const handleCurrentChange = function (val) { + getObj.value.pageNum = val + getInit({}) +} // 挂载 getInit({}) diff --git a/gold-system/src/views/goldBeen/goldenBeenDetail.vue b/gold-system/src/views/goldBeen/goldenBeenDetail.vue index 454ff8a..bf98a9e 100644 --- a/gold-system/src/views/goldBeen/goldenBeenDetail.vue +++ b/gold-system/src/views/goldBeen/goldenBeenDetail.vue @@ -66,24 +66,27 @@ type="daterange" start-placeholder="开始日期" end-placeholder="结束日期" - value-format="yyyy-MM-dd HH:mm:ss" style="width: 240px" + format="YYYY-MM-DD" + value-format="YYYY-MM-DD" + :unlinkPanels="true" /> 查询 重置 - 导出excel + 导出excel
-

金豆总数:充值金豆总数:合计新币数

+

金豆总数:充值金豆总数:合计金额数