From 98ac01718d7dac698b94daa51f21bbf2b127d2e6 Mon Sep 17 00:00:00 2001 From: lihuilin Date: Fri, 4 Jul 2025 18:18:34 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=EF=BC=9F=EF=BC=9F=EF=BC=9F=EF=BC=9F?= =?UTF-8?q?=EF=BC=9F=EF=BC=9F=EF=BC=9F=EF=BC=9F=EF=BC=9F=EF=BC=9F=EF=BC=9F?= =?UTF-8?q?=EF=BC=9F=EF=BC=9F=EF=BC=9F=EF=BC=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- src/views/audit/rechargeAudit.vue | 5 ----- src/views/audit/refundAudit.vue | 2 +- stats.html | 2 +- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.env.development b/.env.development index aa3603f..23f1cd8 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,5 @@ # VITE_API_BASE='https://hwjb.homilychart.com/admin/' # VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_dev' -VITE_API_BASE='http://192.168.8.242:8081/' +VITE_API_BASE='http://192.168.8.94:8081/' # VITE_API_BASE='http://18.143.76.3:10704/' diff --git a/src/views/audit/rechargeAudit.vue b/src/views/audit/rechargeAudit.vue index 2813fcd..13caf12 100644 --- a/src/views/audit/rechargeAudit.vue +++ b/src/views/audit/rechargeAudit.vue @@ -47,12 +47,7 @@ -<<<<<<< HEAD - - -======= ->>>>>>> zhangrenyuan/feature-20250623164058-金币前端 diff --git a/src/views/audit/refundAudit.vue b/src/views/audit/refundAudit.vue index 037d416..7dd0538 100644 --- a/src/views/audit/refundAudit.vue +++ b/src/views/audit/refundAudit.vue @@ -387,7 +387,7 @@ const resetSearch = function () { startTime: '', endTime: '', sortField:'', - sortOrder:'', + sortOrder:'' } dateRange.value = [] } diff --git a/stats.html b/stats.html index 3193c15..60f5fc0 100644 --- a/stats.html +++ b/stats.html @@ -4929,7 +4929,7 @@ var drawChart = (function (exports) { From 9cf5b1bb2cd37ae10ea63997ac154c41d66cde14 Mon Sep 17 00:00:00 2001 From: lihuilin Date: Sat, 5 Jul 2025 14:40:24 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=8F=B3=E4=B8=8B=E5=B0=8F=E5=8D=A1?= =?UTF-8?q?=E5=A5=BD=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 10 +- package.json | 2 + src/views/workspace/index.vue | 326 ++++++++++++++++++++++++------------------ 3 files changed, 197 insertions(+), 141 deletions(-) diff --git a/package-lock.json b/package-lock.json index b00b0eb..c198ea5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,6 +10,8 @@ "dependencies": { "@element-plus/icons-vue": "^2.3.1", "axios": "^1.7.8", + "dayjs": "^1.11.13", + "dayjs-plugin-utc": "^0.1.2", "echarts": "^5.5.1", "element-plus": "^2.8.8", "lodash": "^4.17.21", @@ -3421,10 +3423,16 @@ }, "node_modules/dayjs": { "version": "1.11.13", - "resolved": "https://mirrors.huaweicloud.com/repository/npm/dayjs/-/dayjs-1.11.13.tgz", + "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz", "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==", "license": "MIT" }, + "node_modules/dayjs-plugin-utc": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/dayjs-plugin-utc/-/dayjs-plugin-utc-0.1.2.tgz", + "integrity": "sha512-ExERH5o3oo6jFOdkvMP3gytTCQ9Ksi5PtylclJWghr7k7m3o2U5QrwtdiJkOxLOH4ghr0EKhpqGefzGz1VvVJg==", + "license": "MIT" + }, "node_modules/de-indent": { "version": "1.0.2", "resolved": "https://mirrors.huaweicloud.com/repository/npm/de-indent/-/de-indent-1.0.2.tgz", diff --git a/package.json b/package.json index 34155ed..73a1ef1 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,8 @@ "dependencies": { "@element-plus/icons-vue": "^2.3.1", "axios": "^1.7.8", + "dayjs": "^1.11.13", + "dayjs-plugin-utc": "^0.1.2", "echarts": "^5.5.1", "element-plus": "^2.8.8", "lodash": "^4.17.21", diff --git a/src/views/workspace/index.vue b/src/views/workspace/index.vue index a775bb6..6b44032 100644 --- a/src/views/workspace/index.vue +++ b/src/views/workspace/index.vue @@ -9,15 +9,22 @@