diff --git a/.DS_Store b/.DS_Store index 24717fe..7e6cd5e 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/components/selectJobs/selectJobs.vue b/components/selectJobs/selectJobs.vue index 98468f3..22c6aac 100644 --- a/components/selectJobs/selectJobs.vue +++ b/components/selectJobs/selectJobs.vue @@ -58,9 +58,9 @@ const state = reactive({ visible: false, }); -onMounted(() => { - serchforIt(); -}); +// onMounted(() => { +// serchforIt(); +// }); // 统一处理二维数组格式 const processedListData = computed(() => { @@ -82,11 +82,11 @@ const open = (newConfig = {}) => { rowLabel: configRowLabel = 'label', rowKey: configRowKey = 'value', maskClick: configMaskClick = false, - defaultIndex = [], + defaultId = '', } = newConfig; reset(); - serchforIt(); + serchforIt(defaultId); if (configTitle) title.value = configTitle; if (typeof success === 'function') confirmCallback.value = success; @@ -143,11 +143,13 @@ const handleClick = async (callback) => { console.error('confirmCallback 执行出错:', error); } }; -function serchforIt() { +function serchforIt(defaultId) { if (state.stations.length) { - const ids = userInfo.value.jobTitleId.split(',').map((id) => Number(id)); + const ids = defaultId + ? defaultId.split(',').map((id) => Number(id)) + : userInfo.value.jobTitleId.split(',').map((id) => Number(id)); count.value = ids.length; - state.jobTitleId = userInfo.value.jobTitleId; + state.jobTitleId = defaultId ? defaultId : userInfo.value.jobTitleId; setCheckedNodes(state.stations, ids); state.visible = true; return; @@ -166,14 +168,14 @@ function serchforIt() { const reset = () => { maskClick.value = false; - confirmCallback.value = null; - cancelCallback.value = null; changeCallback.value = null; listData.value = []; selectedIndex.value = [0, 0, 0]; rowLabel.value = 'label'; rowKey.value = 'value'; selectedItems.value = []; + JobsIdsValue.value = ''; + JobsLabelValue.value = ''; }; // 暴露方法给父组件 diff --git a/components/tabbar/midell-box.vue b/components/tabbar/midell-box.vue index a74d66d..e12d50b 100644 --- a/components/tabbar/midell-box.vue +++ b/components/tabbar/midell-box.vue @@ -10,6 +10,7 @@ > + {{ item.badge }} {{ item.text }} @@ -17,77 +18,94 @@ -