From 6fa4bba623713c396432ba8b863846883d6a1906 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期三, 26 一月 2022 10:52:23 +0800
Subject: [PATCH] Merge branch 'pollex-dev' into sit
---
PAMapp/nuxt.config.js | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/PAMapp/nuxt.config.js b/PAMapp/nuxt.config.js
index a5c8f21..d4252d5 100644
--- a/PAMapp/nuxt.config.js
+++ b/PAMapp/nuxt.config.js
@@ -21,29 +21,40 @@
{ 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',
{ src: '~/plugins/vue-awesome-swiper.js', mode: 'client' },
- '~/plugins/service.ts'
+ '~/plugins/service.ts',
+ '~/plugins/vue-scroll-picker',
+ '~/plugins/filters/date.filter.ts',
+ '~/plugins/filters/age.filter.ts',
+ '~/plugins/filters/appointment-fail-reason.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
@@ -52,5 +63,14 @@
// Build Configuration: https://go.nuxtjs.dev/config-build
build: {
+ },
+ styleResources: {
+ scss: [
+ '~/assets/scss/main.scss'
+ ]
+ },
+ router: {
+ base: process.env.ENV === 'uat' ? '/pam/' : '',
+ middleware: ['getUrlQuery', 'errorRoute']
}
}
--
Gitblit v1.8.0