Merge branch 'dev-sws' into dev-yxl

src/components/common/url-value/link-custom.vue

@@ -48,7 +48,6 @@
 </template>
 <script lang="ts" setup>
 import type { FormInstance } from 'element-plus';
-import { pageLinkList } from '@/store';
 const props = defineProps({
     status: {
         type: Boolean,

src/components/common/url-value/link-goods-search.vue

@@ -137,7 +137,7 @@ const three_item_text = ref('');
 const goods_item_click = (item: pageLinkList, level: number, index: number) => {
     if (level === 1) {
         one_item_index.value = index + 1;
-        one_item_text.value = item.name;
+        one_item_text.value = item.name || '';
         two_item_index.value = 0;
         two_item_text.value = '';
         three_item_index.value = 0;
@@ -146,13 +146,13 @@ const goods_item_click = (item: pageLinkList, level: number, index: number) => {
         three_item_data.value = [];
     } else if (level === 2) {
         two_item_index.value = index + 1;
-        two_item_text.value = item.name;
+        two_item_text.value = item.name || '';
         three_item_index.value = 0;
         three_item_text.value = '';
         three_item_data.value = [];
     } else {
         three_item_index.value = index + 1;
-        three_item_text.value = item.name;
+        three_item_text.value = item.name || '';
     }
     if (item.items && item.items.length > 0) {
         if (level === 1) {

src/components/common/url-value/link-table.vue

@@ -38,7 +38,6 @@
 </template>
 <script lang="ts" setup>
 import UrlValueAPI from '@/api/url-value';
-import { pageLinkList } from '@/store';
 const props = defineProps({
     type: {
         type: String,

src/layout/components/main/default/footer-nav.ts

@@ -16,16 +16,16 @@ const defaultFooterNav: DefaultFooterNav = {
         nav_style: '0',
         nav_type: '0',
         nav_content: [
-            { id: '1', name: '首页', src: [{ id: 1, url: '/src/assets/images/layout/main/phone.png', original: '头像1', title: '头像1', ext: '.png', type: 'img' }], src_checked: [{ id: 1, url: '/src/assets/images/layout/main/phone.png', original: '头像1', title: '头像1', ext: '.png', type: 'img' }], href: {} },
+            { id: '1', name: '首页', src: [{ id: 1, url: '/src/assets/images/layout/main/foot/home.png', original: '头像1', title: '头像1', ext: '.png', type: 'img' }], src_checked: [{ id: 1, url: '/src/assets/images/layout/main/foot/home-checked.png', original: '头像1', title: '头像1', ext: '.png', type: 'img' }], href: {} },
-            { id: '2', name: '分类', src: [{ id: 1, url: '/src/assets/images/layout/main/phone.png', original: '头像1', title: '头像1', ext: '.png', type: 'img' }], src_checked: [{ id: 1, url: '/src/assets/images/layout/main/phone.png', original: '头像1', title: '头像1', ext: '.png', type: 'img' }], href: {} },
+            { id: '2', name: '分类', src: [{ id: 1, url: '/src/assets/images/layout/main/foot/category.png', original: '头像1', title: '头像1', ext: '.png', type: 'img' }], src_checked: [{ id: 1, url: '/src/assets/images/layout/main/foot/category-checked.png', original: '头像1', title: '头像1', ext: '.png', type: 'img' }], href: {} },
-            { id: '3', name: '购物车', src: [{ id: 1, url: '/src/assets/images/layout/main/phone.png', original: '头像1', title: '头像1', ext: '.png', type: 'img' }], src_checked: [{ id: 1, url: '/src/assets/images/layout/main/phone.png', original: '头像1', title: '头像1', ext: '.png', type: 'img' }], href: {} },
+            { id: '3', name: '购物车', src: [{ id: 1, url: '/src/assets/images/layout/main/foot/cart.png', original: '头像1', title: '头像1', ext: '.png', type: 'img' }], src_checked: [{ id: 1, url: '/src/assets/images/layout/main/foot/cart-checked.png', original: '头像1', title: '头像1', ext: '.png', type: 'img' }], href: {} },
-            { id: '4', name: '我的', src: [{ id: 1, url: '/src/assets/images/layout/main/phone.png', original: '头像1', title: '头像1', ext: '.png', type: 'img' }], src_checked: [{ id: 1, url: '/src/assets/images/layout/main/phone.png', original: '头像1', title: '头像1', ext: '.png', type: 'img' }], href: {} },
+            { id: '4', name: '我的', src: [{ id: 1, url: '/src/assets/images/layout/main/foot/user.png', original: '头像1', title: '头像1', ext: '.png', type: 'img' }], src_checked: [{ id: 1, url: '/src/assets/images/layout/main/foot/user-checked.png', original: '头像1', title: '头像1', ext: '.png', type: 'img' }], href: {} },
         ],
     },
     style: {
-        text_color_checked: 'rgba(204, 204, 204, 1)',
+        text_color_checked: 'rgba(255, 0, 0, 1)',
         default_text_color: 'rgba(0, 0, 0, 1)',
-        common_style: { ...defaultCommon, color_list: [{ color: 'rgba(255,255,255,1)', color_percentage: '' }]},
+        common_style: { ...defaultCommon, color_list: [{ color: 'rgba(255,255,255,1)', color_percentage: '' }] },
     },
 };