cfn
/
admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	src/layout/components/tasks.vue
This commit is contained in:
cfn@leapy.cn 2025-06-19 21:20:37 +08:00
parent 7497e35923 e68d41c6a3
commit 2a2d05b44f
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/App.vue
View File

@ -12,8 +12,9 @@ import colorTool from '@/utils/color'
const {locale, messages} = useI18n() const {locale, messages} = useI18n()
const config = ref({ const config = ref({
size: "default", size: 'default',
zIndex: 2000, zIndex: 2000,
button: { button: {
autoInsertSpace: false autoInsertSpace: false
@ -37,7 +38,6 @@ if(app_color){
document.documentElement.style.setProperty(`--el-color-primary-dark-${i}`, colorTool.darken(app_color, i / 10)); document.documentElement.style.setProperty(`--el-color-primary-dark-${i}`, colorTool.darken(app_color, i / 10));
} }
} }
</script> </script>
<style lang="scss"> <style lang="scss">

11
src/views/system/login/index.vue
View File

@ -75,9 +75,9 @@
import {getCurrentInstance, ref, onMounted, watch} from 'vue' import {getCurrentInstance, ref, onMounted, watch} from 'vue'
import {useI18n} from 'vue-i18n' import {useI18n} from 'vue-i18n'
import {useRouter, useRoute} from 'vue-router'; import {useRouter, useRoute} from 'vue-router';
import tools from "@/utils/tools.js"; import tools from "@/utils/tools";
import sysConfig from "@/config/index.js"; import sysConfig from "@/config/index";
import api from "@/api/index.js"; import api from "@/api/index";
defineOptions({ defineOptions({
name: 'login' name: 'login'
@ -92,7 +92,6 @@ let lang = ref(tools.data.get('APP_LANG') || sysConfig.LANG)
let dark = ref(false) let dark = ref(false)
const redirect = ref(undefined); const redirect = ref(undefined);
const langs = ref([ const langs = ref([
{ {
name: '简体中文', name: '简体中文',
@ -173,7 +172,8 @@ async function getCode() {
async function login() { async function login() {
// 校验登录 // 校验登录
const validate = await proxy.$refs.loginForm.validate().catch(() => {}); const validate = await proxy.$refs.loginForm.validate().catch(() => {
});
if (!validate) { if (!validate) {
return false return false
} }
@ -224,6 +224,7 @@ function configDark() {
localStorage.setItem("APP_DARK", 'light') localStorage.setItem("APP_DARK", 'light')
} }
} }
function configLang(command) { function configLang(command) {
lang.value = command.value lang.value = command.value
} }