From ac235850a9287dae6977c964213176fa7c86b140 Mon Sep 17 00:00:00 2001
From: Tomas <tomasysh@gmail.com>
Date: 星期四, 09 十二月 2021 14:42:20 +0800
Subject: [PATCH] Merge branch 'refactor/separate-vue' of ssh://192.168.0.10:29418/pcalife/PAM into refactor/separate-vue

---
 PAMapp/nuxt.config.js |   29 +++++++++++++++++++++++++----
 1 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/PAMapp/nuxt.config.js b/PAMapp/nuxt.config.js
index c0608b4..73f32ed 100644
--- a/PAMapp/nuxt.config.js
+++ b/PAMapp/nuxt.config.js
@@ -21,26 +21,39 @@
       { rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' }
     ]
   },
-
+  layoutTransition:'pam-fade-in',
+  pageTransition:'pam-fade-in',
   // Global CSS: https://go.nuxtjs.dev/config-css
   css: [
     'element-ui/lib/theme-chalk/index.css',
+    'swiper/css/swiper.css',
+    'vue-scroll-picker/dist/style.css',
     '~/assets/scss/main.scss',
+    '~/assets/pam-animation.css'
   ],
-
   // Plugins to run before rendering page: https://go.nuxtjs.dev/config-plugins
   plugins: [
-    '~/plugins/element-ui.js'
+    '~/plugins/element-ui.js',
+    { src: '~/plugins/vue-awesome-swiper.js', mode: 'client' },
+    '~/plugins/service.ts',
+    '~/plugins/vue-scroll-picker',
+    '~/plugins/filters/date.filter.ts',
+    '~/plugins/filters/age.filter.ts',
   ],
 
   // Auto import components: https://go.nuxtjs.dev/config-components
   components: true,
+  // loading
+  loading: '~/components/loading.vue',
 
   // Modules for dev and build (recommended): https://go.nuxtjs.dev/config-modules
   buildModules: [
     // https://go.nuxtjs.dev/typescript
     '@nuxt/typescript-build',
-    '@nuxtjs/axios'
+    '@nuxtjs/axios',
+    '@nuxtjs/style-resources',
+    ['@nuxtjs/dotenv', { filename: '.env.' + process.env.ENV }],
+
   ],
 
   // Modules: https://go.nuxtjs.dev/config-modules
@@ -49,5 +62,13 @@
 
   // Build Configuration: https://go.nuxtjs.dev/config-build
   build: {
+  },
+  styleResources: {
+    scss: [
+      '~/assets/scss/main.scss'
+    ]
+  },
+  router: {
+    base: process.env.ENV === 'uat' ? '/pam/' : ''
   }
 }

--
Gitblit v1.8.0