From 6e9c319da9a1a991fbae90dbf7cb5c9936086c20 Mon Sep 17 00:00:00 2001 From: sws <1141121512@qq.com> Date: Mon, 9 Sep 2024 10:48:35 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=8E=A5=E5=8F=A3=E8=B0=83=E7=94=A8=E4=BC=98?= =?UTF-8?q?=E5=8C=96=EF=BC=8C=E5=87=8F=E5=B0=91=E6=8E=A5=E5=8F=A3=E8=B0=83?= =?UTF-8?q?=E7=94=A8=E6=AC=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/index.ts | 6 ---- .../components/main/default/article-list.ts | 2 ++ .../components/main/default/article-tabs.ts | 13 +++++---- .../layout/components/main/default/coupon.ts | 2 ++ src/views/layout/index.vue | 29 +++++++------------ 5 files changed, 22 insertions(+), 30 deletions(-) diff --git a/src/utils/index.ts b/src/utils/index.ts index 98662b0d..731c0ea4 100644 --- a/src/utils/index.ts +++ b/src/utils/index.ts @@ -347,12 +347,6 @@ export const online_url = async (directory: string = '') => { return temp_data.default.temp_attachment_host + directory; } else { let attachemnt_host = common.config.attachment_host; - if (!attachemnt_host) { - await CommonAPI.getInit().then((res: any) => { - set_common(res.data); - attachemnt_host = res.data.config.attachment_host; - }); - } return attachemnt_host + directory; } }; diff --git a/src/views/layout/components/main/default/article-list.ts b/src/views/layout/components/main/default/article-list.ts index 39ee3049..36790265 100644 --- a/src/views/layout/components/main/default/article-list.ts +++ b/src/views/layout/components/main/default/article-list.ts @@ -15,6 +15,7 @@ interface DefaultArticleList { category: string[]; data_list: ArticleList[]; data_ids: string; + data_auto_list: ArticleList[]; number: number; sort: string; sort_rules: string; @@ -50,6 +51,7 @@ const defaultArticleList: DefaultArticleList = { category: [], data_list: [], data_ids: '', + data_auto_list: [], number: 4, sort: '0', sort_rules: '0', diff --git a/src/views/layout/components/main/default/article-tabs.ts b/src/views/layout/components/main/default/article-tabs.ts index f97c5428..cb50ef17 100644 --- a/src/views/layout/components/main/default/article-tabs.ts +++ b/src/views/layout/components/main/default/article-tabs.ts @@ -16,6 +16,7 @@ interface articleTabsList { sort_rules: string; is_cover: string; data_list: ArticleList[]; + data_auto_list: ArticleList[]; } interface DefaultArticleTabs { content: { @@ -63,12 +64,12 @@ const defaultArticleTabs: DefaultArticleTabs = { article_theme: '0', article_carousel_col: '2', tabs_list: [ - { id: '1', title: '热门推荐', desc: '简介', data_type: '0', category: [], number: 4, sort: '0', sort_rules: '0', is_cover: '1', data_list: [] }, - { id: '2', title: '测试一', desc: '简介', data_type: '0', category: [], number: 4, sort: '0', sort_rules: '0', is_cover: '1', data_list: [] }, - { id: '3', title: '测试二', desc: '简介', data_type: '0', category: [], number: 4, sort: '0', sort_rules: '0', is_cover: '1', data_list: [] }, - { id: '4', title: '测试三', desc: '简介', data_type: '0', category: [], number: 4, sort: '0', sort_rules: '0', is_cover: '1', data_list: [] }, - { id: '5', title: '测试四', desc: '简介', data_type: '0', category: [], number: 4, sort: '0', sort_rules: '0', is_cover: '1', data_list: [] }, - { id: '6', title: '测试五', desc: '简介', data_type: '0', category: [], number: 4, sort: '0', sort_rules: '0', is_cover: '1', data_list: [] }, + { id: '1', title: '热门推荐', desc: '简介', data_type: '0', category: [], number: 4, sort: '0', sort_rules: '0', is_cover: '1', data_list: [], data_auto_list: [] }, + { id: '2', title: '测试一', desc: '简介', data_type: '0', category: [], number: 4, sort: '0', sort_rules: '0', is_cover: '1', data_list: [], data_auto_list: [] }, + { id: '3', title: '测试二', desc: '简介', data_type: '0', category: [], number: 4, sort: '0', sort_rules: '0', is_cover: '1', data_list: [], data_auto_list: [] }, + { id: '4', title: '测试三', desc: '简介', data_type: '0', category: [], number: 4, sort: '0', sort_rules: '0', is_cover: '1', data_list: [], data_auto_list: [] }, + { id: '5', title: '测试四', desc: '简介', data_type: '0', category: [], number: 4, sort: '0', sort_rules: '0', is_cover: '1', data_list: [], data_auto_list: [] }, + { id: '6', title: '测试五', desc: '简介', data_type: '0', category: [], number: 4, sort: '0', sort_rules: '0', is_cover: '1', data_list: [], data_auto_list: [] }, ], field_show: ['0', '1'], }, diff --git a/src/views/layout/components/main/default/coupon.ts b/src/views/layout/components/main/default/coupon.ts index 57b78322..d76ac65f 100644 --- a/src/views/layout/components/main/default/coupon.ts +++ b/src/views/layout/components/main/default/coupon.ts @@ -9,6 +9,7 @@ interface DefaultCoupon { desc: string; data_list: object[]; data_ids: string; + data_auto_list: object[]; }; style: { price_color: string; @@ -43,6 +44,7 @@ const defaultCoupoin: DefaultCoupon = { desc: '领券下单·享购物优惠', data_list: [], data_ids: '', + data_auto_list: [], }, style: { price_color: '#FF3830', diff --git a/src/views/layout/index.vue b/src/views/layout/index.vue index 8f2d7729..2164d132 100644 --- a/src/views/layout/index.vue +++ b/src/views/layout/index.vue @@ -85,7 +85,6 @@ const form = ref({ const diy_data_item = ref({}); const key = ref(''); -const api_count = ref(0); const right_update = (item: any, diy: [Array], header: headerAndFooter, footer: headerAndFooter) => { diy_data_item.value = item; @@ -127,11 +126,8 @@ const clear_data_event = () => { }; //#region 页面初始化数据 ---------------------start // 页面加载 -onBeforeMount(async () => { - await common_init(); -}); onMounted(() => { - init(); + common_init(); }); const is_empty = ref(false); const init = () => { @@ -142,13 +138,13 @@ const init = () => { } else { is_empty.value = true; } - api_count.value += 1; - loading_event(api_count.value); + loading_event(); }); } else { + temp_form.value.header.com_data = defaultSettings.header_nav; + temp_form.value.footer.com_data = defaultSettings.footer_nav; form.value = cloneDeep(temp_form.value); - api_count.value = 1; - loading_event(api_count.value); + loading_event(); } }; @@ -156,20 +152,17 @@ const init = () => { const common_init = () => { CommonAPI.getInit().then((res: any) => { common_store.set_common(res.data); - api_count.value += 1; - loading_event(api_count.value); + init(); }); }; // 加载动画 const loading = ref(true); const loading_content = ref(true); -const loading_event = (count: number) => { - if (count == 2) { - loading_content.value = false; - setTimeout(() => { - loading.value = false; - }, 1000); - } +const loading_event = () => { + loading_content.value = false; + setTimeout(() => { + loading.value = false; + }, 1000); }; //#endregion 页面初始化数据 ---------------------end