From 48ef443170ee0cc12268bda0c686ffbd1d81671c Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期二, 02 一月 2024 14:26:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin-web/src/components/myButton/myButton.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/admin-web/src/components/myButton/myButton.vue b/admin-web/src/components/myButton/myButton.vue
index a37f4f4..72a7a82 100644
--- a/admin-web/src/components/myButton/myButton.vue
+++ b/admin-web/src/components/myButton/myButton.vue
@@ -343,8 +343,8 @@
this.mySize = this.tools.size
this.myPlain = this.tools.plain
this.myType = this.tools.type
- if (this.icons != null) {
- this.myIcon = this.icons
+ if (this.icon != null) {
+ this.myIcon = this.icon
} else {
this.myIcon = this.tools.other[this.myName].icon
}
--
Gitblit v1.9.1