From 3f551363b46df010626d924f1c55d1851f84aee2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com> Date: Thu, 5 Sep 2024 14:36:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/footer-nav/footer-nav-content.vue | 8 ++++---- src/components/footer-nav/index copy.vue | 12 ++++++------ src/components/footer-nav/index.vue | 4 ++-- .../model-rich-text/model-rich-text-content.vue | 2 +- src/components/model-user-info/index.vue | 6 +++--- .../model-user-info/model-user-info-content.vue | 4 ++-- .../layout/components/main/default/footer-nav.ts | 10 +++++----- .../layout/components/main/default/user-info.ts | 6 +++--- 8 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/components/footer-nav/footer-nav-content.vue b/src/components/footer-nav/footer-nav-content.vue index 365ebbaa..86c87704 100644 --- a/src/components/footer-nav/footer-nav-content.vue +++ b/src/components/footer-nav/footer-nav-content.vue @@ -27,11 +27,11 @@
- + 未选中
- + 选中
@@ -39,7 +39,7 @@ - +
@@ -78,7 +78,7 @@ const add = () => { name: '', src: [], src_checked: [], - href: {}, + link: {}, }); }; diff --git a/src/components/footer-nav/index copy.vue b/src/components/footer-nav/index copy.vue index da83a9b2..bb582f9f 100644 --- a/src/components/footer-nav/index copy.vue +++ b/src/components/footer-nav/index copy.vue @@ -5,10 +5,10 @@
  • - +
    - +
    {{ item.name }} @@ -47,16 +47,16 @@ watch( const clone_nav_content = cloneDeep(new_content.nav_content); nav_content.value = clone_nav_content.map((item: any) => { - item.src = item.src.map((img: any) => { + item.img = item.img.map((img: any) => { return { ...img, - url: item.src.includes('/') ? img.url : url + img.url, + url: item.img.includes('/') ? img.url : url + img.url, }; }); - item.src_checked = item.src_checked.map((img: any) => { + item.img_checked = item.img_checked.map((img: any) => { return { ...img, - url: item.src_checked.includes('/') ? img.url : url + img.url, + url: item.img_checked.includes('/') ? img.url : url + img.url, }; }); return item; diff --git a/src/components/footer-nav/index.vue b/src/components/footer-nav/index.vue index 038e6487..93880463 100644 --- a/src/components/footer-nav/index.vue +++ b/src/components/footer-nav/index.vue @@ -5,10 +5,10 @@
  • - +
    - +
    {{ item.name }} diff --git a/src/components/model-rich-text/model-rich-text-content.vue b/src/components/model-rich-text/model-rich-text-content.vue index f637511f..fcf54458 100644 --- a/src/components/model-rich-text/model-rich-text-content.vue +++ b/src/components/model-rich-text/model-rich-text-content.vue @@ -38,7 +38,7 @@ const visibleDialog = ref(false); const rich_upload_type = ref('img'); // 编辑器配置 interface InsertFnType { - (url: string, alt?: string, href?: string): void; + (url: string, alt?: string, link?: string): void; } const editor_config = ref({ placeholder: '请输入内容...', diff --git a/src/components/model-user-info/index.vue b/src/components/model-user-info/index.vue index 846ef7a8..127b093f 100644 --- a/src/components/model-user-info/index.vue +++ b/src/components/model-user-info/index.vue @@ -48,12 +48,12 @@ interface icon_params { id: string; src: uploadList[]; icon: string; - href: string; + link: string; } const user_info = ref(['1', '2', '3', '4']); const icon_setting = ref([ - { id: '1', src: [], icon: '', href: 'a' }, - { id: '2', src: [], icon: '', href: 'a' }, + { id: '1', src: [], icon: '', link: 'a' }, + { id: '2', src: [], icon: '', link: 'a' }, ]); const base_data = reactive({ // 头像大小 diff --git a/src/components/model-user-info/model-user-info-content.vue b/src/components/model-user-info/model-user-info-content.vue index 34958da4..00d7f9b8 100644 --- a/src/components/model-user-info/model-user-info-content.vue +++ b/src/components/model-user-info/model-user-info-content.vue @@ -17,7 +17,7 @@ +添加 @@ -54,7 +54,7 @@ const add = () => { id: get_math(), src: [], icon: '', - href: {}, + link: {}, }); emit('update:value', form); }; diff --git a/src/views/layout/components/main/default/footer-nav.ts b/src/views/layout/components/main/default/footer-nav.ts index 93ae601d..0e8ee7dd 100644 --- a/src/views/layout/components/main/default/footer-nav.ts +++ b/src/views/layout/components/main/default/footer-nav.ts @@ -5,7 +5,7 @@ interface DefaultFooterNav { content: { nav_style: string; nav_type: string; - nav_content: { id: string; name: string; src: uploadList[]; src_checked: uploadList[]; href: object }[]; + nav_content: { id: string; name: string; img: uploadList[]; img_checked: uploadList[]; link: object }[]; }; style: { text_color_checked: string; @@ -18,10 +18,10 @@ const defaultFooterNav = ref({ nav_style: '0', nav_type: '0', nav_content: [ - { id: '1', name: '首页', src: [{ id: 1, url: new_url + 'home.png', original: '头像1', title: '头像1', ext: '.png', type: 'img' }], src_checked: [{ id: 1, url: new_url + 'active/home.png', original: '头像1', title: '头像1', ext: '.png', type: 'img' }], href: {} }, - { id: '2', name: '分类', src: [{ id: 1, url: new_url + 'category.png', original: '头像1', title: '头像1', ext: '.png', type: 'img' }], src_checked: [{ id: 1, url: new_url + 'active/category.png', original: '头像1', title: '头像1', ext: '.png', type: 'img' }], href: {} }, - { id: '3', name: '购物车', src: [{ id: 1, url: new_url + 'cart.png', original: '头像1', title: '头像1', ext: '.png', type: 'img' }], src_checked: [{ id: 1, url: new_url + 'active/cart.png', original: '头像1', title: '头像1', ext: '.png', type: 'img' }], href: {} }, - { id: '4', name: '我的', src: [{ id: 1, url: new_url + 'user.png', original: '头像1', title: '头像1', ext: '.png', type: 'img' }], src_checked: [{ id: 1, url: new_url + 'active/user.png', original: '头像1', title: '头像1', ext: '.png', type: 'img' }], href: {} }, + { id: '1', name: '首页', img: [{ id: 1, url: new_url + 'home.png', original: '头像1', title: '头像1', ext: '.png', type: 'img' }], img_checked: [{ id: 1, url: new_url + 'active/home.png', original: '头像1', title: '头像1', ext: '.png', type: 'img' }], link: {} }, + { id: '2', name: '分类', img: [{ id: 1, url: new_url + 'category.png', original: '头像1', title: '头像1', ext: '.png', type: 'img' }], img_checked: [{ id: 1, url: new_url + 'active/category.png', original: '头像1', title: '头像1', ext: '.png', type: 'img' }], link: {} }, + { id: '3', name: '购物车', img: [{ id: 1, url: new_url + 'cart.png', original: '头像1', title: '头像1', ext: '.png', type: 'img' }], img_checked: [{ id: 1, url: new_url + 'active/cart.png', original: '头像1', title: '头像1', ext: '.png', type: 'img' }], link: {} }, + { id: '4', name: '我的', img: [{ id: 1, url: new_url + 'user.png', original: '头像1', title: '头像1', ext: '.png', type: 'img' }], img_checked: [{ id: 1, url: new_url + 'active/user.png', original: '头像1', title: '头像1', ext: '.png', type: 'img' }], link: {} }, ], }, style: { diff --git a/src/views/layout/components/main/default/user-info.ts b/src/views/layout/components/main/default/user-info.ts index 69f5081d..34570634 100644 --- a/src/views/layout/components/main/default/user-info.ts +++ b/src/views/layout/components/main/default/user-info.ts @@ -2,7 +2,7 @@ import defaultCommon from './index'; interface DefaultUserInfo { content: { user_info: string[]; - icon_setting: { id: string; src: uploadList[]; href: object; icon: string }[]; + icon_setting: { id: string; src: uploadList[]; link: object; icon: string }[]; }; style: { user_avatar_size: string; @@ -29,8 +29,8 @@ const defaultUserInfo: DefaultUserInfo = { content: { user_info: ['1', '2', '3', '4', '5'], icon_setting: [ - { id: '1', src: [], icon: 'applet-me-settings-acquiesce', href: {} }, - { id: '2', src: [], icon: 'applet-me-message-acquiesce', href: {} }, + { id: '1', src: [], icon: 'applet-me-settings-acquiesce', link: {} }, + { id: '2', src: [], icon: 'applet-me-message-acquiesce', link: {} }, ], }, style: {