@@ -1,3 +1,5 @@
{
- "presets": ["@nuxt/babel-preset-app"]
+ "presets": [
+ "@nuxt/babel-preset-app"
+ ]
}
@@ -106,7 +106,7 @@ module.exports = {
'mint-ui',
'vuerify',
'vee-validate'
- ]
+ ],
// babel: {
// presets: ['es2015', 'stage-2'],
// plugins: [
@@ -40,8 +40,7 @@
},
"devDependencies": {
"@nuxt/babel-preset-app": "^2.3.4",
- "babel-eslint": "^10.0.1",
- "css-loader": "^0.28.7",
+ "babel-eslint": "^7.1.1",
"eslint": "^4.13.0",
"eslint-config-standard": "^6.2.1",
"eslint-loader": "^1.6.1",
@@ -135,8 +135,13 @@
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('请输入正确的验证码'))