fix: 首次加载问题部分解决

simply-none · Jan 7, 2024 · 94bdbdd · 94bdbdd
1 parent 8a3877b
commit 94bdbdd
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/src/hooks/useVoca.js b/src/hooks/useVoca.js
@@ -26,6 +26,7 @@ function isRequiredField(obj) {
   }
   const required = ["currentBook", "currentRange", "studyMode", "studyCount"];
   return required.every((field) => {
+    console.log(obj[field], '真')
     return obj[field];
   });
 }
@@ -61,7 +62,7 @@ export function useVoca() {
 
   let isMorethanTodayPlan = ref(false)
 
-  let { basicData } = storeToRefs(useBook);
+  let { basicData, basicDataOrigin } = storeToRefs(useBook);
 
   const drawer = ref(false);
 
@@ -71,6 +72,13 @@ export function useVoca() {
 
   let isWordNotInDict = ref(false)
 
+  watchEffect(() => {
+    if (JSON.stringify(basicData.value) === JSON.stringify(basicDataOrigin.value)) {
+      console.log('初始化')
+      initDataInFirstLoad()
+    }
+  })
+
   watch(
     [() => basicData.value.currentBook, () => basicData.value.currentRange, () => basicData.value.studyMode, () => basicData.value.studyCount],
     () => {
@@ -140,6 +148,7 @@ export function useVoca() {
   async function initDataInFirstLoad() {
     // fullscreenLoading.value = true;
     let isRequired = isRequiredField(basicData);
+    console.log(isRequired, 'sfs')
 
     if (!isRequired) {
       setNotify("请完成基础设置后再试");

diff --git a/src/stores/books.js b/src/stores/books.js
@@ -13,6 +13,15 @@ export const useBookStore = defineStore("book", () => {
     showVocabularyItem: [],
   });
 
+  let basicDataOrigin = reactive({
+    currentBook: "",
+    currentRange: "",
+    studyMode: "",
+    studyCount: 0,
+    showMode: '',
+    showVocabularyItem: [],
+  });
+
   let useDB = useDBStore();
   let { schema, dbChanged } = storeToRefs(useDB);
   let { getTable } = useDB;
@@ -65,6 +74,7 @@ export const useBookStore = defineStore("book", () => {
 
   return {
     basicData,
+    basicDataOrigin,
     updateBasicInfo,
   };
 });
diff --git a/src/views/wordMainPage.vue b/src/views/wordMainPage.vue
@@ -76,7 +76,7 @@ let {
 
 let router = useRouter()
 
-if (router.currentRoute.value.query && router.currentRoute.value.query.reload) {
+if (router && router.currentRoute.value.query && router.currentRoute.value.query.reload) {
   location.href = './'
 }