Browse Source

Merge remote-tracking branch 'origin/dev_czc' into dev

dev_czc
congzc 1 year ago
parent
commit
caf94c1922
3 changed files with 5 additions and 3 deletions
  1. +1
    -1
      src/apis/myAccount.js
  2. +2
    -0
      src/types/auto-imports.d.ts
  3. +2
    -2
      src/views/login/index.vue

+ 1
- 1
src/apis/myAccount.js View File

@@ -70,7 +70,7 @@ export function updUserInfoApi(data) {
*/ */
export function getUserInfoApi() { export function getUserInfoApi() {
return request({ return request({
url: `api/user/getUserInfo`,
url: `getUserInfo`,
method: 'get', method: 'get',
}) })
} }

+ 2
- 0
src/types/auto-imports.d.ts View File

@@ -4,6 +4,7 @@ declare global {
const EffectScope: typeof import('vue')['EffectScope'] const EffectScope: typeof import('vue')['EffectScope']
const ElForm: typeof import('element-plus/es')['ElForm'] const ElForm: typeof import('element-plus/es')['ElForm']
const ElMessage: typeof import('element-plus/es')['ElMessage'] const ElMessage: typeof import('element-plus/es')['ElMessage']
const ElMessageBox: typeof import('element-plus/es')['ElMessageBox']
const asyncComputed: typeof import('@vueuse/core')['asyncComputed'] const asyncComputed: typeof import('@vueuse/core')['asyncComputed']
const autoResetRef: typeof import('@vueuse/core')['autoResetRef'] const autoResetRef: typeof import('@vueuse/core')['autoResetRef']
const computed: typeof import('vue')['computed'] const computed: typeof import('vue')['computed']
@@ -272,6 +273,7 @@ declare module 'vue' {
readonly EffectScope: UnwrapRef<typeof import('vue')['EffectScope']> readonly EffectScope: UnwrapRef<typeof import('vue')['EffectScope']>
readonly ElForm: UnwrapRef<typeof import('element-plus/es')['ElForm']> readonly ElForm: UnwrapRef<typeof import('element-plus/es')['ElForm']>
readonly ElMessage: UnwrapRef<typeof import('element-plus/es')['ElMessage']> readonly ElMessage: UnwrapRef<typeof import('element-plus/es')['ElMessage']>
readonly ElMessageBox: UnwrapRef<typeof import('element-plus/es')['ElMessageBox']>
readonly asyncComputed: UnwrapRef<typeof import('@vueuse/core')['asyncComputed']> readonly asyncComputed: UnwrapRef<typeof import('@vueuse/core')['asyncComputed']>
readonly autoResetRef: UnwrapRef<typeof import('@vueuse/core')['autoResetRef']> readonly autoResetRef: UnwrapRef<typeof import('@vueuse/core')['autoResetRef']>
readonly computed: UnwrapRef<typeof import('vue')['computed']> readonly computed: UnwrapRef<typeof import('vue')['computed']>


+ 2
- 2
src/views/login/index.vue View File

@@ -1171,7 +1171,7 @@ function getCode() {
axios({ axios({
url: getCodeImgUrl, url: getCodeImgUrl,
method: "get", method: "get",
}).then(() => {
}).then((res) => {
verifyCodeUrl.value = getCodeImgUrl; verifyCodeUrl.value = getCodeImgUrl;
showCodeImg.value = true; showCodeImg.value = true;
}); });
@@ -1188,7 +1188,7 @@ async function doLogin(data: any) {
await loginApi(data) await loginApi(data)
.then(async (res) => { .then(async (res) => {
console.log(res, "res"); console.log(res, "res");
localStorage.setItem("AccessToken", res.data.token);
// localStorage.setItem("AccessToken", res.data.token);
// 注册成功将账号密码保存到本地 // 注册成功将账号密码保存到本地
saveInfo(data); saveInfo(data);
isLogining.value = false; isLogining.value = false;


Loading…
Cancel
Save