diff --git a/auto-imports.d.ts b/auto-imports.d.ts index 07b6235..24e619c 100644 --- a/auto-imports.d.ts +++ b/auto-imports.d.ts @@ -3,5 +3,4 @@ export {} declare global { const ElMessage: typeof import('element-plus/es')['ElMessage'] const ElMessageBox: typeof import('element-plus/es')['ElMessageBox'] - const ElNotification: typeof import('element-plus/es')['ElNotification'] } diff --git a/components.d.ts b/components.d.ts index 67d3c99..fe69931 100644 --- a/components.d.ts +++ b/components.d.ts @@ -48,8 +48,12 @@ declare module '@vue/runtime-core' { ElSwitch: typeof import('element-plus/es')['ElSwitch'] ElTable: typeof import('element-plus/es')['ElTable'] ElTableColumn: typeof import('element-plus/es')['ElTableColumn'] + ElTabPane: typeof import('element-plus/es')['ElTabPane'] + ElTabs: typeof import('element-plus/es')['ElTabs'] ElTag: typeof import('element-plus/es')['ElTag'] ElTooltip: typeof import('element-plus/es')['ElTooltip'] + ElTree: typeof import('element-plus/es')['ElTree'] + ElUpload: typeof import('element-plus/es')['ElUpload'] ErrorLog: typeof import('./src/components/ErrorLog/index.vue')['default'] GithubCorner: typeof import('./src/components/GithubCorner/index.vue')['default'] Hamburger: typeof import('./src/components/Hamburger/index.vue')['default'] diff --git a/src/utils/request.js b/src/utils/request.js index 9e4e175..42922e1 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -4,7 +4,7 @@ import { getToken } from '@/utils/auth'; // create an axios instance const service = axios.create({ - baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url + baseURL: process.env.VUE_APP_BASE_API = 'https://nbxt.oa.x-lf.cn', // url = base url + request url // withCredentials: true, // send cookies when cross-domain requests timeout: 5000 // request timeout }); diff --git a/src/views/login/index.vue b/src/views/login/index.vue index ff3621f..d744fb6 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -30,7 +30,7 @@ - Login + 登录
@@ -167,24 +167,6 @@ export default defineComponent({ return acc; }, {}); } - // afterQRScan() { - // if (e.key === 'x-admin-oauth-code') { - // const code = getQueryObject(e.newValue) - // const codeMap = { - // wechat: 'code', - // tencent: 'code' - // } - // const type = codeMap[this.auth_type] - // const codeName = code[type] - // if (codeName) { - // store.user().LoginByThirdparty(codeName).then(() => { - // this.$router.push({ path: this.redirect || '/' }) - // }) - // } else { - // alert('第三方登录失败') - // } - // } - // } } });