sileya-ai
/
vr-uniapp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

解决冲突1

v1.0.0
于肖磊 2024-08-29 14:26:39 +08:00
parent 1cab5abe56 96e2c98b5c
commit 94322b0a03
1 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/components/model-coupon/model-coupon-setting.vue
View File

@ -30,10 +30,8 @@ const default_config = {
// 主题1时不显示
limit_send_count: '#999',
btn_background: [{ color: '#FF3830', color_percentage: undefined }],
btn_direction: '90deg',
btn_color: '#FF3830',
background: [{ color: '#FFF1E1', color_percentage: undefined }],
direction: '90deg',
spacing: 20,
},
theme_2: {
@ -43,11 +41,9 @@ const default_config = {
// 主题2时不显示
limit_send_count: '#999',
btn_background: [{ color: '#FFF1E1', color_percentage: undefined }],
btn_direction: '90deg',
btn_color: '#fff',
// 当为主题2时，不显示
background: [{ color: '#fff', color_percentage: undefined }],
direction: '90deg',
spacing: 15,
common_style: {
background_img_url: [{ url: 'http://shopxo.com/static/upload/images/common/2024/08/28/1724815957918121.png' }],
@ -59,10 +55,8 @@ const default_config = {
desc_color: '#FF3830',
limit_send_count: '#999',
btn_background: [{ color: '#FF3830', color_percentage: undefined }],
btn_direction: '90deg',
btn_color: '#FF3830',
background: [{ color: '#FFF1E1', color_percentage: undefined }],
direction: '90deg',
// 当为主题34时，间距不给予修改，优惠券沾满整行
spacing: 0,
},
@ -73,10 +67,8 @@ const default_config = {
// 主题4时不显示
limit_send_count: '#999',
btn_background: [{ color: '#fff', color_percentage: undefined }],
btn_direction: '90deg',
btn_color: '#FF3830',
background: [{ color: '#FFF1E1', color_percentage: undefined }],
direction: '90deg',
// 当为主题34时，间距不给予修改，优惠券沾满整行
spacing: 0,
},
@ -88,12 +80,9 @@ const default_config = {
// 主题5时不显示
limit_send_count: '#999',
// 主题5时不显示
btn_background: [{ color: '#fff', color_percentage: '' }],
// 主题5时不显示
btn_direction: '90deg',
btn_background: [{ color: '#fff', color_percentage: undefined }],
btn_color: '#fff',
background: [{ color: '#FFF1E1', color_percentage: '' }],
direction: '90deg',
background: [{ color: '#FFF1E1', color_percentage: undefined }],
spacing: 10,
},
theme_6: {
@ -104,12 +93,9 @@ const default_config = {
// 主题6时不显示
limit_send_count: '#999',
// 主题6时不显示
btn_background: [{ color: '#fff', color_percentage: '' }],
// 主题6时不显示
btn_direction: '90deg',
btn_background: [{ color: '#fff', color_percentage: undefined }],
btn_color: '#fff',
background: [{ color: '#FF3830', color_percentage: '' }],
direction: '90deg',
background: [{ color: '#FF3830', color_percentage: undefined }],
spacing: 10,
},
theme_7: {
@ -120,9 +106,7 @@ const default_config = {
// 主题7时不显示
limit_send_count: '#999',
// 主题7时不显示
btn_background: [{ color: '#E1B47A', color_percentage: '' }],
// 主题7时不显示
btn_direction: '90deg',
btn_background: [{ color: '#E1B47A', color_percentage: undefined }],
btn_color: '#fff',
background: [
{ color: '#FF3830', color_percentage: undefined },