diff --git a/src/components/model-coupon/model-coupon-setting.vue b/src/components/model-coupon/model-coupon-setting.vue
index 6ff35024..6441a7d9 100644
--- a/src/components/model-coupon/model-coupon-setting.vue
+++ b/src/components/model-coupon/model-coupon-setting.vue
@@ -30,8 +30,10 @@ const default_config = {
// 主题1时不显示
limit_send_count: '#999',
btn_background: [{ color: '#FF3830', color_percentage: '' }],
+ btn_direction: '90deg',
btn_color: '#FF3830',
background: [{ color: '#FFF1E1', color_percentage: '' }],
+ direction: '90deg',
spacing: 20,
},
theme_2: {
@@ -41,9 +43,11 @@ const default_config = {
// 主题2时不显示
limit_send_count: '#999',
btn_background: [{ color: '#FFF1E1', color_percentage: '' }],
+ btn_direction: '90deg',
btn_color: '#fff',
// 当为主题2时,不显示
background: [{ color: '#fff', color_percentage: '' }],
+ direction: '90deg',
spacing: 15,
common_style: {
background_img_url: [{ url: 'http://shopxo.com/static/upload/images/common/2024/08/28/1724815957918121.png' }],
@@ -55,8 +59,10 @@ const default_config = {
desc_color: '#FF3830',
limit_send_count: '#999',
btn_background: [{ color: '#FF3830', color_percentage: '' }],
+ btn_direction: '90deg',
btn_color: '#FF3830',
background: [{ color: '#FFF1E1', color_percentage: '' }],
+ direction: '90deg',
// 当为主题34时,间距不给予修改,优惠券沾满整行
spacing: 0,
},
@@ -67,8 +73,10 @@ const default_config = {
// 主题4时不显示
limit_send_count: '#999',
btn_background: [{ color: '#fff', color_percentage: '' }],
+ btn_direction: '90deg',
btn_color: '#FF3830',
background: [{ color: '#FFF1E1', color_percentage: '' }],
+ direction: '90deg',
// 当为主题34时,间距不给予修改,优惠券沾满整行
spacing: 0,
},
@@ -81,8 +89,11 @@ const default_config = {
limit_send_count: '#999',
// 主题5时不显示
btn_background: [{ color: '#fff', color_percentage: '' }],
+ // 主题5时不显示
+ btn_direction: '90deg',
btn_color: '#fff',
background: [{ color: '#FFF1E1', color_percentage: '' }],
+ direction: '90deg',
spacing: 10,
},
theme_6: {
@@ -94,8 +105,11 @@ const default_config = {
limit_send_count: '#999',
// 主题6时不显示
btn_background: [{ color: '#fff', color_percentage: '' }],
+ // 主题6时不显示
+ btn_direction: '90deg',
btn_color: '#fff',
background: [{ color: '#FF3830', color_percentage: '' }],
+ direction: '90deg',
spacing: 10,
},
theme_7: {
@@ -107,11 +121,14 @@ const default_config = {
limit_send_count: '#999',
// 主题7时不显示
btn_background: [{ color: '#E1B47A', color_percentage: '' }],
+ // 主题7时不显示
+ btn_direction: '90deg',
btn_color: '#fff',
background: [
{ color: '#FF3830', color_percentage: '' },
{ color: '#E1B47A', color_percentage: '' },
],
+ direction: '90deg',
spacing: 10,
},
},
diff --git a/src/components/model-coupon/model-coupon-styles.vue b/src/components/model-coupon/model-coupon-styles.vue
index 22b41e94..b73555b6 100644
--- a/src/components/model-coupon/model-coupon-styles.vue
+++ b/src/components/model-coupon/model-coupon-styles.vue
@@ -9,27 +9,27 @@
-
+
-
+
-
+
-
+
-
+
diff --git a/src/components/model-user-info/index.vue b/src/components/model-user-info/index.vue
index c84446c3..23b8b429 100644
--- a/src/components/model-user-info/index.vue
+++ b/src/components/model-user-info/index.vue
@@ -132,7 +132,7 @@ watch(
base_data.stats_number_weight = new_style.stats_number_weight;
base_data.stats_number_size = new_style.stats_number_size;
- style_container.value += common_styles_computer(new_style.common_style);
+ style_container.value = common_styles_computer(new_style.common_style);
}
// 人物名称样式
user_name_style.value = 'color:' + base_data.user_name_color + ';' + 'font-size:' + base_data.user_name_size + 'px;' + 'font-weight:' + base_data.user_name_weight + ';';
diff --git a/src/components/model-user-info/model-user-info-styles.vue b/src/components/model-user-info/model-user-info-styles.vue
index 5580aa20..f8a98bc4 100644
--- a/src/components/model-user-info/model-user-info-styles.vue
+++ b/src/components/model-user-info/model-user-info-styles.vue
@@ -96,27 +96,7 @@ import { omit } from 'lodash';
const props = defineProps({
value: {
type: Object,
- default: () => {
- return {
- user_avatar_size: '60',
- user_name_color: 'rgba(0, 0, 0, 1)',
- user_name_weight: '500',
- user_name_size: 16,
- user_id_color_list: [{ color: 'rgba(254, 184, 143, 1)', color_percentage: ''}, { color: 'rgba(255, 227, 220, 1)', color_percentage: '' }],
- user_id_color: 'rgba(0, 0, 0, 1)',
- user_id_direction: '90deg',
- user_id_weight: '400',
- user_id_size: 10,
- img_size: '23',
- img_space: '25',
- stats_name_color: 'rgba(0, 0, 0, 1)',
- stats_name_weight: '400',
- stats_name_size: 12,
- stats_number_color: 'rgba(0, 0, 0, 1)',
- stats_number_weight: '500',
- stats_number_size: 16,
- };
- },
+ default: () => {},
},
});
const font_weight = reactive([