Merge branch 'sit-Carl' of gitee.com:carl_Ming_1/smart-admin into sit-Leung

rc-busness/nuxt.config.js

@@ -1,7 +1,7 @@
 const trackingScript = 'var dataLayer = window.dataLayer = window.dataLayer || [];dataLayer.push({"user":{"sitecoreId":"00000000-0000-0000-0000-000000000000","locale":"zh-HK"},"session":{"id":"vvfwez43vfoomct4y3yqneqy"},"site":{"country":"HK","id":"RCGlobalMC1","environment":"prd"},"page":{"type":"Start of Life Page","hitTimestamp":"2020-10-16T16:26:21.7350880+00:00","topic":"Collecting your kitten and their first week with you","theme":"Cat"},"pet":{"specieId":"2"}});';
 const assetsUrl = 'var assetsUrl="/royalcanin-cdn-assets-new/css_js/";var isInitialized=false;';
 export default {
-  
+
   // Global page headers: https://go.nuxtjs.dev/config-head
   head: {
     title: '皇家官方商城',
@@ -29,8 +29,8 @@ export default {
     ],
     link: [
       { rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' },
-	  { rel: 'stylesheet', id:'royal-canin' ,href: '/royalcanin-cdn-assets-new/css_js/royal-canin.styles.prefix.min.critical.css?v=8-10-0'},
-	  //{ rel: 'stylesheet', id:'royal-canin' ,href: '/royalcanin-cdn-assets-new/css_js/royal-canin.styles.prefix.min.css?v=8-10-0'},
+      { rel: 'stylesheet', id: 'royal-canin', href: '/royalcanin-cdn-assets-new/css_js/royal-canin.styles.prefix.min.critical.css?v=8-10-0' },
+      //{ rel: 'stylesheet', id:'royal-canin' ,href: '/royalcanin-cdn-assets-new/css_js/royal-canin.styles.prefix.min.css?v=8-10-0'},
     ]
   },
 
@@ -38,10 +38,12 @@ export default {
   css: [
     'vant/lib/index.css',
     'element-ui/lib/theme-chalk/index.css',
+    '@/assets/style/default.less',
 	{ src:'@/assets/css/global.less'},
 	{ src:'@/assets/css/royalcanin-custom.css'},
+
     { src: "swiper/css/swiper.css" }
-    
+
   ],
   router: {
     middleware: ['metaTitle']
@@ -54,8 +56,8 @@ export default {
     '@/plugins/ElementUI',
     { src: '@/plugins/localStorage', ssr: false },
 
-    
-  
+
+
   ],
 
   // Auto import components: https://go.nuxtjs.dev/config-components
@@ -68,12 +70,12 @@ export default {
   // Modules: https://go.nuxtjs.dev/config-modules
   modules: [
     '@nuxtjs/axios',
-    ['nuxt-tailvue', {toast: true}],
-    
+    ['nuxt-tailvue', { toast: true }],
+
   ],
-  
+
   styleResources: {
-    less: '@/assets/style/less/default.less'  // less文件路径
+    less: '/assets/style/default.less'  // less文件路径
   },
   // Build Configuration: https://go.nuxtjs.dev/config-build
   build: {
@@ -93,7 +95,7 @@ export default {
   //     '^/api/': '/',
   //     changeOrigin: true
   //     },
-  
+
   //     }
   //     },