Jelajahi Sumber

fix: conflict

IlhamTahir 1 tahun lalu
induk
melakukan
218573ab2e
4 mengubah file dengan 11 tambahan dan 6 penghapusan
  1. 3 2
      src/auto-imports.d.ts
  2. 5 0
      src/pages.json
  3. 1 3
      src/pages/pet-manual/index.vue
  4. 2 1
      src/uni-pages.d.ts

+ 3 - 2
src/auto-imports.d.ts

@@ -35,7 +35,6 @@ declare global {
   const extendRef: typeof import('@vueuse/core')['extendRef']
   const getCurrentInstance: typeof import('vue')['getCurrentInstance']
   const getCurrentScope: typeof import('vue')['getCurrentScope']
-  const getSafeHeight: typeof import('./utils/index')['getSafeHeight']
   const h: typeof import('vue')['h']
   const ignorableWatch: typeof import('@vueuse/core')['ignorableWatch']
   const inject: typeof import('vue')['inject']
@@ -133,6 +132,7 @@ declare global {
   const until: typeof import('@vueuse/core')['until']
   const useActiveElement: typeof import('@vueuse/core')['useActiveElement']
   const useAnimate: typeof import('@vueuse/core')['useAnimate']
+  const useAppStore: typeof import('./stores/app')['useAppStore']
   const useArrayDifference: typeof import('@vueuse/core')['useArrayDifference']
   const useArrayEvery: typeof import('@vueuse/core')['useArrayEvery']
   const useArrayFilter: typeof import('@vueuse/core')['useArrayFilter']
@@ -352,7 +352,6 @@ declare module 'vue' {
     readonly extendRef: UnwrapRef<typeof import('@vueuse/core')['extendRef']>
     readonly getCurrentInstance: UnwrapRef<typeof import('vue')['getCurrentInstance']>
     readonly getCurrentScope: UnwrapRef<typeof import('vue')['getCurrentScope']>
-    readonly getSafeHeight: UnwrapRef<typeof import('./utils/index')['getSafeHeight']>
     readonly h: UnwrapRef<typeof import('vue')['h']>
     readonly ignorableWatch: UnwrapRef<typeof import('@vueuse/core')['ignorableWatch']>
     readonly inject: UnwrapRef<typeof import('vue')['inject']>
@@ -450,6 +449,7 @@ declare module 'vue' {
     readonly until: UnwrapRef<typeof import('@vueuse/core')['until']>
     readonly useActiveElement: UnwrapRef<typeof import('@vueuse/core')['useActiveElement']>
     readonly useAnimate: UnwrapRef<typeof import('@vueuse/core')['useAnimate']>
+    readonly useAppStore: UnwrapRef<typeof import('./stores/app')['useAppStore']>
     readonly useArrayDifference: UnwrapRef<typeof import('@vueuse/core')['useArrayDifference']>
     readonly useArrayEvery: UnwrapRef<typeof import('@vueuse/core')['useArrayEvery']>
     readonly useArrayFilter: UnwrapRef<typeof import('@vueuse/core')['useArrayFilter']>
@@ -611,6 +611,7 @@ declare module 'vue' {
     readonly useWindowFocus: UnwrapRef<typeof import('@vueuse/core')['useWindowFocus']>
     readonly useWindowScroll: UnwrapRef<typeof import('@vueuse/core')['useWindowScroll']>
     readonly useWindowSize: UnwrapRef<typeof import('@vueuse/core')['useWindowSize']>
+    readonly utils: UnwrapRef<typeof import('./utils/index')['default']>
     readonly watch: UnwrapRef<typeof import('vue')['watch']>
     readonly watchArray: UnwrapRef<typeof import('@vueuse/core')['watchArray']>
     readonly watchAtMost: UnwrapRef<typeof import('@vueuse/core')['watchAtMost']>

+ 5 - 0
src/pages.json

@@ -21,6 +21,10 @@
     {
       "path": "pages/pet-manual/index",
       "type": "page"
+    },
+    {
+      "path": "pages/pet-manual/components/CardList",
+      "type": "page"
     }
   ],
   "globalStyle": {
@@ -33,5 +37,6 @@
     "navigationBarTitleText": "Vitesse-Uni",
     "navigationStyle": "custom"
   },
+  "__esModule": true,
   "subPackages": []
 }

+ 1 - 3
src/pages/pet-manual/index.vue

@@ -122,9 +122,7 @@ const findList = ref<{ name: string }[]>([
   { name: '猫咪尿闭怎么办' },
 ])
 function onLoad() {
-  carousalApi.getCarousalList().then((res) => {
-    console.log(res)
-  })
+  carousalApi.getCarousalList()
 }
 onLoad()
 </script>

+ 2 - 1
src/uni-pages.d.ts

@@ -7,7 +7,8 @@ interface NavigateToOptions {
   url: "/pages/feed-plan/index" |
        "/pages/home/index" |
        "/pages/me/index" |
-       "/pages/pet-manual/index";
+       "/pages/pet-manual/index" |
+       "/pages/pet-manual/components/CardList";
 }
 interface RedirectToOptions extends NavigateToOptions {}