From 62f88da5cc2e9d652741f1ff3596bd56d381040c Mon Sep 17 00:00:00 2001 From: lihuilin Date: Thu, 6 Nov 2025 14:13:48 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=80=80=E6=AC=BE?= =?UTF-8?q?=E9=87=91=E5=B8=81=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 ++-- src/views/moneyManage/receiveDetail/receiveService.vue | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.env.development b/.env.development index 2ccc7eb..93d5bef 100644 --- a/.env.development +++ b/.env.development @@ -1,6 +1,6 @@ # VITE_API_BASE='https://hwjb.homilychart.com/dev/admin' # 测试环境 -# VITE_API_BASE='http://54.255.212.181:10704/' +VITE_API_BASE='http://54.255.212.181:10704/' # 正式环境 # VITE_API_BASE='http://54.255.212.181:10705/' VITE_UPLOAD_URL=http://39.101.133.168:8828/hljw/api/aws/upload @@ -13,7 +13,7 @@ VITE_UPLOAD_URL=http://39.101.133.168:8828/hljw/api/aws/upload # 本地 # VITE_API_BASE='http://localhost:8081/' # 孙加倍 -VITE_API_BASE='http://192.168.40.12:8081' +# VITE_API_BASE='http://192.168.40.12:8081' # Lijianlin # VITE_API_BASE='http://192.168.9.41:8081/' diff --git a/src/views/moneyManage/receiveDetail/receiveService.vue b/src/views/moneyManage/receiveDetail/receiveService.vue index 5b8b0f0..a1c2ea4 100644 --- a/src/views/moneyManage/receiveDetail/receiveService.vue +++ b/src/views/moneyManage/receiveDetail/receiveService.vue @@ -363,6 +363,14 @@ 部分退款 +
+ 永久金币 +   个 +
+
+ 免费金币 +   个 +
退款理由 Date: Thu, 6 Nov 2025 14:14:17 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 .env.development diff --git a/.env.development b/.env.development deleted file mode 100644 index 93d5bef..0000000 --- a/.env.development +++ /dev/null @@ -1,20 +0,0 @@ -# VITE_API_BASE='https://hwjb.homilychart.com/dev/admin' -# 测试环境 -VITE_API_BASE='http://54.255.212.181:10704/' -# 正式环境 -# VITE_API_BASE='http://54.255.212.181:10705/' -VITE_UPLOAD_URL=http://39.101.133.168:8828/hljw/api/aws/upload -# VITE_API_BASE='http://192.168.9.28:8081/' -# sunjiabei -# VITE_API_BASE='http://192.168.9.28:8081/' -# VITE_API_BASE='http://192.168.5.92:8081/' -# 张勇 -# VITE_API_BASE='http://192.168.3.83:8081/' -# 本地 -# VITE_API_BASE='http://localhost:8081/' -# 孙加倍 -# VITE_API_BASE='http://192.168.40.12:8081' - -# Lijianlin -# VITE_API_BASE='http://192.168.9.41:8081/' -# VITE_API_BASE='http://localhost:8081/' From 8aab48c1c9cc580946c3c0ec5073b12abc4ebaad Mon Sep 17 00:00:00 2001 From: lihuilin Date: Thu, 6 Nov 2025 17:30:01 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=B8=8D=E8=A6=81=E5=86=8D=E4=BC=A0?= =?UTF-8?q?=E4=B8=8D=E5=AD=98=E5=9C=A8=E7=9A=84=E5=8F=82=E6=95=B0=E4=BA=86?= =?UTF-8?q?=EF=BC=81=EF=BC=81=E5=86=8D=E4=BC=A0=E6=89=94=E6=A5=BC=E4=B8=8B?= =?UTF-8?q?=E5=9F=8B=E4=BA=86=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/audit/bean/beanAudit.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/audit/bean/beanAudit.vue b/src/views/audit/bean/beanAudit.vue index 8bc7e23..81c0fd3 100644 --- a/src/views/audit/bean/beanAudit.vue +++ b/src/views/audit/bean/beanAudit.vue @@ -347,7 +347,7 @@ const showApproveDialog = (row) => { // 处理通过操作 // 为什么使用handleApproveConfirm页面就加载不出来,使用handleApprove就可以, // (发现问题:加了防抖,名称为handleApprove,修改名称一致即可) -const handleApproveConfirm = async (row) => { +const handleApproveConfirm = async function() {// 不要再传row了!哪有row!!! if (!hasbeanWaitThough) { ElMessage.error('暂无权限') return From d3ddb8e7593feed822498f0d886fe54a48e28386 Mon Sep 17 00:00:00 2001 From: lihui Date: Thu, 6 Nov 2025 17:49:44 +0800 Subject: [PATCH 4/4] =?UTF-8?q?add=EF=BC=9A=E6=B6=88=E6=81=AF=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=E5=9F=BA=E7=A1=80=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/dialogs/MessageDialog.vue | 92 ++++++++++ src/components/{ => dialogs}/changePassword.vue | 4 +- src/views/home.vue | 235 ++++++++++++++---------- 3 files changed, 233 insertions(+), 98 deletions(-) create mode 100644 src/components/dialogs/MessageDialog.vue rename src/components/{ => dialogs}/changePassword.vue (98%) diff --git a/src/components/dialogs/MessageDialog.vue b/src/components/dialogs/MessageDialog.vue new file mode 100644 index 0000000..e35922b --- /dev/null +++ b/src/components/dialogs/MessageDialog.vue @@ -0,0 +1,92 @@ + + + + + diff --git a/src/components/changePassword.vue b/src/components/dialogs/changePassword.vue similarity index 98% rename from src/components/changePassword.vue rename to src/components/dialogs/changePassword.vue index 083172e..729fe75 100644 --- a/src/components/changePassword.vue +++ b/src/components/dialogs/changePassword.vue @@ -4,8 +4,8 @@ import {ref, reactive, computed, watch, onMounted} from 'vue' import {CircleCloseFilled, SuccessFilled} from '@element-plus/icons-vue' import {ElMessage} from "element-plus"; -import API from '@/util/http' -import PasswordSuccess from './PasswordSuccess.vue'; +import API from '@/util/http.js' +import PasswordSuccess from '../PasswordSuccess.vue'; import router from "@/router/index.js"; // 父组件调用 diff --git a/src/views/home.vue b/src/views/home.vue index 68928c7..597cc0e 100644 --- a/src/views/home.vue +++ b/src/views/home.vue @@ -1,17 +1,19 @@ @@ -353,15 +388,17 @@ const toggleFlag = () => { /* 侧边栏容器 */ .sidebar-container { flex-shrink: 0; - + } + .logo { display: flex; align-items: center; justify-content: center; height: 12vh; - + } + /* 中间可滚动菜单容器 */ .menu-scroll-container { flex: 1; @@ -376,6 +413,12 @@ const toggleFlag = () => { align-items: center; /* 垂直居中 */ } +.message-container { + padding: 10px 50px 10px 50px; /* 上,右, 下,左 */ + display: flex; + align-items: center; /* 垂直居中 */ +} + /* 调整下拉菜单的样式,确保它向上弹出 */ .el-dropdown-link:focus { @@ -383,12 +426,14 @@ const toggleFlag = () => { outline: none; text-decoration: none; } + .el-dropdown-link { display: flex; align-items: center; cursor: pointer; - gap:10px; /* 图标和文字左右间距 */ + gap: 10px; /* 图标和文字左右间距 */ } + .sidebar-layout { width: 15vw; height: 100%; @@ -439,7 +484,6 @@ const toggleFlag = () => { } - /* 确保el-menu撑满容器 */ .sidebar-layout .el-menu { width: 100%; @@ -456,6 +500,7 @@ const toggleFlag = () => { ::v-deep(.el-menu-item:hover) { background: #E5EBFE; } + /* 子菜单展开时和背景同色 */ ::v-deep(.el-sub-menu__title), ::v-deep(.el-menu-item) { @@ -470,7 +515,6 @@ const toggleFlag = () => { } - /* 确保全局el-container适应容器 */ :deep(.el-container) { /* vue3的深度选择器,用于覆盖element-plus的默认样式 */ @@ -480,7 +524,6 @@ const toggleFlag = () => { } - /* 为侧边栏和主内容区域添加滚动条样式 */ .menu-scroll-container, .el-main {