Merge pull request #1 from kbmjj123/feature-init-project-2023-09-22

Feature init project 2023 09 22
kbmjj123 · Sep 26, 2023 · 3fb576f · 3fb576f
2 parents 48a3340 + 03464c7
commit 3fb576f
Show file tree

Hide file tree

Showing 14 changed files with 1,734 additions and 306 deletions.
diff --git a/app.vue b/app.vue
@@ -1,5 +1,7 @@
 <template>
   <div>
-    <NuxtWelcome />
+    <NuxtLayout>
+      <NuxtPage/>
+    </NuxtLayout>
   </div>
 </template>
diff --git a/styles/main.css → assets/css/tailwind.css b/styles/main.css → assets/css/tailwind.css
diff --git a/assets/images/img-top-banner.jpeg b/assets/images/img-top-banner.jpeg
diff --git a/components/global/TopActivityBlock.vue b/components/global/TopActivityBlock.vue
@@ -0,0 +1,14 @@
+<template>
+  <div>
+    <NuxtImg :src="bannerSrc" 
+      :placeholder="[50, 25]" loading="lazy"></NuxtImg>
+  </div>
+</template>
+
+<script lang="ts" setup>
+const bannerSrc = ref('https://img13.360buyimg.com/pop/jfs/t1/191631/7/39173/68287/65128ae3Fe215a02d/379e647c52ca9269.jpg')
+</script>
+
+<style lang="" scoped>
+
+</style>
diff --git a/composables/useApi.ts b/composables/useApi.ts
@@ -0,0 +1,3 @@
+export default function(){
+
+}
diff --git a/layouts/account.vue b/layouts/account.vue
@@ -0,0 +1,13 @@
+<template>
+  <div>
+    <div>我是账号的公共头部视图</div>
+    <slot></slot>
+  </div>
+</template>
+
+<script lang="ts" setup>
+</script>
+
+<style lang="" scoped>
+
+</style>
diff --git a/nuxt.config.ts b/nuxt.config.ts
@@ -4,9 +4,24 @@ export default defineNuxtConfig({
     '@nuxt/devtools',
     '@vueuse/nuxt',
     '@pinia/nuxt',
+    '@nuxtjs/i18n',
+    'nuxt-lodash',
+    '@nuxtjs/tailwindcss',
     '@vite-pwa/nuxt',
+    'dayjs-nuxt',
+    '@nuxtjs/color-mode',
+    '@nuxt/image',
     'nuxt-jsonld'
   ],
+  components: {
+    global: true,
+    dirs: ['~/components/global']
+  },
+  colorMode: {
+    preference: 'system', // default theme
+    dataValue: 'theme', // activate data-theme in <html> tag
+    classSuffix: '',
+  },
   app: {
     head: {
       viewport: 'width=device-width,initial-scale=1',
@@ -17,10 +32,6 @@ export default defineNuxtConfig({
       ],
     }
   },
-  // 预加载统一的main.css样式文件
-  css: [
-    '@/styles/main.css'
-  ],
   debug: true,
   devtools: { enabled: true }
 })
diff --git a/package.json b/package.json
@@ -13,18 +13,24 @@
   },
   "devDependencies": {
     "@nuxt/devtools": "latest",
+    "@nuxtjs/color-mode": "^3.3.0",
+    "@nuxtjs/i18n": "8.0.0-rc.4",
+    "@nuxtjs/tailwindcss": "^6.8.0",
     "@pinia/nuxt": "^0.4.11",
     "@vite-pwa/nuxt": "^0.1.1",
     "@vueuse/nuxt": "^10.4.1",
     "daisyui": "^3.7.7",
-    "lodash": "^4.17.21",
+    "dayjs-nuxt": "^1.1.2",
     "nuxt": "^3.7.3",
+    "nuxt-lodash": "^2.5.0",
     "nuxt-seo-kit": "^1.3.13",
-    "tailwindcss": "^3.3.3",
     "typescript": "^5.2.2",
     "vite-plugin-vue-devtools": "1.0.0-rc.4"
   },
   "dependencies": {
-    "nuxt-jsonld": "^2.0.8"
+    "@formkit/auto-animate": "^0.8.0",
+    "@nuxt/image": "1.0.0-rc.2",
+    "nuxt-jsonld": "^2.0.8",
+    "pinia-plugin-persistedstate": "^3.2.0"
   }
 }
diff --git a/pages/activity/index.vue b/pages/activity/index.vue
@@ -2,8 +2,3 @@
   import { ref } from 'vue';
   const xxx = ref('xxx')
 </script>
-<template></template>
-  <div>
-    {{ xxx }}
-  </div>
-</template>
diff --git a/pages/index.vue → pages/index/index.vue b/pages/index.vue → pages/index/index.vue
diff --git a/pages/login/index.vue b/pages/login/index.vue
@@ -1,10 +1,14 @@
 <template>
   <div>
-
+    <TopActivityBlock></TopActivityBlock>
+    我是登录页面
   </div>
 </template>
 
 <script lang="ts" setup>
+definePageMeta({
+  layout: "account"
+})
 </script>
 
 <style lang="less" scoped>

diff --git a/pages/service/index.vue b/pages/service/index.vue
@@ -1,12 +1,4 @@
-<template></template>
-  <div>
-
-  </div>
-</template>
-
 <script lang="ts" setup>
+  import { ref } from 'vue';
+  const xxx = ref('xxx')
 </script>
-
-<style lang="" scoped>
-
-</style>