Commit 1b9f1048 by zhengjie

兼容 ie 浏览器

parent bbd60997
...@@ -22,9 +22,7 @@ const createLintingRule = () => ({ ...@@ -22,9 +22,7 @@ const createLintingRule = () => ({
module.exports = { module.exports = {
context: path.resolve(__dirname, '../'), context: path.resolve(__dirname, '../'),
entry: { entry:["babel-polyfill","./src/main.js"],
app: './src/main.js'
},
output: { output: {
path: config.build.assetsRoot, path: config.build.assetsRoot,
filename: '[name].js', filename: '[name].js',
......
...@@ -39,7 +39,8 @@ ...@@ -39,7 +39,8 @@
"wangeditor": ">=3.0.0", "wangeditor": ">=3.0.0",
"codemirror": "^5.38.0", "codemirror": "^5.38.0",
"mavon-editor": "^2.7.0", "mavon-editor": "^2.7.0",
"path-to-regexp": "2.4.0" "path-to-regexp": "2.4.0",
"babel-polyfill": "^6.26.0"
}, },
"devDependencies": { "devDependencies": {
"autoprefixer": "8.5.0", "autoprefixer": "8.5.0",
......
...@@ -42,5 +42,5 @@ export default { ...@@ -42,5 +42,5 @@ export default {
/** /**
* 是否显示设置的悬浮按钮 * 是否显示设置的悬浮按钮
*/ */
settingBtn: false settingBtn: true
} }
...@@ -19,6 +19,7 @@ import './router/index' // permission control ...@@ -19,6 +19,7 @@ import './router/index' // permission control
Vue.use(mavonEditor) Vue.use(mavonEditor)
Vue.use(ElementUI, { locale }) Vue.use(ElementUI, { locale })
Vue.config.productionTip = false Vue.config.productionTip = false
require('babel-polyfill')
new Vue({ new Vue({
el: '#app', el: '#app',
......
...@@ -60,10 +60,9 @@ export default { ...@@ -60,10 +60,9 @@ export default {
const username = Cookies.get('username') const username = Cookies.get('username')
let password = Cookies.get('password') let password = Cookies.get('password')
const rememberMe = Cookies.get('rememberMe') const rememberMe = Cookies.get('rememberMe')
// 保存cookie里面的加密后的密码 password = password === undefined ? this.loginForm.password : password
password = password === undefined ? '' : password
this.loginForm = { this.loginForm = {
username: username === undefined ? '' : username, username: username === undefined ? this.loginForm.username : username,
password: password, password: password,
rememberMe: rememberMe === undefined ? false : Boolean(rememberMe) rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment