diff --git a/frontend/src/renderer/src/views/Header.vue b/frontend/src/renderer/src/views/Header.vue
index ae37a9fc..e67329c4 100644
--- a/frontend/src/renderer/src/views/Header.vue
+++ b/frontend/src/renderer/src/views/Header.vue
@@ -55,6 +55,10 @@
+
+
+
@@ -64,6 +68,10 @@
import { ElMessage, ElMessageBox } from 'element-plus'
import { useAuthStore } from '../stores/index.js'
import api from '../services/api.js'
+ import License from '@/views/License.vue'
+ const isLicense = ref(false)
+
+
const router = useRouter()
const authStore = useAuthStore()
const time = ref("");
@@ -97,6 +105,11 @@
}
function handleClose(){
dialogVisible.value = false
+
+ }
+ function handleLicenseClose(){
+ isLicense.value = false
+ // getLicense()
}
function dateFormat(row) {
const daterc = row;
@@ -145,11 +158,11 @@
time.value = dateFormat(new Date())
// 授权状态徽标:页面加载时检查 /api/license/info
- ;(async () => {
- try {
- debugger
+ getLicense()
+ })
+ async function getLicense(){
+ try {
const json = await api.get('/api/license/info')
- debugger
if (!json || json.success !== true) {
licenseBadge.value = '未授权'
licenseClass.value = 'badge-invalid'
@@ -185,11 +198,10 @@
licenseType.value = 'invalid'
showActivateButton.value = true
}
- })()
- })
-
+ }
const goActivate = () => {
- router.push('/license')
+ // router.push('/license')
+ isLicense.value = true
}
diff --git a/frontend/src/renderer/src/views/License.vue b/frontend/src/renderer/src/views/License.vue
index cdcacd3d..11ea8cdd 100644
--- a/frontend/src/renderer/src/views/License.vue
+++ b/frontend/src/renderer/src/views/License.vue
@@ -1,7 +1,7 @@
@@ -14,7 +14,7 @@
- 软件信息
+ 软件信息
@@ -56,7 +56,7 @@ import { ref, reactive, onMounted } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import { systemAPI } from '../services/api.js'
import { licenseAPI } from '../services/api.js'
-
+const emit = defineEmits([ 'closeLicense']);
const activeTab = ref('request')
const form = reactive({
@@ -134,6 +134,7 @@ const exportActivationFile = async () => {
downloadTextFile(filename, content)
ElMessage.success('激活请求文件已导出')
+ // emit('closeLicense', false);
} else {
throw new Error(res && res.error ? res.error : '生成激活文件失败')
}
@@ -171,14 +172,26 @@ const activatePackage = async () => {
\ No newline at end of file