From 30cfb38ffb654cf6db3815fdbac769876d3a5a5a Mon Sep 17 00:00:00 2001
From: smallchill <smallchill@163.com>
Date: Fri, 22 Feb 2019 19:27:28 +0800
Subject: [PATCH] =?UTF-8?q?:zap:=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/user.vue |  9 ++++--
 vue.config.js             | 64 +++++++++++++++++++--------------------
 2 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index 50e511e..fabed96 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -86,7 +86,6 @@
           index: true,
           selection: true,
           viewBtn: true,
-          calcHeight:800,
           column: [
             {
               label: "登录账号",
@@ -103,13 +102,17 @@
               label: '密码',
               prop: 'password',
               hide: true,
-              rules: [{validator: validatePass, trigger: 'blur'}]
+              editDisplay: false,
+              viewDisplay: false,
+              rules: [{required: true, validator: validatePass, trigger: 'blur'}]
             },
             {
               label: '确认密码',
               prop: 'password2',
               hide: true,
-              rules: [{validator: validatePass2, trigger: 'blur'}]
+              editDisplay: false,
+              viewDisplay: false,
+              rules: [{required: true, validator: validatePass2, trigger: 'blur'}]
             },
             {
               label: "用户昵称",
diff --git a/vue.config.js b/vue.config.js
index d7f4594..114ad3c 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -2,38 +2,38 @@
 let baseUrl = './'
 let url = 'http://localhost:8800'
 module.exports = {
-    baseUrl: baseUrl, // 根据你的实际情况更改这里
-    lintOnSave: true,
-    productionSourceMap: false,
-    chainWebpack: (config) => {
-        //忽略的打包文件
-        config.externals({
-            'vue': 'Vue',
-            'vue-router': 'VueRouter',
-            'vuex': 'Vuex',
-            'axios': 'axios',
-            'element-ui': 'ELEMENT',
-        })
-        const entry = config.entry('app')
-        entry
-            .add('babel-polyfill')
-            .end()
-        entry
-            .add('classlist-polyfill')
-            .end()
-        entry
-            .add('@/mock')
-            .end()
-    },
-    devServer: {
-        proxy: {
-            '/api': {
-                target: url,
-                ws: true,
-                pathRewrite: {
-                    '^/api': '/'
-                }
-            }
+  publicPath: baseUrl, // 根据你的实际情况更改这里
+  lintOnSave: true,
+  productionSourceMap: false,
+  chainWebpack: (config) => {
+    //忽略的打包文件
+    config.externals({
+      'vue': 'Vue',
+      'vue-router': 'VueRouter',
+      'vuex': 'Vuex',
+      'axios': 'axios',
+      'element-ui': 'ELEMENT',
+    })
+    const entry = config.entry('app')
+    entry
+      .add('babel-polyfill')
+      .end()
+    entry
+      .add('classlist-polyfill')
+      .end()
+    entry
+      .add('@/mock')
+      .end()
+  },
+  devServer: {
+    proxy: {
+      '/api': {
+        target: url,
+        ws: true,
+        pathRewrite: {
+          '^/api': '/'
         }
+      }
     }
+  }
 }