From 1b9f10480b977f45559af0b6586d0a9636d43bbe Mon Sep 17 00:00:00 2001
From: zhengjie <zhengjie@tom.com>
Date: Tue, 14 May 2019 10:03:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B9=20ie=20=E6=B5=8F=E8=A7=88?=
 =?UTF-8?q?=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build/webpack.base.conf.js | 4 +---
 package.json               | 3 ++-
 src/config/index.js        | 2 +-
 src/main.js                | 1 +
 src/views/login/index.vue  | 5 ++---
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js
index 3b946b4..141a0c7 100644
--- a/build/webpack.base.conf.js
+++ b/build/webpack.base.conf.js
@@ -22,9 +22,7 @@ const createLintingRule = () => ({
 
 module.exports = {
   context: path.resolve(__dirname, '../'),
-  entry: {
-    app: './src/main.js'
-  },
+  entry:["babel-polyfill","./src/main.js"],
   output: {
     path: config.build.assetsRoot,
     filename: '[name].js',
diff --git a/package.json b/package.json
index b827a61..eb0ac9c 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,8 @@
     "wangeditor": ">=3.0.0",
     "codemirror": "^5.38.0",
     "mavon-editor": "^2.7.0",
-    "path-to-regexp": "2.4.0"
+    "path-to-regexp": "2.4.0",
+    "babel-polyfill": "^6.26.0"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
diff --git a/src/config/index.js b/src/config/index.js
index a95d45e..ac608de 100644
--- a/src/config/index.js
+++ b/src/config/index.js
@@ -42,5 +42,5 @@ export default {
   /**
    * 是否显示设置的悬浮按钮
    */
-  settingBtn: false
+  settingBtn: true
 }
diff --git a/src/main.js b/src/main.js
index 26f1a51..e373257 100644
--- a/src/main.js
+++ b/src/main.js
@@ -19,6 +19,7 @@ import './router/index' // permission control
 Vue.use(mavonEditor)
 Vue.use(ElementUI, { locale })
 Vue.config.productionTip = false
+require('babel-polyfill')
 
 new Vue({
   el: '#app',
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index f006c06..50b29e6 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -60,10 +60,9 @@ export default {
       const username = Cookies.get('username')
       let password = Cookies.get('password')
       const rememberMe = Cookies.get('rememberMe')
-      // 保存cookie里面的加密后的密码
-      password = password === undefined ? '' : password
+      password = password === undefined ? this.loginForm.password : password
       this.loginForm = {
-        username: username === undefined ? '' : username,
+        username: username === undefined ? this.loginForm.username : username,
         password: password,
         rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
       }