From a426c23b9bc90df787bc4d66718872f7c95c255a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 11 十二月 2019 10:46:37 +0800
Subject: [PATCH] 2019-12-11
---
/dev/null | 0
public/positec.png | 0
src/components/header/index.scss | 6 +++---
src/assets/img/main-logo.png | 0
src/views/login/index.scss | 5 +++++
src/components/header/index.jsx | 8 ++++----
public/options.js | 4 +++-
public/hlogo.png | 0
src/views/login/index.jsx | 8 ++++++--
9 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/public/emp-favicon.ico b/public/emp-favicon.ico
deleted file mode 100644
index 3ce10c8..0000000
--- a/public/emp-favicon.ico
+++ /dev/null
Binary files differ
diff --git a/public/hlogo.png b/public/hlogo.png
new file mode 100644
index 0000000..6b172b7
--- /dev/null
+++ b/public/hlogo.png
Binary files differ
diff --git a/public/logo.png b/public/logo.png
deleted file mode 100644
index 8ce2c29..0000000
--- a/public/logo.png
+++ /dev/null
Binary files differ
diff --git a/public/options.js b/public/options.js
index 50516cc..2c13d14 100644
--- a/public/options.js
+++ b/public/options.js
@@ -5,9 +5,11 @@
title: '',
platName: '',
logo: '',
+ mainlogo: '',
bgImage: '',
copyRight: '',
icp: '',
bgColor: '',
- lineColor: ''
+ lineColor: '',
+ website: ''
}
\ No newline at end of file
diff --git a/public/positec.png b/public/positec.png
new file mode 100644
index 0000000..4b3a02b
--- /dev/null
+++ b/public/positec.png
Binary files differ
diff --git a/src/assets/img/loginbg-origin.jpg b/src/assets/img/loginbg-origin.jpg
deleted file mode 100644
index 72130b7..0000000
--- a/src/assets/img/loginbg-origin.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/img/loginbg.png b/src/assets/img/loginbg.png
deleted file mode 100644
index 2e25d7c..0000000
--- a/src/assets/img/loginbg.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/img/logo.png b/src/assets/img/logo.png
deleted file mode 100644
index 3c82b03..0000000
--- a/src/assets/img/logo.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/img/logo1.png b/src/assets/img/logo1.png
deleted file mode 100644
index c82688d..0000000
--- a/src/assets/img/logo1.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/img/mlogo.png b/src/assets/img/main-logo.png
similarity index 100%
rename from src/assets/img/mlogo.png
rename to src/assets/img/main-logo.png
Binary files differ
diff --git a/src/components/header/index.jsx b/src/components/header/index.jsx
index ad1127c..d9d7865 100644
--- a/src/components/header/index.jsx
+++ b/src/components/header/index.jsx
@@ -12,7 +12,7 @@
import zhCN from '@/locales/zh-CN/header.js'
import enUS from '@/locales/en-US/header.js'
import Utils from '@/utils/utils.js'
-import logourl from '@/assets/img/mlogo.png'
+import logourl from '@/assets/img/main-logo.png'
import avatar from '@/assets/img/avatar.jpg'
import './index.scss'
@@ -32,7 +32,8 @@
visible: false, // 淇敼瀵嗙爜妯℃�佹
dict: (!localStorage.getItem('lang') || localStorage.getItem('lang') === 'zh-CN') ? zhCN : enUS,
confirmLoading: false,
- userName: localStorage.getItem('username')
+ userName: localStorage.getItem('username'),
+ logourl: window.GLOB.mainlogo || logourl
}
handleCollapse = () => {
@@ -225,7 +226,6 @@
}
render () {
- // let logourl = window.GLOB.logo
const menu = (
<Menu overlayclassname="header-dropdown">
{this.props.debug && <Menu.Item key="0">
@@ -239,7 +239,7 @@
return (
<header className="header-container ant-menu-dark">
- <div className={this.props.collapse ? "collapse header-logo" : "header-logo"}><img src={logourl} alt=""/></div>
+ <div className={this.props.collapse ? "collapse header-logo" : "header-logo"}><img src={this.state.logourl} alt=""/></div>
<div className={this.props.collapse ? "collapse header-collapse" : "header-collapse"} onClick={this.handleCollapse}>
<Icon type={this.props.collapse ? 'menu-unfold' : 'menu-fold'} />
</div>
diff --git a/src/components/header/index.scss b/src/components/header/index.scss
index fa3278b..3c4a3f1 100644
--- a/src/components/header/index.scss
+++ b/src/components/header/index.scss
@@ -12,14 +12,14 @@
.header-logo {
float: left;
- width: 155px;
+ width: 170px;
line-height: 48px;
text-align: center;
opacity: 1;
transition: width 0.2s, opacity 0.15s;
img {
max-width: 100%;
- max-height: 35px;
+ max-height: 40px;
}
}
.header-logo.collapse {
@@ -31,7 +31,7 @@
float: left;
width: 80px;
line-height: 48px;
- padding-left: 45px;
+ padding-left: 30px;
cursor: pointer;
transition: padding-left 0.15s;
i {
diff --git a/src/views/login/index.jsx b/src/views/login/index.jsx
index f0b640e..de9d5da 100644
--- a/src/views/login/index.jsx
+++ b/src/views/login/index.jsx
@@ -27,7 +27,8 @@
copyright: window.GLOB.copyRight || 'Copyright漏2017 鎵�鏈夌浉鍏崇増鏉冨綊 鍖椾含鏄庣鏅崕淇℃伅鎶�鏈湁闄愬叕鍙�',
ICP: window.GLOB.icp || 'ICP澶囨锛� 浜琁CP澶�12007830鍙�',
bgColor: window.GLOB.bgColor || '#000000',
- lineColor: window.GLOB.lineColor || '#06b4f7'
+ lineColor: window.GLOB.lineColor || '#06b4f7',
+ website: window.GLOB.website || (!window.GLOB.copyRight && 'http://minkesoft.com')
}
changelang (item) {
@@ -143,7 +144,10 @@
/>
</div>
<div className="login-bottom">
- <p dangerouslySetInnerHTML={{ __html: this.state.copyright.replace(/\s/ig, ' ') }}></p>
+ {this.state.website ?
+ <a target="blank" href={this.state.website} dangerouslySetInnerHTML={{ __html: this.state.copyright.replace(/\s/ig, ' ') }}></a> :
+ <p dangerouslySetInnerHTML={{ __html: this.state.copyright.replace(/\s/ig, ' ') }}></p>
+ }
<p dangerouslySetInnerHTML={{ __html: this.state.ICP.replace(/\s/ig, ' ') }}></p>
</div>
</div>
diff --git a/src/views/login/index.scss b/src/views/login/index.scss
index dd2a238..20f480a 100644
--- a/src/views/login/index.scss
+++ b/src/views/login/index.scss
@@ -100,6 +100,11 @@
p span.split {
margin-right: 15px;
}
+ a {
+ display: inline-block;
+ margin-bottom: 5px;
+ color: #ffffff;
+ }
}
.ant-btn-primary[disabled] {
color: #fff;
--
Gitblit v1.8.0