diff --git a/src/components/common/common-styles/index.vue b/src/components/common/common-styles/index.vue index d66f797a..025d6eba 100644 --- a/src/components/common/common-styles/index.vue +++ b/src/components/common/common-styles/index.vue @@ -22,7 +22,7 @@ - +
@@ -87,7 +87,7 @@ const props = defineProps({ // 初始化表单数据 const init_form = reactive({ direction: '180deg', - background_img_url: [] as uploadList[], + background_img: [] as uploadList[], color_list: [{ color: '', color_percentage: undefined }] as color_list[], background_img_style: 2, padding: 0, @@ -124,8 +124,8 @@ const background_img_style_change = (style: any) => { form.background_img_style = style; emit('update:value', form); }; -const background_img_url_change = (arry: uploadList[]) => { - form.background_img_url = arry; +const background_img_change = (arry: uploadList[]) => { + form.background_img = arry; emit('update:value', form); }; const radius_change = (radius: any) => { diff --git a/src/components/model-coupon/model-coupon-setting.vue b/src/components/model-coupon/model-coupon-setting.vue index 48bc0689..f1961fe0 100644 --- a/src/components/model-coupon/model-coupon-setting.vue +++ b/src/components/model-coupon/model-coupon-setting.vue @@ -191,10 +191,10 @@ const default_config = { }, common_style: { theme_default: { - background_img_url: [], + background_img: [], }, theme_2: { - background_img_url: [{ url: 'http://shopxo.com/static/upload/images/common/2024/08/28/1724815957918121.png' }], + background_img: [{ url: 'http://shopxo.com/static/upload/images/common/2024/08/28/1724815957918121.png' }], }, }, }; diff --git a/src/components/model-data-magic/components/tabs-styles.vue b/src/components/model-data-magic/components/tabs-styles.vue index a1f46007..cf33af61 100644 --- a/src/components/model-data-magic/components/tabs-styles.vue +++ b/src/components/model-data-magic/components/tabs-styles.vue @@ -18,7 +18,7 @@
- + diff --git a/src/components/model-data-magic/model-data-magic-content.vue b/src/components/model-data-magic/model-data-magic-content.vue index 8d76c7a9..040997c2 100644 --- a/src/components/model-data-magic/model-data-magic-content.vue +++ b/src/components/model-data-magic/model-data-magic-content.vue @@ -60,7 +60,7 @@ const data_style = { color_list: [{ color: '#FFD9C3', color_percentage: 0 }, { color: '#FFECE2', color_percentage: 12 }, { color: '#FFFFFF', color_percentage: 30 }], direction: '180deg', background_img_style: 2, - background_img_url: [], + background_img: [], is_roll: false, rotation_direction: 'horizontal', interval_time: 2, diff --git a/src/components/model-notice/index.vue b/src/components/model-notice/index.vue index 03b122af..38f8de9b 100644 --- a/src/components/model-notice/index.vue +++ b/src/components/model-notice/index.vue @@ -66,11 +66,11 @@ const style_container = computed(() => common_styles_computer(new_style.value.co const container_height = computed(() => new_style.value.container_height + 'px'); // 容器背景 const container_background_style = computed(() => { - const { container_color_list, container_direction, container_background_img_style, container_background_img_url } = new_style.value; + const { container_color_list, container_direction, container_background_img_style, container_background_img } = new_style.value; const styles = { color_list: container_color_list, direction: container_direction, - background_img_url: container_background_img_url, + background_img: container_background_img, background_img_style: container_background_img_style, }; return gradient_computer(styles) + radius_computer(new_style.value.container_radius) + background_computer(styles) + `overflow:hidden;`; diff --git a/src/components/model-notice/model-notice-styles.vue b/src/components/model-notice/model-notice-styles.vue index 95f32444..0c22e26a 100644 --- a/src/components/model-notice/model-notice-styles.vue +++ b/src/components/model-notice/model-notice-styles.vue @@ -52,7 +52,7 @@ - + diff --git a/src/components/model-search/model-search-styles.vue b/src/components/model-search/model-search-styles.vue index 16e248b1..f5bd3ba1 100644 --- a/src/components/model-search/model-search-styles.vue +++ b/src/components/model-search/model-search-styles.vue @@ -34,7 +34,7 @@ - + diff --git a/src/components/model-seckill/index.vue b/src/components/model-seckill/index.vue index e43b7752..e43685ab 100644 --- a/src/components/model-seckill/index.vue +++ b/src/components/model-seckill/index.vue @@ -206,11 +206,11 @@ const slide_active_color = computed(() => { const seckill_head_style = computed(() => { let style = ``; - const { header_background_img_url, header_background_img_style, header_background_color_list, header_background_direction } = new_style.value; + const { header_background_img, header_background_img_style, header_background_color_list, header_background_direction } = new_style.value; // 渐变 const gradient = { color_list: header_background_color_list, direction: header_background_direction }; // 背景图 - const back = { background_img_url: header_background_img_url, background_img_style: header_background_img_style }; + const back = { background_img: header_background_img, background_img_style: header_background_img_style }; style += gradient_computer(gradient) + background_computer(back); return style; }); diff --git a/src/components/model-seckill/model-seckill-setting.vue b/src/components/model-seckill/model-seckill-setting.vue index 33e9dbe1..47213610 100644 --- a/src/components/model-seckill/model-seckill-setting.vue +++ b/src/components/model-seckill/model-seckill-setting.vue @@ -55,7 +55,7 @@ onBeforeMount(async () => { header_background_color_list: [{ color: '', color_percentage: undefined }], header_background_direction: '180deg', header_background_img_style: '2', - header_background_img_url: [{ id: 1, url: new_url.value + 'header-bg.png', original: '背景', title: '背景1', ext: '.png', type: 'img' }], + header_background_img: [{ id: 1, url: new_url.value + 'header-bg.png', original: '背景', title: '背景1', ext: '.png', type: 'img' }], shop_radius: { radius: 8, radius_top_left: 8, @@ -130,7 +130,7 @@ onBeforeMount(async () => { topic_color: '#000', end_text_color: '#666', header_background_color_list: [{ color: '#FFE0E0', color_percentage: undefined },{ color: '#FFEFEF', color_percentage: 50 }, { color: '#FFFFFF', color_percentage: undefined }], - header_background_img_url: [], + header_background_img: [], countdown_bg_color_list: [{ color: '#FF4909', color_percentage: undefined }, { color: '#FF8E4D', color_percentage: undefined }], countdown_direction: '180deg', countdown_color: '#fff', @@ -147,7 +147,7 @@ onBeforeMount(async () => { head_button_color: '#000', end_text_color: '#666', header_background_color_list: [{ color: '#fff', color_percentage: undefined }], - header_background_img_url: [], + header_background_img: [], countdown_bg_color_list: [{ color: '#000', color_percentage: undefined }], countdown_direction: '180deg', countdown_color: '#fff', @@ -164,7 +164,7 @@ onBeforeMount(async () => { head_button_color: '#000', end_text_color: '#666', header_background_color_list: [{ color: '#fff', color_percentage: undefined }], - header_background_img_url: [], + header_background_img: [], countdown_bg_color_list: [{ color: '#FF5000', color_percentage: undefined }], countdown_direction: '180deg', countdown_color: '#fff', diff --git a/src/components/model-seckill/model-seckill-styles.vue b/src/components/model-seckill/model-seckill-styles.vue index 4ed5048d..6ef571d9 100644 --- a/src/components/model-seckill/model-seckill-styles.vue +++ b/src/components/model-seckill/model-seckill-styles.vue @@ -42,7 +42,7 @@ - + diff --git a/src/components/page-settings/index.vue b/src/components/page-settings/index.vue index ea78d5ed..7e9b79c2 100644 --- a/src/components/page-settings/index.vue +++ b/src/components/page-settings/index.vue @@ -50,12 +50,12 @@ const new_style = computed(() => props.pageData.com_data.style); const position = computed(() => new_style.value.up_slide_display ? 'absolute' : 'relative'); const roll_style = computed(() => { let style = ``; - const { header_background_img_url, header_background_img_style, header_background_color_list, header_background_direction, header_background_type } = new_style.value; + const { header_background_img, header_background_img_style, header_background_color_list, header_background_direction, header_background_type } = new_style.value; if (header_background_type === 'color_image') { // 渐变 const gradient = { color_list: header_background_color_list, direction: header_background_direction }; // 背景图 - const back = { background_img_url: header_background_img_url, background_img_style: header_background_img_style }; + const back = { background_img: header_background_img, background_img_style: header_background_img_style }; style += gradient_computer(gradient) + background_computer(back); } else { style += `background: transparent;`; diff --git a/src/components/page-settings/page-setting.vue b/src/components/page-settings/page-setting.vue index c8639a2b..bf192cdb 100644 --- a/src/components/page-settings/page-setting.vue +++ b/src/components/page-settings/page-setting.vue @@ -23,7 +23,7 @@ const default_data = { header_background_color_list: [{ color: '#fff', color_percentage: undefined }], header_background_direction: '180deg', header_background_img_style: 2, - header_background_img_url: [], + header_background_img: [], header_background_title_color: '#333', header_background_title_typeface: '500', header_background_title_size: 16, @@ -35,7 +35,7 @@ const default_data = { color_list: [{ color: '#FF973D', color_percentage: undefined }, { color: '#FF3131', color_percentage: undefined }], direction: '90deg', background_img_style: '', - background_img_url: [], + background_img: [], search_button_radius: { radius: 16, radius_top_left: 16, diff --git a/src/components/page-settings/page-styles.vue b/src/components/page-settings/page-styles.vue index f4b0b088..1334c36b 100644 --- a/src/components/page-settings/page-styles.vue +++ b/src/components/page-settings/page-styles.vue @@ -31,7 +31,7 @@ - + diff --git a/src/types/global.d.ts b/src/types/global.d.ts index 4b2385cd..c56427e0 100644 --- a/src/types/global.d.ts +++ b/src/types/global.d.ts @@ -76,7 +76,7 @@ declare global { * 背景图 */ type backgroundImgUrlStyle = { - background_img_url: uploadList[]; + background_img: uploadList[]; background_img_style: number; }; @@ -107,7 +107,7 @@ declare global { box_shadow_y: number; box_shadow_blur: number; box_shadow_spread: number; - background_img_url: uploadList[]; + background_img: uploadList[]; }; /** * 链接参数 diff --git a/src/utils/index.ts b/src/utils/index.ts index 94b4c333..12d0a860 100644 --- a/src/utils/index.ts +++ b/src/utils/index.ts @@ -148,7 +148,7 @@ export function box_shadow_computer(new_style: boxShadowStyle) { * @returns {string} */ export function background_computer(new_style: backgroundImgUrlStyle) { - if (new_style.background_img_url.length > 0) { + if (new_style.background_img.length > 0) { let url_styke = ''; if (new_style.background_img_style == 1) { url_styke = 'background-repeat: repeat;'; @@ -157,7 +157,7 @@ export function background_computer(new_style: backgroundImgUrlStyle) { } else { url_styke = `background-repeat: no-repeat;background-position: center;`; } - return `background-image:url(${new_style.background_img_url[0].url});${url_styke}`; + return `background-image:url(${new_style.background_img[0].url});${url_styke}`; } else { return ''; } diff --git a/src/views/layout/components/main/default/header-nav.ts b/src/views/layout/components/main/default/header-nav.ts index f15c4b2c..e881ae91 100644 --- a/src/views/layout/components/main/default/header-nav.ts +++ b/src/views/layout/components/main/default/header-nav.ts @@ -34,7 +34,7 @@ interface DefaultFooterNav { header_background_color_list: color_list[]; header_background_direction: string; header_background_img_style: number; - header_background_img_url: uploadList[]; + header_background_img: uploadList[]; header_background_title_color: string, header_background_title_typeface: string, header_background_title_size: number, @@ -46,7 +46,7 @@ interface DefaultFooterNav { color_list: color_list[]; direction: string; background_img_style: string; - background_img_url: uploadList[]; + background_img: uploadList[]; search_button_radius: object; tips_color: string; hot_words_color: string; @@ -90,7 +90,7 @@ const defaultFooterNav: DefaultFooterNav = { header_background_color_list: [{ color: '#fff', color_percentage: undefined }], header_background_direction: '180deg', header_background_img_style: 2, - header_background_img_url: [], + header_background_img: [], header_background_title_color: '#333', header_background_title_typeface: '500', header_background_title_size: 16, @@ -102,7 +102,7 @@ const defaultFooterNav: DefaultFooterNav = { color_list: [{ color: '#FF973D', color_percentage: undefined }, { color: '#FF3131', color_percentage: undefined }], direction: '90deg', background_img_style: '', - background_img_url: [], + background_img: [], search_button_radius: { radius: 16, radius_top_left: 16, diff --git a/src/views/layout/components/main/default/index.ts b/src/views/layout/components/main/default/index.ts index 9932ed7f..4a8f6034 100644 --- a/src/views/layout/components/main/default/index.ts +++ b/src/views/layout/components/main/default/index.ts @@ -22,7 +22,7 @@ const defaultCommon: componentsCommonCommonStyle = { box_shadow_y: 0, box_shadow_blur: 0, box_shadow_spread: 0, - background_img_url: [] as uploadList[], + background_img: [] as uploadList[], }; export default defaultCommon; diff --git a/src/views/layout/components/main/default/notice.ts b/src/views/layout/components/main/default/notice.ts index 81972918..a9e08a6a 100644 --- a/src/views/layout/components/main/default/notice.ts +++ b/src/views/layout/components/main/default/notice.ts @@ -37,7 +37,7 @@ interface defaultSearch { container_color_list: color_list[], container_direction: string, container_background_img_style: string, - container_background_img_url: uploadList[], + container_background_img: uploadList[], container_radius: radiusStyle, common_style: object; }; @@ -88,7 +88,7 @@ const defaultSearch: defaultSearch = { container_color_list: [{ color: '#fff', color_percentage: undefined }], container_direction: '180deg', container_background_img_style: '2', - container_background_img_url: [], + container_background_img: [], container_radius: { radius: 0, radius_top_left: 0, diff --git a/src/views/layout/components/main/default/search.ts b/src/views/layout/components/main/default/search.ts index 8172d50d..b2771b3a 100644 --- a/src/views/layout/components/main/default/search.ts +++ b/src/views/layout/components/main/default/search.ts @@ -27,7 +27,7 @@ interface defaultSearch { color_list: color_list[]; direction: string; background_img_style: string; - background_img_url: uploadList[]; + background_img: uploadList[]; search_button_radius: object; tips_color: string; hot_words_color: string; @@ -64,7 +64,7 @@ const defaultSearch: defaultSearch = { color_list: [{ color: '#FF973D', color_percentage: undefined }, { color: '#FF3131', color_percentage: undefined }], direction: '90deg', background_img_style: '', - background_img_url: [], + background_img: [], search_button_radius: { radius: 16, radius_top_left: 16, diff --git a/src/views/layout/components/main/default/seckill.ts b/src/views/layout/components/main/default/seckill.ts index 7ec0a525..61dfa7e9 100644 --- a/src/views/layout/components/main/default/seckill.ts +++ b/src/views/layout/components/main/default/seckill.ts @@ -33,7 +33,7 @@ interface DefaultSeckill { header_background_color_list: color_list[]; header_background_direction: string; header_background_img_style: string; - header_background_img_url: uploadList[]; + header_background_img: uploadList[]; shop_radius: radiusStyle; shop_img_radius: radiusStyle; shop_padding: paddingStyle; @@ -100,7 +100,7 @@ const defaultSeckill: DefaultSeckill = { header_background_color_list: [{ color: '', color_percentage: undefined }], header_background_direction: '180deg', header_background_img_style: '2', - header_background_img_url: [{ id: 1, url: new_url + 'header-bg.png', original: '背景', title: '背景1', ext: '.png', type: 'img' }], + header_background_img: [{ id: 1, url: new_url + 'header-bg.png', original: '背景', title: '背景1', ext: '.png', type: 'img' }], shop_radius: { radius: 8, radius_top_left: 8,