-

+
+ Magic-Boot
+
@@ -29,13 +31,14 @@
.logo-title {
color:white;
height: 60px;
- font-size: 16px;
+ font-size: 24px;
line-height: 60px;
text-align: center;
font-weight: 300;
box-shadow: 0px -1px 5px 0px #000;
z-index: 1;
position: relative;
+ font-family: PoetsenOne;
}
diff --git a/magic-boot-ui/src/scripts/request.js b/magic-boot-ui/src/scripts/request.js
index eb88235..8c48a51 100644
--- a/magic-boot-ui/src/scripts/request.js
+++ b/magic-boot-ui/src/scripts/request.js
@@ -30,7 +30,7 @@ service.interceptors.request.use(
}
)
-var isShowMsg = false
+var currentMessage
// response interceptor
service.interceptors.response.use(
/**
@@ -81,18 +81,17 @@ service.interceptors.response.use(
}
})
}
- if (isShowMsg === false && res.code !== 402) {
- Message({
+ if (res.code !== 402) {
+ if(currentMessage){
+ currentMessage.close()
+ }
+ currentMessage = Message({
message: res.message || 'Error',
type: 'error',
duration: duration * 1000,
- showClose: true,
- onClose: function() {
- isShowMsg = false
- }
+ showClose: true
})
- isShowMsg = true
- // reslove(res)
+ reject(res)
}
} else {
reslove(res)
@@ -101,17 +100,14 @@ service.interceptors.response.use(
},
error => {
// console.log('err' + error) // for debug
- if (isShowMsg === false) {
- Message({
- message: error.message,
- type: 'error',
- duration: 5 * 1000,
- onClose: function() {
- isShowMsg = false
- }
- })
- isShowMsg = true
+ if(currentMessage){
+ currentMessage.close()
}
+ currentMessage = Message({
+ message: error.message,
+ type: 'error',
+ duration: 5 * 1000
+ })
return Promise.reject(error)
}
)
diff --git a/magic-boot-ui/src/styles/common.css b/magic-boot-ui/src/styles/common.css
index 96a6d2f..a82909f 100644
--- a/magic-boot-ui/src/styles/common.css
+++ b/magic-boot-ui/src/styles/common.css
@@ -1,3 +1,9 @@
+@font-face {
+ font-family: PoetsenOne;
+ src: url(../assets/fonts/PoetsenOne.woff2) format('woff2');
+ font-weight: 100;
+ font-style: normal;
+}
body {
--el-dialog__wrapper-bottom: 15vh;
--el-dialog__wrapper-top: 15vh;
diff --git a/magic-boot-ui/src/views/dashboard/index.vue b/magic-boot-ui/src/views/dashboard/index.vue
index 34c7c51..bf3b93b 100644
--- a/magic-boot-ui/src/views/dashboard/index.vue
+++ b/magic-boot-ui/src/views/dashboard/index.vue
@@ -21,6 +21,7 @@ export default {
.dashboard {
&-container {
margin: 30px;
+ background: white;
}
&-text {
font-size: 30px;
diff --git a/magic-boot-ui/src/views/login/index.vue b/magic-boot-ui/src/views/login/index.vue
index 5ff8e18..44e3250 100644
--- a/magic-boot-ui/src/views/login/index.vue
+++ b/magic-boot-ui/src/views/login/index.vue
@@ -1,74 +1,45 @@
-
-
-
后台管理系统
+
+
+ Magic-Boot
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
登录
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
登录
-
+
Copyright © 2020-{{new Date().getYear() + 1900}}
ssssssss.org.cn All rights reserved.