flat:合并冲突

2025-12-03 11:08:53 +08:00
parent 268648868f 7ce14fa7e2
commit 0d5e3024bc
4 changed files with 15 additions and 4 deletions
--- a/packageA/pages/selectDate/selectDate.vue
+++ b/packageA/pages/selectDate/selectDate.vue
@@ -59,10 +59,10 @@ const pages = reactive({
    year: 0,
    month: 0,
 });
-
 const hasZphDateArray = ref([]);

 onLoad((options) => {
+    updateDateArray();
    if (options.date) {
        current.value = {
            date: options?.date || null,