diff --git a/src/components/common/url-value/link-articles.vue b/src/components/common/url-value/link-articles.vue index 32cd0c6b..e7a27209 100644 --- a/src/components/common/url-value/link-articles.vue +++ b/src/components/common/url-value/link-articles.vue @@ -55,8 +55,10 @@ const props = defineProps({ }); watch( () => props.reset, - () => { - init(); + (val) => { + if (val) { + init(); + } } ); onMounted(() => { diff --git a/src/components/common/url-value/link-brand.vue b/src/components/common/url-value/link-brand.vue index e353b132..45bee6f6 100644 --- a/src/components/common/url-value/link-brand.vue +++ b/src/components/common/url-value/link-brand.vue @@ -56,8 +56,10 @@ const props = defineProps({ }); watch( () => props.reset, - () => { - init(); + (val) => { + if (val) { + init(); + } } ); onMounted(() => { diff --git a/src/components/common/url-value/link-custom.vue b/src/components/common/url-value/link-custom.vue index 31fcf2eb..6deb4d37 100644 --- a/src/components/common/url-value/link-custom.vue +++ b/src/components/common/url-value/link-custom.vue @@ -67,7 +67,7 @@ watch( ); watch( () => props.reset, - () => { + (val) => { reset_data(); custom_type_active.value = 0; } diff --git a/src/components/common/url-value/link-goods-category.vue b/src/components/common/url-value/link-goods-category.vue index 528ddbe6..e218bc67 100644 --- a/src/components/common/url-value/link-goods-category.vue +++ b/src/components/common/url-value/link-goods-category.vue @@ -73,12 +73,12 @@ const filterData = (input: string, data: pageLinkList[]) => { // 遍历数组 for (let item of data) { // 检查当前项的name是否匹配 - if (item.name.includes(input)) { + if (item.name && item.name.includes(input)) { result.push(item); } else { if (item.items) { // 否则,检查当前项的data属性中的子项 - let subResult = item.items.filter((subItem) => subItem.name.includes(input)); + let subResult = item.items.filter((subItem) => subItem.name && subItem.name.includes(input)); // 如果找到匹配的子项,将当前项(父级)添加到结果中 if (subResult.length > 0) { result.push({ ...item, items: subResult }); @@ -87,7 +87,7 @@ const filterData = (input: string, data: pageLinkList[]) => { let result_child: pageLinkList[] = []; item.items.forEach((child: pageLinkList) => { if (child.items) { - let subResult = child.items.filter((subItem) => subItem.name.includes(input)); + let subResult = child.items.filter((subItem) => subItem.name && subItem.name.includes(input)); if (subResult.length > 0) { result_child.push({ ...child, items: subResult }); } diff --git a/src/components/common/url-value/link-goods-search.vue b/src/components/common/url-value/link-goods-search.vue index 72a9ee3f..b7b53ea6 100644 --- a/src/components/common/url-value/link-goods-search.vue +++ b/src/components/common/url-value/link-goods-search.vue @@ -83,8 +83,10 @@ watch( ); watch( () => props.reset, - () => { - init(); + (val) => { + if (val) { + init(); + } } ); const emit = defineEmits(['update:link', 'type']); diff --git a/src/components/common/url-value/link-goods.vue b/src/components/common/url-value/link-goods.vue index e565f5f1..c7d51f72 100644 --- a/src/components/common/url-value/link-goods.vue +++ b/src/components/common/url-value/link-goods.vue @@ -58,8 +58,10 @@ const props = defineProps({ }); watch( () => props.reset, - () => { - init(); + (val) => { + if (val) { + init(); + } } ); onMounted(() => { @@ -80,6 +82,7 @@ const init = () => { search_value.value = ''; category_list.value = url_value_store.url_value.goods_category; brand_list.value = url_value_store.url_value.brand_list; + console.log('1111122'); get_list(1); }; const handle_search = () => { diff --git a/src/components/common/url-value/link-list.vue b/src/components/common/url-value/link-list.vue index b86315d1..f316b8a7 100644 --- a/src/components/common/url-value/link-list.vue +++ b/src/components/common/url-value/link-list.vue @@ -48,8 +48,10 @@ const props = defineProps({ }); watch( () => props.reset, - () => { - init(); + (val) => { + if (val) { + init(); + } } ); const modelValue = defineModel({ type: Array, default: [] }); @@ -84,12 +86,12 @@ const filterData = (input: string, data: pageLinkList[]) => { // 遍历数组 for (let item of data) { // 检查当前项的name是否匹配 - if (item.name.includes(input)) { + if (item.name && item.name.includes(input)) { result.push(item); } else { if (item.data) { // 否则,检查当前项的data属性中的子项 - let subResult = item.data.filter((subItem) => subItem.name.includes(input)); + let subResult = item.data.filter((subItem) => subItem.name && subItem.name.includes(input)); // 如果找到匹配的子项,将当前项(父级)添加到结果中 if (subResult.length > 0) { result.push({ ...item, data: subResult }); diff --git a/src/components/common/url-value/link-table.vue b/src/components/common/url-value/link-table.vue index 0161bf0d..43b7cf4d 100644 --- a/src/components/common/url-value/link-table.vue +++ b/src/components/common/url-value/link-table.vue @@ -55,8 +55,10 @@ const props = defineProps({ }); watch( () => props.reset, - () => { - init(); + (val) => { + if (val) { + init(); + } } ); onMounted(() => { diff --git a/src/components/model-shop-list/index.vue b/src/components/model-shop-list/index.vue index 6beecc6b..d35b77c7 100644 --- a/src/components/model-shop-list/index.vue +++ b/src/components/model-shop-list/index.vue @@ -53,7 +53,7 @@