From be60d672a0a311abcc420433df16fcf00733db16 Mon Sep 17 00:00:00 2001 From: sws <1141121512@qq.com> Date: Fri, 30 Aug 2024 18:40:12 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E6=83=A0=E5=88=B8=E5=BC=80=E5=8F=91?= =?UTF-8?q?=20sws=202024-08-30?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/common-styles/index.vue | 9 +- .../common/mult-color-picker/index.vue | 6 +- src/components/common/theme-select/index.vue | 6 +- .../model-article-tabs-styles.vue | 4 +- src/components/model-coupon/index.scss | 2 - src/components/model-coupon/index.vue | 852 +++++++++++++++--- .../model-coupon/model-coupon-setting.vue | 100 +- .../model-coupon/model-coupon-styles.vue | 51 +- src/components/page-settings/page-content.vue | 2 +- src/layout/components/main/default/coupon.ts | 20 +- src/utils/index.ts | 20 +- 11 files changed, 917 insertions(+), 155 deletions(-) diff --git a/src/components/common/common-styles/index.vue b/src/components/common/common-styles/index.vue index fe54f63a..d66f797a 100644 --- a/src/components/common/common-styles/index.vue +++ b/src/components/common/common-styles/index.vue @@ -5,7 +5,7 @@
通用
-
+
背景色
@@ -24,6 +24,9 @@
+
+ +
@@ -76,6 +79,10 @@ const props = defineProps({ type: Boolean, default: true, }, + isMultBackground: { + type: Boolean, + default: true, + }, }); // 初始化表单数据 const init_form = reactive({ diff --git a/src/components/common/mult-color-picker/index.vue b/src/components/common/mult-color-picker/index.vue index 57b4a94b..bd62f65e 100644 --- a/src/components/common/mult-color-picker/index.vue +++ b/src/components/common/mult-color-picker/index.vue @@ -54,7 +54,7 @@ let state = reactive({ color: item.color, color_percentage: item.color_percentage, }; - }) + }), }); const { color_list } = toRefs(state); const emit = defineEmits(['update:value']); @@ -141,7 +141,8 @@ const update_value = () => { } .mo-input-number { :deep(.el-input-number) { - .el-input-number__decrease, .el-input-number__increase { + .el-input-number__decrease, + .el-input-number__increase { right: 3.4rem; } } @@ -163,5 +164,4 @@ const update_value = () => { border-bottom-right-radius: 0.4rem; } } - diff --git a/src/components/common/theme-select/index.vue b/src/components/common/theme-select/index.vue index cd02b1ba..ed132574 100644 --- a/src/components/common/theme-select/index.vue +++ b/src/components/common/theme-select/index.vue @@ -36,7 +36,7 @@ {{ placeholder }}
-