From 7d4fcce01086a08200708f0c19b21e8267615f72 Mon Sep 17 00:00:00 2001 From: cun-nan <19819293608@163.com> Date: Sat, 6 Jul 2024 16:35:40 +0800 Subject: [PATCH 1/3] bug --- fuintAdmin_zt/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/fuintAdmin_zt/package.json b/fuintAdmin_zt/package.json index 76f6631bd..e25ab30b5 100644 --- a/fuintAdmin_zt/package.json +++ b/fuintAdmin_zt/package.json @@ -17,6 +17,7 @@ "pre-commit": "lint-staged" } }, + "lint-staged": { "src/**/*.{js,vue}": [ "eslint --fix", From 958a904cec0e62a7cb4a5280d04ec7f17eaabe38 Mon Sep 17 00:00:00 2001 From: cun-nan <19819293608@163.com> Date: Sat, 6 Jul 2024 16:52:28 +0800 Subject: [PATCH 2/3] bug --- fuintAdmin/src/assets/styles/btn.scss | 3 +++ fuintAdmin_zt/package.json | 1 - fuintAdmin_zt/src/assets/styles/btn.scss | 3 +++ fuintCashierWeb/src/assets/styles/btn.scss | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/fuintAdmin/src/assets/styles/btn.scss b/fuintAdmin/src/assets/styles/btn.scss index 9b122fda0..d854b658f 100644 --- a/fuintAdmin/src/assets/styles/btn.scss +++ b/fuintAdmin/src/assets/styles/btn.scss @@ -99,13 +99,16 @@ } .el-button--warning{ background: linear-gradient( 90deg, #409EFF 0%, #409EFF 100%) !important; + color: white !important; border: 0px !important; } .el-button--primary{ background: linear-gradient( 90deg, #FF8646 0%, #FFA360 100%) !important; + color: white !important; border: 0px !important; } .el-button--success{ background: linear-gradient( 90deg, #0DC291 0%, #0DC291 100%) !important; + color: white !important; border: 0px !important; } diff --git a/fuintAdmin_zt/package.json b/fuintAdmin_zt/package.json index e25ab30b5..76f6631bd 100644 --- a/fuintAdmin_zt/package.json +++ b/fuintAdmin_zt/package.json @@ -17,7 +17,6 @@ "pre-commit": "lint-staged" } }, - "lint-staged": { "src/**/*.{js,vue}": [ "eslint --fix", diff --git a/fuintAdmin_zt/src/assets/styles/btn.scss b/fuintAdmin_zt/src/assets/styles/btn.scss index 92326cc14..dc76d7f1a 100644 --- a/fuintAdmin_zt/src/assets/styles/btn.scss +++ b/fuintAdmin_zt/src/assets/styles/btn.scss @@ -101,15 +101,18 @@ .el-button--warning{ color: white !important; background: linear-gradient( 90deg, #409EFF 0%, #409EFF 100%) !important; + color: white !important; border: 0px !important; } .el-button--primary{ color: white !important; background: linear-gradient( 90deg, #FF8646 0%, #FFA360 100%) !important; + color: white !important; border: 0px !important; } .el-button--success{ background: linear-gradient( 90deg, #0DC291 0%, #0DC291 100%) !important; + color: white !important; border: 0px !important; } .el-button--text{ diff --git a/fuintCashierWeb/src/assets/styles/btn.scss b/fuintCashierWeb/src/assets/styles/btn.scss index 7c5e54698..a46937d33 100644 --- a/fuintCashierWeb/src/assets/styles/btn.scss +++ b/fuintCashierWeb/src/assets/styles/btn.scss @@ -108,6 +108,7 @@ border: 0px !important; } .el-button--success{ + color: white !important; background: linear-gradient( 90deg, #0DC291 0%, #0DC291 100%) !important; border: 0px !important; } From 0a61294e3a4a088f13c97bdebe644b9bf9b40ef3 Mon Sep 17 00:00:00 2001 From: xvv Date: Sat, 6 Jul 2024 17:11:39 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=89=8D=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fuintAdmin_zt/src/views/Service/index.vue | 381 ++++++++------ fuintAdmin_zt/src/views/index.vue | 588 +++++++++++++--------- 2 files changed, 586 insertions(+), 383 deletions(-) diff --git a/fuintAdmin_zt/src/views/Service/index.vue b/fuintAdmin_zt/src/views/Service/index.vue index 6e5f18f4c..d0554af12 100644 --- a/fuintAdmin_zt/src/views/Service/index.vue +++ b/fuintAdmin_zt/src/views/Service/index.vue @@ -1,177 +1,266 @@ diff --git a/fuintAdmin_zt/src/views/index.vue b/fuintAdmin_zt/src/views/index.vue index ce205f752..8d5f272e5 100644 --- a/fuintAdmin_zt/src/views/index.vue +++ b/fuintAdmin_zt/src/views/index.vue @@ -1,256 +1,370 @@ -