Selaa lähdekoodia

fix: conflict

IlhamTahir 1 vuosi sitten
vanhempi
commit
7dda1bc29f
2 muutettua tiedostoa jossa 6 lisäystä ja 0 poistoa
  1. 1 0
      src/auto-imports.d.ts
  2. 5 0
      src/pages.json

+ 1 - 0
src/auto-imports.d.ts

@@ -35,6 +35,7 @@ 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']

+ 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": []
 }