diff --git a/nezha-fronted/src/assets/css/components/page/config/system/license.scss b/nezha-fronted/src/assets/css/components/page/config/system/license.scss
index 47ce38494..9bf94031a 100644
--- a/nezha-fronted/src/assets/css/components/page/config/system/license.scss
+++ b/nezha-fronted/src/assets/css/components/page/config/system/license.scss
@@ -205,7 +205,9 @@
border: 1px solid $--border-color-light;
border-color: $--border-color-light;
}
+}
+.c2vDialog{
.el-dialog{
.el-dialog__header{
padding: 16px 20px;
@@ -248,4 +250,4 @@
}
}
}
-}
+}
\ No newline at end of file
diff --git a/nezha-fronted/src/components/common/login.vue b/nezha-fronted/src/components/common/login.vue
index ba8a822c7..3e8147065 100644
--- a/nezha-fronted/src/components/common/login.vue
+++ b/nezha-fronted/src/components/common/login.vue
@@ -35,7 +35,7 @@
-
+
+ {{$t('license.check')}}
+ {{$t('license.check1')}}
+ {{$t('license.check2')}}
+ {{$t('license.check3')}}
+ {{$t('license.check4')}}
+
+ {{$t('license.checkCompleted')}}
+
+
+ {{$t("overall.close")}}
+ {{$t('overall.download')}}
+
+
@@ -269,11 +290,17 @@ export default {
boxWidth: '',
boxHeight: '',
qrWidth: 10,
- paddingLeft: 0
+ paddingLeft: 0,
+ checkVisible: false,
+ downLoading: false,
+ checkCompleted: false
}
},
methods: {
...mapActions(['loginSuccess']),
+ closeCheckDialog () {
+ this.checkCompleted = false
+ },
login () {
if (this.loading || !this.license.valid) {
return
@@ -289,7 +316,7 @@ export default {
this.theme = res.data.user.theme
this.userInfo = res.data.user
localStorage.setItem('nz-token', res.data.authToken)
- localStorage.setItem('nz-userInfo', JSON.stringify( this.userInfo))
+ localStorage.setItem('nz-userInfo', JSON.stringify(this.userInfo))
if (res.data.authFlag === 1) {
if (res.data.authBind === 0) {
this.verifyShow = true
@@ -385,8 +412,11 @@ export default {
}
})
},
- downloadLogin () {
+ downloadLicense () {
+ this.downLoading = true
this.$get('/sys/license/token').then(res => {
+ this.downLoading = false
+ this.checkVisible = false
let fileName = ''
const resFileName = res.headers['content-disposition'].split('=')[1]
if (resFileName) {
@@ -407,6 +437,7 @@ export default {
a.remove() // 将a标签移除
}
}, error => {
+ this.downLoading = false
const $self = this
const reader = new FileReader()
reader.onload = function (event) {
diff --git a/nezha-fronted/src/components/page/config/system/license.vue b/nezha-fronted/src/components/page/config/system/license.vue
index 46f44a800..0596a69a7 100644
--- a/nezha-fronted/src/components/page/config/system/license.vue
+++ b/nezha-fronted/src/components/page/config/system/license.vue
@@ -165,7 +165,7 @@
{
this.downLoading = false
+ this.checkVisible = false
let fileName = ''
const resFileName = res.headers['content-disposition'].split('=')[1]
if (resFileName) {