diff --git a/src/components/footer-nav/index copy.vue b/src/components/footer-nav/index copy.vue
deleted file mode 100644
index bb582f9f..00000000
--- a/src/components/footer-nav/index copy.vue
+++ /dev/null
@@ -1,116 +0,0 @@
-
-
-
-
-
diff --git a/src/components/model-coupon/index.vue b/src/components/model-coupon/index.vue
index 26ea5b0f..07acf88d 100644
--- a/src/components/model-coupon/index.vue
+++ b/src/components/model-coupon/index.vue
@@ -832,7 +832,9 @@ onBeforeMount(() => {
}
}
}
-.hide-scrollbar .el-scrollbar__bar {
- display: none;
+.hide-scrollbar {
+ :deep(.el-scrollbar__bar) {
+ display: none !important;
+ }
}
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 f30b1021..4938861a 100644
--- a/src/components/model-data-magic/model-data-magic-content.vue
+++ b/src/components/model-data-magic/model-data-magic-content.vue
@@ -97,6 +97,7 @@ const data_content = {
heading_title: '主标题',
subtitle: '副标题',
goods_list:[],
+ goods_ids: '',
is_show: ['title', 'price'],
images_list:[
{
diff --git a/src/types/components.d.ts b/src/types/components.d.ts
deleted file mode 100644
index 7e2a8dbc..00000000
--- a/src/types/components.d.ts
+++ /dev/null
@@ -1,222 +0,0 @@
-/* eslint-disable */
-/* prettier-ignore */
-// @ts-nocheck
-// Generated by unplugin-vue-components
-// Read more: https://github.com/vuejs/core/pull/3399
-export {}
-
-declare module 'vue' {
- export interface GlobalComponents {
- BdMap: typeof import('./../components/base/maps/bd-map.vue')['default']
- CardContainer: typeof import('./../components/base/card-container/index.vue')['default']
- CarouselIndicator: typeof import('./../components/common/carousel-indicator/index.vue')['default']
- ColorPicker: typeof import('./../components/base/color-picker/index.vue')['default']
- ColorTextSizeGroup: typeof import('./../components/common/color-text-size-group/index.vue')['default']
- CommonStyles: typeof import('./../components/common/common-styles/index.vue')['default']
- Components: typeof import('./../components/model-custom/components/index.vue')['default']
- copy: typeof import('./../components/footer-nav/index copy.vue')['default']
- Dialog: typeof import('./../components/model-custom/components/dialog.vue')['default']
- Drag: typeof import('./../components/base/drag/index.vue')['default']
- DragGroup: typeof import('./../components/common/drag-group/index.vue')['default']
- ElBadge: typeof import('element-plus/es')['ElBadge']
- ElButton: typeof import('element-plus/es')['ElButton']
- ElCarousel: typeof import('element-plus/es')['ElCarousel']
- ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem']
- ElCascader: typeof import('element-plus/es')['ElCascader']
- ElCascaderPanel: typeof import('element-plus/es')['ElCascaderPanel']
- ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
- ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
- ElCol: typeof import('element-plus/es')['ElCol']
- ElCollapse: typeof import('element-plus/es')['ElCollapse']
- ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem']
- ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
- ElDialog: typeof import('element-plus/es')['ElDialog']
- ElForm: typeof import('element-plus/es')['ElForm']
- ElFormItem: typeof import('element-plus/es')['ElFormItem']
- ElIcon: typeof import('element-plus/es')['ElIcon']
- ElImage: typeof import('element-plus/es')['ElImage']
- ElImageViewer: typeof import('element-plus/es')['ElImageViewer']
- ElInput: typeof import('element-plus/es')['ElInput']
- ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
- ElMenu: typeof import('element-plus/es')['ElMenu']
- ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
- ElOption: typeof import('element-plus/es')['ElOption']
- ElPagination: typeof import('element-plus/es')['ElPagination']
- ElPopover: typeof import('element-plus/es')['ElPopover']
- ElRadio: typeof import('element-plus/es')['ElRadio']
- ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
- ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
- ElRow: typeof import('element-plus/es')['ElRow']
- ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
- ElSelect: typeof import('element-plus/es')['ElSelect']
- ElSlider: typeof import('element-plus/es')['ElSlider']
- ElSwitch: typeof import('element-plus/es')['ElSwitch']
- ElTable: typeof import('element-plus/es')['ElTable']
- ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
- ElTabPane: typeof import('element-plus/es')['ElTabPane']
- ElTabs: typeof import('element-plus/es')['ElTabs']
- ElTooltip: typeof import('element-plus/es')['ElTooltip']
- ElTree: typeof import('element-plus/es')['ElTree']
- ElUpload: typeof import('element-plus/es')['ElUpload']
- FlexGradientsCreate: typeof import('./../components/common/flex-gradients-create/index.vue')['default']
- FooterNav: typeof import('./../components/footer-nav/index.vue')['default']
- FooterNavContent: typeof import('./../components/footer-nav/footer-nav-content.vue')['default']
- FooterNavSetting: typeof import('./../components/footer-nav/footer-nav-setting.vue')['default']
- FooterNavStyles: typeof import('./../components/footer-nav/footer-nav-styles.vue')['default']
- FormUploadCategory: typeof import('./../components/common/upload/form-upload-category.vue')['default']
- GdMap: typeof import('./../components/base/maps/gd-map.vue')['default']
- Hot: typeof import('./../components/common/hot/index.vue')['default']
- Icon: typeof import('./../components/base/icon/index.vue')['default']
- ImageEmpty: typeof import('./../components/base/image-empty/index.vue')['default']
- 'Index copy': typeof import('./../components/footer-nav/index copy.vue')['default']
- InputNumber: typeof import('./../components/base/input-number/index.vue')['default']
- LinkArticles: typeof import('./../components/common/url-value/link-articles.vue')['default']
- LinkBrand: typeof import('./../components/common/url-value/link-brand.vue')['default']
- LinkCoupon: typeof import('./../components/common/url-value/link-coupon.vue')['default']
- LinkCustom: typeof import('./../components/common/url-value/link-custom.vue')['default']
- LinkGoods: typeof import('./../components/common/url-value/link-goods.vue')['default']
- LinkGoodsCategory: typeof import('./../components/common/url-value/link-goods-category.vue')['default']
- LinkGoodsSearch: typeof import('./../components/common/url-value/link-goods-search.vue')['default']
- LinkList: typeof import('./../components/common/url-value/link-list.vue')['default']
- LinkTable: typeof import('./../components/common/url-value/link-table.vue')['default']
- MagicCarousel: typeof import('./../components/model-data-magic/components/magic-carousel.vue')['default']
- MagicCube: typeof import('./../components/common/magic-cube/index.vue')['default']
- Main: typeof import('./../views/layout/components/main/index.vue')['default']
- Maps: typeof import('./../components/base/maps/index.vue')['default']
- Margin: typeof import('./../components/base/margin/index.vue')['default']
- ModelArticleList: typeof import('./../components/model-article-list/index.vue')['default']
- ModelArticleListContent: typeof import('./../components/model-article-list/model-article-list-content.vue')['default']
- ModelArticleListSetting: typeof import('./../components/model-article-list/model-article-list-setting.vue')['default']
- ModelArticleListStyles: typeof import('./../components/model-article-list/model-article-list-styles.vue')['default']
- ModelArticleTabs: typeof import('./../components/model-article-tabs/index.vue')['default']
- ModelArticleTabsContent: typeof import('./../components/model-article-tabs/model-article-tabs-content.vue')['default']
- ModelArticleTabsSetting: typeof import('./../components/model-article-tabs/model-article-tabs-setting.vue')['default']
- ModelArticleTabsStyles: typeof import('./../components/model-article-tabs/model-article-tabs-styles.vue')['default']
- ModelAuxiliaryBlank: typeof import('./../components/model-auxiliary-blank/index.vue')['default']
- ModelAuxiliaryBlankContent: typeof import('./../components/model-auxiliary-blank/model-auxiliary-blank-content.vue')['default']
- ModelAuxiliaryBlankSetting: typeof import('./../components/model-auxiliary-blank/model-auxiliary-blank-setting.vue')['default']
- ModelAuxiliaryBlankStyles: typeof import('./../components/model-auxiliary-blank/model-auxiliary-blank-styles.vue')['default']
- ModelAuxiliaryLine: typeof import('./../components/model-auxiliary-line/index.vue')['default']
- ModelAuxiliaryLineContent: typeof import('./../components/model-auxiliary-line/model-auxiliary-line-content.vue')['default']
- ModelAuxiliaryLineSetting: typeof import('./../components/model-auxiliary-line/model-auxiliary-line-setting.vue')['default']
- ModelAuxiliaryLineStyles: typeof import('./../components/model-auxiliary-line/model-auxiliary-line-styles.vue')['default']
- ModelCarousel: typeof import('./../components/model-carousel/index.vue')['default']
- ModelCarouselContent: typeof import('./../components/model-carousel/model-carousel-content.vue')['default']
- ModelCarouselSetting: typeof import('./../components/model-carousel/model-carousel-setting.vue')['default']
- ModelCarouselStyles: typeof import('./../components/model-carousel/model-carousel-styles.vue')['default']
- ModelCoupon: typeof import('./../components/model-coupon/index.vue')['default']
- ModelCouponContent: typeof import('./../components/model-coupon/model-coupon-content.vue')['default']
- ModelCouponSetting: typeof import('./../components/model-coupon/model-coupon-setting.vue')['default']
- ModelCouponStyles: typeof import('./../components/model-coupon/model-coupon-styles.vue')['default']
- ModelCustom: typeof import('./../components/model-custom/index.vue')['default']
- ModelCustomContent: typeof import('./../components/model-custom/model-custom-content.vue')['default']
- ModelCustomSetting: typeof import('./../components/model-custom/model-custom-setting.vue')['default']
- ModelCustomStyles: typeof import('./../components/model-custom/model-custom-styles.vue')['default']
- ModelDataMagic: typeof import('./../components/model-data-magic/index.vue')['default']
- ModelDataMagicContent: typeof import('./../components/model-data-magic/model-data-magic-content.vue')['default']
- ModelDataMagicSetting: typeof import('./../components/model-data-magic/model-data-magic-setting.vue')['default']
- ModelDataMagicStyles: typeof import('./../components/model-data-magic/model-data-magic-styles.vue')['default']
- ModelFloatWindow: typeof import('./../components/model-float-window/index.vue')['default']
- ModelFloatWindowContent: typeof import('./../components/model-float-window/model-float-window-content.vue')['default']
- ModelFloatWindowSetting: typeof import('./../components/model-float-window/model-float-window-setting.vue')['default']
- ModelFloatWindowStyles: typeof import('./../components/model-float-window/model-float-window-styles.vue')['default']
- ModelGoodsList: typeof import('./../components/model-goods-list/index.vue')['default']
- ModelGoodsListContent: typeof import('./../components/model-goods-list/model-goods-list-content.vue')['default']
- ModelGoodsListSetting: typeof import('./../components/model-goods-list/model-goods-list-setting.vue')['default']
- ModelGoodsListStyles: typeof import('./../components/model-goods-list/model-goods-list-styles.vue')['default']
- ModelGoodsTabs: typeof import('./../components/model-goods-tabs/index.vue')['default']
- ModelGoodsTabsContent: typeof import('./../components/model-goods-tabs/model-goods-tabs-content.vue')['default']
- ModelGoodsTabsSetting: typeof import('./../components/model-goods-tabs/model-goods-tabs-setting.vue')['default']
- ModelGoodsTabsStyles: typeof import('./../components/model-goods-tabs/model-goods-tabs-styles.vue')['default']
- ModelHotZone: typeof import('./../components/model-hot-zone/index.vue')['default']
- ModelHotZoneContent: typeof import('./../components/model-hot-zone/model-hot-zone-content.vue')['default']
- ModelHotZoneSetting: typeof import('./../components/model-hot-zone/model-hot-zone-setting.vue')['default']
- ModelHotZoneStyles: typeof import('./../components/model-hot-zone/model-hot-zone-styles.vue')['default']
- ModelImage: typeof import('./../components/common/custom-module/model-image/index.vue')['default']
- ModelImageStyle: typeof import('./../components/common/custom-module/model-image/model-image-style.vue')['default']
- ModelImgMagic: typeof import('./../components/model-img-magic/index.vue')['default']
- ModelImgMagicContent: typeof import('./../components/model-img-magic/model-img-magic-content.vue')['default']
- ModelImgMagicSetting: typeof import('./../components/model-img-magic/model-img-magic-setting.vue')['default']
- ModelImgMagicStyles: typeof import('./../components/model-img-magic/model-img-magic-styles.vue')['default']
- ModelLines: typeof import('./../components/common/custom-module/model-lines/index.vue')['default']
- ModelLinesStyle: typeof import('./../components/common/custom-module/model-lines/model-lines-style.vue')['default']
- ModelNavGroup: typeof import('./../components/model-nav-group/index.vue')['default']
- ModelNavGroupContent: typeof import('./../components/model-nav-group/model-nav-group-content.vue')['default']
- ModelNavGroupSetting: typeof import('./../components/model-nav-group/model-nav-group-setting.vue')['default']
- ModelNavGroupStyles: typeof import('./../components/model-nav-group/model-nav-group-styles.vue')['default']
- ModelNotice: typeof import('./../components/model-notice/index.vue')['default']
- ModelNoticeContent: typeof import('./../components/model-notice/model-notice-content.vue')['default']
- ModelNoticeSetting: typeof import('./../components/model-notice/model-notice-setting.vue')['default']
- ModelNoticeStyles: typeof import('./../components/model-notice/model-notice-styles.vue')['default']
- ModelRichText: typeof import('./../components/model-rich-text/index.vue')['default']
- ModelRichTextContent: typeof import('./../components/model-rich-text/model-rich-text-content.vue')['default']
- ModelRichTextSetting: typeof import('./../components/model-rich-text/model-rich-text-setting.vue')['default']
- ModelRichTextStyles: typeof import('./../components/model-rich-text/model-rich-text-styles.vue')['default']
- ModelSearch: typeof import('./../components/model-search/index.vue')['default']
- ModelSearchContent: typeof import('./../components/model-search/model-search-content.vue')['default']
- ModelSearchSetting: typeof import('./../components/model-search/model-search-setting.vue')['default']
- ModelSearchStyles: typeof import('./../components/model-search/model-search-styles.vue')['default']
- ModelSeckill: typeof import('./../components/model-seckill/index.vue')['default']
- ModelSeckillContent: typeof import('./../components/model-seckill/model-seckill-content.vue')['default']
- ModelSeckillSetting: typeof import('./../components/model-seckill/model-seckill-setting.vue')['default']
- ModelSeckillStyles: typeof import('./../components/model-seckill/model-seckill-styles.vue')['default']
- ModelShopList: typeof import('./../components/model-shop-list/index.vue')['default']
- ModelShopListContent: typeof import('./../components/model-shop-list/model-shop-list-content.vue')['default']
- ModelShopListSetting: typeof import('./../components/model-shop-list/model-shop-list-setting.vue')['default']
- ModelShopListStyles: typeof import('./../components/model-shop-list/model-shop-list-styles.vue')['default']
- ModelShopTabs: typeof import('./../components/model-shop-tabs/index.vue')['default']
- ModelShopTabsContent: typeof import('./../components/model-shop-tabs/model-shop-tabs-content.vue')['default']
- ModelShopTabsSetting: typeof import('./../components/model-shop-tabs/model-shop-tabs-setting.vue')['default']
- ModelShopTabsStyles: typeof import('./../components/model-shop-tabs/model-shop-tabs-styles.vue')['default']
- ModelTabs: typeof import('./../components/model-tabs/index.vue')['default']
- ModelTabsContent: typeof import('./../components/model-tabs/model-tabs-content.vue')['default']
- ModelTabsSetting: typeof import('./../components/model-tabs/model-tabs-setting.vue')['default']
- ModelTabsStyles: typeof import('./../components/model-tabs/model-tabs-styles.vue')['default']
- ModelText: typeof import('./../components/common/custom-module/model-text/index.vue')['default']
- ModelTextStyle: typeof import('./../components/common/custom-module/model-text/model-text-style.vue')['default']
- ModelTextTitle: typeof import('./../components/model-text-title/index.vue')['default']
- ModelTextTitleContent: typeof import('./../components/model-text-title/model-text-title-content.vue')['default']
- ModelTextTitleSetting: typeof import('./../components/model-text-title/model-text-title-setting.vue')['default']
- ModelTextTitleStyles: typeof import('./../components/model-text-title/model-text-title-styles.vue')['default']
- ModelUserInfo: typeof import('./../components/model-user-info/index.vue')['default']
- ModelUserInfoContent: typeof import('./../components/model-user-info/model-user-info-content.vue')['default']
- ModelUserInfoSetting: typeof import('./../components/model-user-info/model-user-info-setting.vue')['default']
- ModelUserInfoStyles: typeof import('./../components/model-user-info/model-user-info-styles.vue')['default']
- ModelVideo: typeof import('./../components/model-video/index.vue')['default']
- ModelVideoContent: typeof import('./../components/model-video/model-video-content.vue')['default']
- ModelVideoSetting: typeof import('./../components/model-video/model-video-setting.vue')['default']
- ModelVideoStyles: typeof import('./../components/model-video/model-video-styles.vue')['default']
- MultColorPicker: typeof import('./../components/common/mult-color-picker/index.vue')['default']
- Navbar: typeof import('./../views/layout/components/navbar/index.vue')['default']
- NoData: typeof import('./../components/base/no-data/index.vue')['default']
- Padding: typeof import('./../components/base/padding/index.vue')['default']
- PageContent: typeof import('./../components/page-settings/page-content.vue')['default']
- PageSetting: typeof import('./../components/page-settings/page-setting.vue')['default']
- PageSettings: typeof import('./../components/page-settings/index.vue')['default']
- PageStyles: typeof import('./../components/page-settings/page-styles.vue')['default']
- ProductListShow: typeof import('./../components/model-data-magic/components/product-list-show.vue')['default']
- ProductShowConfig: typeof import('./../components/common/product-show-config/index.vue')['default']
- Qrcode: typeof import('./../components/base/qrcode/index.vue')['default']
- Radius: typeof import('./../components/base/radius/index.vue')['default']
- RouterLink: typeof import('vue-router')['RouterLink']
- RouterView: typeof import('vue-router')['RouterView']
- Settings: typeof import('./../views/layout/components/settings/index.vue')['default']
- Slider: typeof import('./../components/base/slider/index.vue')['default']
- TabsContent: typeof import('./../components/model-data-magic/components/tabs-content.vue')['default']
- TabsStyles: typeof import('./../components/model-data-magic/components/tabs-styles.vue')['default']
- TabsView: typeof import('./../components/common/tabs-view/index.vue')['default']
- TextSizeType: typeof import('./../components/common/text-size-type/index.vue')['default']
- ThemeSelect: typeof import('./../components/common/theme-select/index.vue')['default']
- TMap: typeof import('./../components/base/maps/t-map.vue')['default']
- TransformCategory: typeof import('./../components/common/upload/transform-category.vue')['default']
- TxMap: typeof import('./../components/base/maps/tx-map.vue')['default']
- Upload: typeof import('./../components/common/upload/index.vue')['default']
- UploadIcon: typeof import('./../components/common/upload-icon/index.vue')['default']
- UploadModel: typeof import('./../components/common/upload/upload-model.vue')['default']
- UrlValue: typeof import('./../components/common/url-value/index.vue')['default']
- UrlValueDialog: typeof import('./../components/common/url-value/url-value-dialog.vue')['default']
- }
- export interface ComponentCustomProperties {
- vLoading: typeof import('element-plus/es')['ElLoadingDirective']
- }
-}
diff --git a/src/views/layout/components/main/default/coupon.ts b/src/views/layout/components/main/default/coupon.ts
index f958ba81..57b78322 100644
--- a/src/views/layout/components/main/default/coupon.ts
+++ b/src/views/layout/components/main/default/coupon.ts
@@ -8,6 +8,7 @@ interface DefaultCoupon {
title: string;
desc: string;
data_list: object[];
+ data_ids: string;
};
style: {
price_color: string;
@@ -41,6 +42,7 @@ const defaultCoupoin: DefaultCoupon = {
// 只有主题4用到
desc: '领券下单·享购物优惠',
data_list: [],
+ data_ids: '',
},
style: {
price_color: '#FF3830',
diff --git a/src/views/layout/index.vue b/src/views/layout/index.vue
index d0c78e33..f86f4a75 100644
--- a/src/views/layout/index.vue
+++ b/src/views/layout/index.vue
@@ -131,13 +131,6 @@ const init = () => {
// 初始化公共数据
const common_init = () => {
CommonAPI.getInit().then((res: any) => {
- // article_category ---- 文章分类
- // attachment_category ---- 附件分类
- // brand_category; ---- 品牌分类
- // brand_list ---- 品牌列表
- // goods_category ---- 商品分类
- // module_list ---- 模块列表
- //page_link_list ---- 页面链接
common_store.set_common(res.data);
api_count.value += 1;
loading_event(api_count.value);
@@ -159,16 +152,26 @@ const preview = () => {
console.log('预览');
};
const save = () => {
- formmat_form_data(form.value);
+ save_formmat_form_data(form.value);
};
const save_close = () => {
- formmat_form_data(form.value, true);
+ save_formmat_form_data(form.value, true);
};
-const formmat_form_data = (data: diy_data_item, close: boolean = false) => {
+const save_formmat_form_data = (data: diy_data_item, close: boolean = false) => {
const clone_form = cloneDeep(data);
clone_form.header.show_tabs = '1';
clone_form.footer.show_tabs = '0';
+ // const new_array = ['goods-list', 'goods-tabs', 'article-list', 'article-tabs', 'coupon'];
clone_form.diy_data = clone_form.diy_data.map((item: any) => {
+ // if (new_array.includes(item.key)) {
+ // item.com_data.content.data_ids = item.com_data.content.data_list.map((item: any) => item.data.id).join(',') || '';
+ // item.com_data.content.data_list = [];
+ // } else if (item.key == 'data-magic') {
+ // item.com_data.content.data_magic_list.map((item1: any) => {
+ // item1.goods_ids = item.goods_list.map((item2: any) => item2.data.id).join(',') || '';
+ // item1.goods_list = [];
+ // });
+ // }
return {
...item,
show_tabs: '0',