Skip to content

2.0 #1367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: 2.0
Choose a base branch
from
Open

2.0 #1367

Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4,554 changes: 3,246 additions & 1,308 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@
"test:e2e": "vue-cli-service test:e2e"
},
"dependencies": {
"axios": "^0.18.0",
"axios": "^0.18.1",
"clipboard": "^2.0.0",
"codemirror": "^5.38.0",
"countup": "^1.8.2",
10 changes: 9 additions & 1 deletion src/components/login-form/login-form.vue
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
<!--
* @Author: your name
* @Date: 2020-04-30 13:01:25
* @LastEditTime: 2020-04-30 13:17:11
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: /iview/iview-admin/src/components/login-form/login-form.vue
-->
<template>
<Form ref="loginForm" :model="form" :rules="rules" @keydown.enter.native="handleSubmit">
<FormItem prop="userName">
@@ -44,7 +52,7 @@ export default {
return {
form: {
userName: 'super_admin',
password: ''
password: '1234'
}
}
},
38 changes: 23 additions & 15 deletions src/config/index.js
Original file line number Diff line number Diff line change
@@ -1,32 +1,40 @@
/*
* @Author: your fgj
* @Date: 2020-04-30 13:01:25
* @LastEditTime: 2020-04-30 22:06:39
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: /iview/iview-admin/src/config/index.js
*/
export default {
/**
* @description 配置显示在浏览器标签的title
*/
title: 'iView-admin',
* @description 配置显示在浏览器标签的title
*/
title: 'iView-admin-Fan',
/**
* @description token在Cookie中存储的天数,默认1天
*/
* @description token在Cookie中存储的天数,默认1天
*/
cookieExpires: 1,
/**
* @description 是否使用国际化,默认为false
* 如果不使用,则需要在路由中给需要在菜单中展示的路由设置meta: {title: 'xxx'}
* 用来在菜单中显示文字
*/
* @description 是否使用国际化,默认为false
* 如果不使用,则需要在路由中给需要在菜单中展示的路由设置meta: {title: 'xxx'}
* 用来在菜单中显示文字
*/
useI18n: true,
/**
* @description api请求基础路径
*/
* @description api请求基础路径
*/
baseUrl: {
dev: 'https://www.easy-mock.com/mock/5add9213ce4d0e69998a6f51/iview-admin/',
pro: 'https://produce.com'
},
/**
* @description 默认打开的首页的路由name值,默认为home
*/
* @description 默认打开的首页的路由name值,默认为home
*/
homeName: 'home',
/**
* @description 需要加载的插件
*/
* @description 需要加载的插件
*/
plugin: {
'error-store': {
showInHeader: true, // 设为false后不会在顶部显示错误日志徽标