save

src/pages/article/ArticlesPage.vue

@@ -2,7 +2,7 @@
 import { useBaseStore } from "@/stores/base.ts";
 import { useRouter } from "vue-router";
 import BasePage from "@/components/BasePage.vue";
-import { _getDictDataByUrl, msToHourMinute, total, useNav } from "@/utils";
+import { _getDictDataByUrl, msToHourMinute, resourceWrap, total, useNav } from "@/utils";
 import { DictResource, DictType } from "@/types/types.ts";
 import { useRuntimeStore } from "@/stores/runtime.ts";
 import BaseIcon from "@/components/BaseIcon.vue";
@@ -153,7 +153,7 @@ const weekList = $computed(() => {
   return list
 })
 
-const {data: recommendBookList, isFetching} = useFetch(DICT_LIST.ARTICLE.RECOMMENDED).json()
+const {data: recommendBookList, isFetching} = useFetch(resourceWrap(DICT_LIST.ARTICLE.RECOMMENDED)).json()
 
 </script>
 

src/pages/article/BookDetail.vue

@@ -11,7 +11,7 @@ import BaseButton from "@/components/BaseButton.vue";
 import { useRoute, useRouter } from "vue-router";
 import EditBook from "@/pages/article/components/EditBook.vue";
 import { computed, onMounted } from "vue";
-import { _dateFormat, _getDictDataByUrl, msToHourMinute, total, useNav } from "@/utils";
+import { _dateFormat, _getDictDataByUrl, msToHourMinute, resourceWrap, total, useNav } from "@/utils";
 import BaseIcon from "@/components/BaseIcon.vue";
 import { useArticleOptions } from "@/hooks/dict.ts";
 import { getDefaultArticle, getDefaultDict } from "@/types/func.ts";
@@ -110,7 +110,7 @@ const {
   toggleArticleCollect
 } = useArticleOptions()
 
-const {data: book_list} = useFetch(DICT_LIST.ARTICLE.ALL).json()
+const {data: book_list} = useFetch(resourceWrap(DICT_LIST.ARTICLE.ALL)).json()
 
 function reset() {
   MessageBox.confirm(

src/pages/article/BookList.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { useNav } from "@/utils";
+import { resourceWrap, useNav } from "@/utils";
 import BasePage from "@/components/BasePage.vue";
 import { DictResource } from "@/types/types.ts";
 import { useRuntimeStore } from "@/stores/runtime.ts";
@@ -31,7 +31,7 @@ async function getDictDetail(val: DictResource) {
 
 let showSearchInput = $ref(false)
 let searchKey = $ref('')
-const {data: bookList, isFetching} = useFetch(DICT_LIST.ARTICLE.ALL).json()
+const {data: bookList, isFetching} = useFetch(resourceWrap(DICT_LIST.ARTICLE.ALL)).json()
 
 const searchList = computed<any[]>(() => {
   if (searchKey) {

src/pages/article/PracticeArticles.vue

@@ -18,7 +18,7 @@ import {
 import { useDisableEventListener, useOnKeyboardEventListener, useStartKeyboardEventListener } from "@/hooks/event.ts";
 import useTheme from "@/hooks/theme.ts";
 import Toast from '@/components/base/toast/Toast.ts'
-import { _getDictDataByUrl, _nextTick, cloneDeep, msToMinute, total } from "@/utils";
+import { _getDictDataByUrl, _nextTick, cloneDeep, msToMinute, resourceWrap, total } from "@/utils";
 import { usePracticeStore } from "@/stores/practice.ts";
 import { useArticleOptions } from "@/hooks/dict.ts";
 import { genArticleSectionData, usePlaySentenceAudio } from "@/hooks/article.ts";
@@ -107,7 +107,7 @@ async function init() {
   if (dictId) {
     //先在自己的词典列表里面找，如果没有再在资源列表里面找
     dict = store.article.bookList.find(v => v.id === dictId)
-    let r = await fetch(DICT_LIST.ARTICLE.ALL)
+    let r = await fetch(resourceWrap(DICT_LIST.ARTICLE.ALL))
     let book_list = await r.json()
     if (!dict) dict = book_list.flat().find(v => v.id === dictId) as Dict
     if (dict && dict.id) {

src/pages/word/DictList.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { groupBy, useNav } from "@/utils";
+import { groupBy, resourceWrap, useNav } from "@/utils";
 import BasePage from "@/components/BasePage.vue";
 import { DictResource } from "@/types/types.ts";
 import { useRuntimeStore } from "@/stores/runtime.ts";
@@ -46,7 +46,7 @@ function groupByDictTags(dictList: DictResource[]) {
   }, {})
 }
 
-const {data: dict_list, isFetching} = useFetch(DICT_LIST.WORD.ALL).json()
+const {data: dict_list, isFetching} = useFetch(resourceWrap(DICT_LIST.WORD.ALL)).json()
 
 const groupedByCategoryAndTag = $computed(() => {
   let data = []

src/pages/word/PracticeWords.vue

@@ -10,7 +10,7 @@ import { Dict, PracticeData, ShortcutKey, TaskWords, Word } from "@/types/types.
 import { useDisableEventListener, useOnKeyboardEventListener, useStartKeyboardEventListener } from "@/hooks/event.ts";
 import useTheme from "@/hooks/theme.ts";
 import { getCurrentStudyWord, useWordOptions } from "@/hooks/dict.ts";
-import { _getDictDataByUrl, cloneDeep, shuffle } from "@/utils";
+import { _getDictDataByUrl, cloneDeep, resourceWrap, shuffle } from "@/utils";
 import { useRoute, useRouter } from "vue-router";
 import Footer from "@/pages/word/components/Footer.vue";
 import Panel from "@/components/Panel.vue";
@@ -64,7 +64,7 @@ async function loadDict() {
   if (dictId) {
     //先在自己的词典列表里面找，如果没有再在资源列表里面找
     dict = store.word.bookList.find(v => v.id === dictId)
-    let r = await fetch(DICT_LIST.WORD.ALL)
+    let r = await fetch(resourceWrap(DICT_LIST.WORD.ALL))
     let dict_list = await r.json()
     if (!dict) dict = dict_list.flat().find(v => v.id === dictId) as Dict
     if (dict && dict.id) {

src/pages/word/WordsPage.vue

@@ -2,7 +2,7 @@
 import { useBaseStore } from "@/stores/base.ts";
 import { useRouter } from "vue-router";
 import BaseIcon from "@/components/BaseIcon.vue";
-import { _getAccomplishDate, _getDictDataByUrl, useNav } from "@/utils";
+import { _getAccomplishDate, _getDictDataByUrl, resourceWrap, useNav } from "@/utils";
 import BasePage from "@/components/BasePage.vue";
 import { DictResource } from "@/types/types.ts";
 import { watch } from "vue";
@@ -154,7 +154,11 @@ function saveLastPracticeIndex(e) {
   currentStudy = getCurrentStudyWord()
 }
 
-const {data: recommendDictList, isFetching} = useFetch(DICT_LIST.WORD.RECOMMENDED).json()
+const {
+  data: recommendDictList,
+  isFetching
+} = useFetch(resourceWrap(DICT_LIST.WORD.RECOMMENDED)).json()
+
 </script>
 
 <template>