diff --git a/admin/build/webpack.base.conf.js b/admin/build/webpack.base.conf.js
index 1f4f47e..24c9fbf 100644
--- a/admin/build/webpack.base.conf.js
+++ b/admin/build/webpack.base.conf.js
@@ -22,7 +22,7 @@ const createLintingRule = () => ({
module.exports = {
context: path.resolve(__dirname, '../'),
entry: {
- app: './src/main.js'
+ app: ['babel-polyfill','./src/main.js']
},
output: {
path: config.build.assetsRoot,
diff --git a/admin/package.json b/admin/package.json
index f92a8d1..f231a05 100644
--- a/admin/package.json
+++ b/admin/package.json
@@ -14,6 +14,7 @@
},
"dependencies": {
"axios": "^0.19.2",
+ "babel-polyfill": "^6.26.0",
"element-ui": "^2.13.1",
"nprogress": "^0.2.0",
"vue": "^2.6.11",
diff --git a/admin/src/App.vue b/admin/src/App.vue
index 45c9d07..09464aa 100644
--- a/admin/src/App.vue
+++ b/admin/src/App.vue
@@ -7,12 +7,12 @@
- {{mainLogo.appLogoName}}
+ {{golbSetting.appLogoName}}
-
@@ -22,7 +22,7 @@
-
+
构建流水线
@@ -34,10 +34,10 @@
- 登陆
+ 登陆
- 注册
+ 注册
@@ -51,7 +51,7 @@
-
+
@@ -61,6 +61,14 @@
+
+
+
@@ -71,27 +79,38 @@
name: 'App',
data() {
return {
- appStyle: {
- background: "#F2F2F2"
- },
- mainLogo: {
+ golbSetting: {
appLogoName: 'ITKK',
- appName: 'ADMIN',
+ copyRight: '© 2019-2020 itkk.org',
+ appBackground: "#F2F2F2",
+ headerBackground: "#FFFFFF",
+ menuBtnColor: "#FFFFFF",
+ themeBackground: "#FF6A00",
+ themeColor: "#FFFFFF",
},
+ appStyle: {},
+ mainMenuBtnStyle: {},
+ mainLogoBtnStyle: {},
+ searchBtnStyle: {
+ outline: "none"
+ },
+ toolBtnStyle: {
+ outline: "none"
+ },
+ loginBtnStyle: {
+ outline: "none"
+ },
+ registeredBtnStyle: {
+ outline: "none"
+ },
+ backtopStyle: {},
mainElContainerStyle: {
height: 0
},
mainElHeaderStyle: {
- height: "50",
- background: "rgb(255, 255, 255)"
- },
- mainMenuBtnStyle: {
- background: "none rgb(255, 106, 0)",
- color: "rgb(255, 255, 255)"
- },
- mainLogoBtnStyle: {
- color: "rgb(255, 106, 0)"
+ height: "50px",
},
+ mainFoterStyle: {},
searchInputStyle: {
"max-width": "400px",
width: "150px"
@@ -113,10 +132,25 @@
},
//初始化(异步)
async initAsync() {
+ //重设主题属性
+ this.resetTheme();
//注册浏览器resize监听
window.addEventListener('resize', this.resizeListener);
+ //主动调用一次resize监听
this.resizeListener();
},
+ //重设主题属性
+ resetTheme() {
+ this.appStyle.background = this.golbSetting.appBackground;
+ this.mainElHeaderStyle.background = this.golbSetting.headerBackground;
+ this.mainMenuBtnStyle.background = "none " + this.golbSetting.themeBackground;
+ this.loginBtnStyle.background = this.golbSetting.themeBackground;
+ this.registeredBtnStyle.background = this.golbSetting.themeBackground;
+ this.mainMenuBtnStyle.color = this.golbSetting.menuBtnColor;
+ this.mainLogoBtnStyle.color = this.golbSetting.themeBackground;
+ this.backtopStyle.background = this.golbSetting.themeBackground;
+ this.backtopStyle.color = this.golbSetting.themeColor;
+ },
//resize监听器
resizeListener() {
//设定容器高度
@@ -260,6 +294,26 @@
padding: 0;
overflow: hidden;
}
+
+ .el-footer {
+ margin: 0;
+ padding: 0;
+ overflow: hidden;
+
+ .footer {
+ margin-top: 20px;
+
+ .el-divider--horizontal {
+ margin: 0px 0px 10px 0px;
+ box-shadow: rgba(0, 0, 0, 0.08) 0px 1px 4px 0px;
+ }
+
+ .copyRight {
+ max-width: 1200px;
+ margin: auto !important;
+ }
+ }
+ }
}
}
diff --git a/admin/src/assets/logo.png b/admin/src/assets/logo.png
deleted file mode 100644
index f3d2503..0000000
Binary files a/admin/src/assets/logo.png and /dev/null differ
diff --git a/admin/src/main.js b/admin/src/main.js
index 5cbd087..fbfa6ec 100644
--- a/admin/src/main.js
+++ b/admin/src/main.js
@@ -6,6 +6,7 @@ import router from './router'
import ElementUI from 'element-ui';
import axios from 'axios';
import VueAxios from 'vue-axios';
+import "babel-polyfill";
import './assets/css/reset.css';
import './assets/css/bootstrap.css';
import './assets/scss/glob.scss';