测试nuxt2.0打包

nuxt.config.js

@@ -69,15 +69,15 @@ module.exports = {
         '~plugins': path.join(__dirname, 'plugins'),
         '~store': path.join(__dirname, 'store')
       })
-      console.log( config.plugins)
-      config.plugins.push(new HtmlWebpackPlugin({
-        title: 'React Title !',
-        template: './app.html',
-        minify: {
-          removeAttributeQuotes: true
-        },
-        inject: 'body'
-      }))
+      // console.log( config.plugins)
+      // config.plugins.push(new HtmlWebpackPlugin({
+      //   title: 'React Title !',
+      //   template: './app.html',
+      //   minify: {
+      //     removeAttributeQuotes: true
+      //   },
+      //   inject: 'body'
+      // }))
       // config.resolve.alias['~utils'] = path.join(__dirname, 'utils')
       // config.resolve.alias['~components'] = path.join(__dirname, 'components')
       // config.resolve.alias['assets'] = path.join(__dirname, './assets')

pages/sassLogin/register.vue

@@ -135,13 +135,8 @@
                       return Promise.reject(response.data)
                     }
                   }).catch(err => {
-<<<<<<< HEAD
-                    this.$message.error(err.errMsg)
-                    // this.codeErrorMsg = err.errMsg
-=======
                     // this.codeErrorMsg = err.errMsg
                     this.$message.error(err.errMsg)
->>>>>>> hotfix-nuxt2.0.0
                   })
               } else {
                 callback(new Error('请输入正确的验证码'))