diff --git a/.env.development b/.env.development index f7965ab..4a254d4 100644 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ -VITE_API_BASE='https://hwjb.homilychart.com/dev/admin' +# VITE_API_BASE='https://hwjb.homilychart.com/dev/admin' # 测试环境 # VITE_API_BASE='http://54.255.212.181:10704/' # 正式环境 @@ -11,6 +11,6 @@ VITE_UPLOAD_URL=http://39.101.133.168:8828/hljw/api/aws/upload # zhangyong # VITE_API_BASE='http://192.168.3.83:8081/' # 本地 -# VITE_API_BASE='http://localhost:8081/' +VITE_API_BASE='http://localhost:8081/' # sunjiabei # VITE_API_BASE='http://192.168.0.113:8081/' \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index fdd8a82..d750fce 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -240,6 +240,12 @@ const routes = [ component: () => import("../views/usergold/bean/userbean.vue"), meta:{ permissionId: 45 } }, + { + path: '/history', + name: "history", + component: () => import("../views/history/history.vue"), + meta:{ permissionId: [56,57] } + }, // 权限管理 { diff --git a/src/utils/menuTreePermission.js b/src/utils/menuTreePermission.js index 356381d..60ec710 100644 --- a/src/utils/menuTreePermission.js +++ b/src/utils/menuTreePermission.js @@ -10,6 +10,8 @@ export const permissionMapping = { Consumption_Management: 6, // 消耗管理 Refund_Management: 7, // 退款管理 Customer_Account_Details: 8, // 客户账户明细 + History: 56, // 历史数据查询 + Permission_Management: 9, // 权限管理 @@ -61,6 +63,9 @@ export const permissionMapping = { Recharge_Audit: 31, // 充值审核(金币) // audit页面 Refund_Audit: 32, // 退款审核(金币) // audit页面, + History_Query: 57, // 历史数据查询 + + // 新增的金豆相关权限 Submit_Golden_Bean_Recharge: 46, // 提交金豆充值 View_Golden_Bean_System_Recharge_Details: 47, // 查看金豆系统充值明细 diff --git a/src/utils/menuUtils.js b/src/utils/menuUtils.js index e516cfd..3c9877a 100644 --- a/src/utils/menuUtils.js +++ b/src/utils/menuUtils.js @@ -61,6 +61,9 @@ export const getRoutePath = (menu) => { '金币退款': '/coinRefund', // '金豆退款': '/beanRefund', + '历史数据查询': '/history', + + '权限管理': '/permissions', diff --git a/src/views/audit/gold/rechargeAudit.vue b/src/views/audit/gold/rechargeAudit.vue index 39a3a19..463f905 100644 --- a/src/views/audit/gold/rechargeAudit.vue +++ b/src/views/audit/gold/rechargeAudit.vue @@ -64,7 +64,6 @@ - diff --git a/src/views/audit/gold/refundAudit.vue b/src/views/audit/gold/refundAudit.vue index a7a1325..b40f1c7 100644 --- a/src/views/audit/gold/refundAudit.vue +++ b/src/views/audit/gold/refundAudit.vue @@ -46,8 +46,8 @@
总条数:{{ format3(stats.totalNum) }}条     - 退款总金币数:{{ format3(stats.permanentGolds + stats.freeGolds + stats.taskGolds) }}金币     - 永久金币:{{ format3(stats.permanentGolds) }}金币     + 退款总金币数:{{ format3((stats.permanentGolds + stats.freeGolds + stats.taskGolds).toFixed(2)) }}金币     + 永久金币:{{ format3(stats.permanentGolds.toFixed(2)) }}金币     免费金币:{{ format3(stats.freeGolds.toFixed(2)) }}金币     任务金币:{{ format3(stats.taskGolds.toFixed(2)) }}金币
@@ -101,7 +101,7 @@
- + @@ -303,7 +303,6 @@ const get = async function (val) { // 通过 const handleApprove = async (row) => { if (findMenuById(menuTree.value, permissionMapping.Refund_Approval)) { - try { const params = { orderCode: row.orderCode, diff --git a/src/views/consume/gold/addCoinConsume.vue b/src/views/consume/gold/addCoinConsume.vue index b7a8ea4..c2ea7c8 100644 --- a/src/views/consume/gold/addCoinConsume.vue +++ b/src/views/consume/gold/addCoinConsume.vue @@ -1,12 +1,14 @@ + + +.pagination { + display: flex; + margin-top: 0.5vh; +} + \ No newline at end of file diff --git a/src/views/usergold/bean/userbean.vue b/src/views/usergold/bean/userbean.vue index 848eade..ebb7794 100644 --- a/src/views/usergold/bean/userbean.vue +++ b/src/views/usergold/bean/userbean.vue @@ -9,7 +9,8 @@
重置 - 查询 + 查询 +
@@ -149,7 +150,7 @@ const handleSortChange = (column) => { } searchObj.value.sortOrder = column.order === 'ascending' ? 'asc' : 'desc' console.log('排序字段:', searchObj.value.sortField,'排序方式:', searchObj.value.sortOrder) - get() + search() } const getmarkets = async () => { try { @@ -168,23 +169,27 @@ const trim = () => { const reset = function () { searchObj.value.jwcode = '' searchObj.value.dept = '' - get() + search() } const handlePageSizeChange = function (val) { pagination.value.pageSize = val - get() + search() } const handleCurrentChange = function (val) { pagination.value.pageNum = val - get() + search() } const format3 = (num) => { // 每三位添加逗号 return num.toLocaleString('en-US') } +const search = () => { + get() + getStats() +} onMounted(() => { - get() + search() getmarkets() getStats() console.log('页面接收到的adminData:', adminData.value) diff --git a/stats.html b/stats.html index 0082521..0ee8377 100644 --- a/stats.html +++ b/stats.html @@ -4925,7 +4925,6 @@ var drawChart = (function (exports) { })({}); - /*-->*/