Merge branch 'master' into feature/tpl

layouts/default.vue

@@ -11,9 +11,7 @@ export default {
 }
 </script>
 <style>
-.layout-default {
-    width: 375px;
-    margin: 0 auto;
-    visibility: hidden;
-}
+/* .layout-default {
+
+} */
 </style>

nuxt.config.js

@@ -82,7 +82,6 @@ export default {
         '~/plugins/axios/index.js',
         // '~/plugins/axios/index.bak.js',
         '~/plugins/nuxt-client-init.client.js',
-        { src: '@/plugins/vant-ui' },
         { src: '~/plugins/vconsole', mode: 'client' }
     ],
 
@@ -153,13 +152,9 @@ export default {
     buildDir: '.nuxt',
 
     extendPlugins (plugins) {
-        if (process.env.ENV_MODE === 'pro') {
-            const pluginIndex = plugins.findIndex(
-                ({ src }) => src === '~/plugins/vconsole'
-            )
-            pluginIndex !== -1 && plugins.splice(pluginIndex, 1)
-            return plugins
-        }
+        // if (process.env.ENV_MODE === 'pro') {
+        //     return plugins
+        // }
     },
 
     // Build Configuration (https://go.nuxtjs.dev/config-build)
@@ -174,31 +169,6 @@ export default {
             ignoreOrder: true
             // allChunks: true,
         },
-
-        postcss: {
-            plugins: {
-                'postcss-pxtorem': {
-                    rootValue: 37.5,
-                    propList: ['*']
-                }
-            }
-        },
-        transpile: [/^vant/],
-
-        babel: {
-            plugins: [
-                [
-                    'import',
-                    {
-                        libraryName: 'vant',
-                        // "libraryDirectory": "es",
-                        style: true
-                    },
-                    'vant'
-                ]
-            ],
-            comments: true
-        },
         extend (config, ctx) {
             const { isDev, isClient } = ctx
             if (isClient && process.env.ENV_MODE === 'pro') {

package.json

@@ -44,7 +44,6 @@
         "lint-staged": "^10.5.3",
         "nuxt": "^2.14.6",
         "swiper": "^3.4.2",
-        "vant": "^2.11.1",
         "vue-bus": "^1.2.1"
     },
     "devDependencies": {
@@ -62,7 +61,6 @@
         "eslint-config-prettier": "^6.15.0",
         "eslint-plugin-nuxt": "^1.0.0",
         "husky": "^4.3.0",
-        "postcss-pxtorem": "^5.1.1",
         "prettier": "^2.1.2",
         "sass": "^1.29.0",
         "sass-loader": "^10.1.0",
@@ -72,7 +70,6 @@
         "stylelint-config-recess-order": "^2.3.0",
         "stylelint-config-sass-guidelines": "^7.1.0",
         "stylelint-config-standard": "^20.0.0",
-        "stylelint-selector-bem-pattern": "^2.1.0",
-        "vconsole": "^3.3.4"
+        "stylelint-selector-bem-pattern": "^2.1.0"
     }
 }

plugins/vant-ui.js

-import Vue from 'vue'
-
-import { Button, Swipe, SwipeItem, Lazyload, Dialog, Loading } from 'vant'
-Vue.use(Button)
-Vue.use(Swipe)
-Vue.use(SwipeItem)
-Vue.use(Lazyload, {
-    lazyComponent: true
-})
-
-Vue.use(Loading)
-
-Vue.use(Dialog)