From 1352204668ad2e589773ed37b24eee6096681bc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com> Date: Wed, 4 Dec 2024 11:59:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=89=E9=A1=B9=E5=8D=A1?= =?UTF-8?q?=E5=9C=A8=E4=B8=8D=E5=90=8C=E7=BB=84=E4=BB=B6=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/base/bg-btn-style/index.vue | 2 +- src/components/base/margin/index.vue | 2 +- src/components/base/padding/index.vue | 2 +- src/components/base/radius/index.vue | 2 +- .../common/carousel-indicator/index.vue | 6 +- .../model-icon/model-icon-style.vue | 6 +- .../model-text/model-text-style.vue | 6 +- .../model-article-list-styles.vue | 26 +++--- src/components/model-article-tabs/index.vue | 42 ++++++++-- .../model-article-tabs-styles.vue | 79 ++++++++++++++++--- .../model-carousel/model-carousel-styles.vue | 39 ++++++++- .../components/custom-dialog/index.vue | 2 +- .../model-custom/model-custom-content.vue | 10 +++ .../magic-cube-settings/tabs-styles.vue | 6 +- src/components/model-goods-tabs/index.vue | 40 ++++++++-- .../model-goods-tabs-styles.vue | 51 ++++++++++++ src/components/model-tabs-carousel/index.vue | 44 ++++++++--- .../model-tabs/model-tabs-content.vue | 2 +- .../model-tabs/model-tabs-styles.vue | 20 +++++ src/components/page-settings/page-content.vue | 6 +- src/components/page-settings/page-styles.vue | 6 +- src/config/const/article-tabs.ts | 34 ++++++++ src/config/const/goods-tabs.ts | 42 +++++++++- src/config/const/tabs-carousel.ts | 34 ++++++++ src/utils/request.ts | 1 - 25 files changed, 429 insertions(+), 81 deletions(-) diff --git a/src/components/base/bg-btn-style/index.vue b/src/components/base/bg-btn-style/index.vue index 6dd50b92..4455ef0f 100644 --- a/src/components/base/bg-btn-style/index.vue +++ b/src/components/base/bg-btn-style/index.vue @@ -1,6 +1,6 @@ - + diff --git a/src/config/const/article-tabs.ts b/src/config/const/article-tabs.ts index fb59afb4..5fd33697 100644 --- a/src/config/const/article-tabs.ts +++ b/src/config/const/article-tabs.ts @@ -49,8 +49,18 @@ interface DefaultArticleTabs { tabs_size: number; tabs_color: string; tabs_spacing: number; + tabs_bg_direction: string, + tabs_bg_color_list: color_list[], + tabs_bg_background_img_style: string, + tabs_bg_background_img: string[], tabs_sign_spacing: number; tabs_padding: paddingStyle; + article_content_direction: string; + article_content_color_list: color_list[]; + article_content_background_img_style: string; + article_content_background_img: string[]; + article_content_margin: marginStyle; + article_content_padding: paddingStyle; article_direction: string, article_color_list: color_list[], article_background_img_style: string, @@ -126,6 +136,11 @@ const defaultArticleTabs: DefaultArticleTabs = { tabs_color: 'rgba(51,51,51,1)', tabs_spacing: 20, tabs_sign_spacing: 4, + // 选项卡背景设置 + tabs_bg_direction: '90deg', + tabs_bg_color_list: [{ color: '', color_percentage: undefined }], + tabs_bg_background_img_style: '2', + tabs_bg_background_img: [], tabs_padding: { padding: 0, padding_top: 0, @@ -133,6 +148,25 @@ const defaultArticleTabs: DefaultArticleTabs = { padding_left: 0, padding_right: 0, }, + // 文章内容设置 + article_content_direction: '90deg', + article_content_color_list: [{ color: '', color_percentage: undefined }], + article_content_background_img_style: '2', + article_content_background_img: [], + article_content_margin: { + margin: 0, + margin_top: 10, + margin_bottom: 0, + margin_left: 0, + margin_right: 0, + }, + article_content_padding: { + padding: 0, + padding_top: 0, + padding_bottom: 0, + padding_left: 0, + padding_right: 0, + }, // 文章背景设置 article_direction: '90deg', article_color_list: [{ color: '#fff', color_percentage: undefined }], diff --git a/src/config/const/goods-tabs.ts b/src/config/const/goods-tabs.ts index 0ab98b63..d452c6dd 100644 --- a/src/config/const/goods-tabs.ts +++ b/src/config/const/goods-tabs.ts @@ -53,11 +53,21 @@ interface DefaultProductList { tabs_color: string; tabs_spacing: number; tabs_sign_spacing: number; + tabs_bg_direction: string, + tabs_bg_color_list: color_list[], + tabs_bg_background_img_style: string, + tabs_bg_background_img: string[], tabs_padding: paddingStyle; - shop_direction: string, - shop_color_list: color_list[], - shop_background_img_style: string, - shop_background_img: uploadList[], + shop_content_direction: string; + shop_content_color_list: color_list[]; + shop_content_background_img_style: string; + shop_content_background_img: string[]; + shop_content_margin: marginStyle; + shop_content_padding: paddingStyle; + shop_direction: string; + shop_color_list: color_list[]; + shop_background_img_style: string; + shop_background_img: uploadList[]; shop_padding: paddingStyle; shop_img_radius: radiusStyle; shop_radius: radiusStyle; @@ -157,6 +167,11 @@ const defaultProductList: DefaultProductList = { // tabs间距 tabs_spacing: 20, tabs_sign_spacing: 4, + // 选项卡背景设置 + tabs_bg_direction: '90deg', + tabs_bg_color_list: [{ color: '', color_percentage: undefined }], + tabs_bg_background_img_style: '2', + tabs_bg_background_img: [], tabs_padding: { padding: 0, padding_top: 0, @@ -164,6 +179,25 @@ const defaultProductList: DefaultProductList = { padding_left: 0, padding_right: 0, }, + // 商品内容设置 + shop_content_direction: '90deg', + shop_content_color_list: [{ color: '', color_percentage: undefined }], + shop_content_background_img_style: '2', + shop_content_background_img: [], + shop_content_margin: { + margin: 0, + margin_top: 10, + margin_bottom: 0, + margin_left: 0, + margin_right: 0, + }, + shop_content_padding: { + padding: 0, + padding_top: 0, + padding_bottom: 0, + padding_left: 0, + padding_right: 0, + }, // 商品背景设置 shop_direction: '90deg', shop_color_list: [{ color: '#fff', color_percentage: undefined }], diff --git a/src/config/const/tabs-carousel.ts b/src/config/const/tabs-carousel.ts index b519b851..e5adde2a 100644 --- a/src/config/const/tabs-carousel.ts +++ b/src/config/const/tabs-carousel.ts @@ -41,7 +41,17 @@ interface defaultTabs { tabs_color: string; tabs_spacing: number; tabs_sign_spacing: number; + tabs_bg_direction: string, + tabs_bg_color_list: color_list[], + tabs_bg_background_img_style: string, + tabs_bg_background_img: string[], tabs_padding: paddingStyle; + carousel_content_direction: string; + carousel_content_color_list: color_list[]; + carousel_content_background_img_style: string; + carousel_content_background_img: string[]; + carousel_content_margin: marginStyle; + carousel_content_padding: paddingStyle; more_icon_class: string; more_icon_color: string; more_icon_size: number; @@ -137,6 +147,11 @@ const defaultTabs: defaultTabs = { tabs_color: 'rgba(51,51,51,1)', tabs_spacing: 20, tabs_sign_spacing: 4, + // 选项卡背景设置 + tabs_bg_direction: '90deg', + tabs_bg_color_list: [{ color: '', color_percentage: undefined }], + tabs_bg_background_img_style: '2', + tabs_bg_background_img: [], tabs_padding: { padding: 0, padding_top: 0, @@ -144,6 +159,25 @@ const defaultTabs: defaultTabs = { padding_left: 0, padding_right: 0, }, + // 轮播内间距设置 + carousel_content_direction: '90deg', + carousel_content_color_list: [{ color: '', color_percentage: undefined }], + carousel_content_background_img_style: '2', + carousel_content_background_img: [], + carousel_content_margin: { + margin: 0, + margin_top: 10, + margin_bottom: 0, + margin_left: 0, + margin_right: 0, + }, + carousel_content_padding: { + padding: 0, + padding_top: 0, + padding_bottom: 0, + padding_left: 0, + padding_right: 0, + }, // 更多设置 more_icon_class: 'category-more', more_icon_color: '#000', diff --git a/src/utils/request.ts b/src/utils/request.ts index 26f07979..a4d7010f 100644 --- a/src/utils/request.ts +++ b/src/utils/request.ts @@ -91,7 +91,6 @@ service.interceptors.response.use( } }, (error: any) => { - console.log(error); if (error.response && error.response.data) { const { msg, message } = error.response.data; message_error(msg || message || '系统出错');