From 907a26cc942dc9ee943656b12197b668b637eaf1 Mon Sep 17 00:00:00 2001 From: fmk1023 Date: Mon, 5 Jan 2026 09:58:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=80=81=E5=8A=BF=E6=84=9F=E7=9F=A5=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0-=E8=B4=A6=E5=8F=B7=E5=AF=86=E7=A0=81=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E5=8F=8A=E9=AA=8C=E8=AF=81=E7=A0=81=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=B2=BB=E7=90=86=E5=B9=B3=E5=8F=B0=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + src/api/jyh/auth.ts | 23 +++++++++++++++++++---- src/components/LoginModal/index.vue | 6 ++++-- yarn.lock | 5 +++++ 4 files changed, 29 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index ba42037..a4994dc 100644 --- a/package.json +++ b/package.json @@ -36,6 +36,7 @@ "highlight.js": "^11.11.1", "highlightjs-line-numbers.js": "^2.9.0", "js-cookie": "^3.0.5", + "jsencrypt": "^3.5.4", "localforage": "^1.10.0", "lodash": "^4.17.21", "lottie-web": "^5.12.2", diff --git a/src/api/jyh/auth.ts b/src/api/jyh/auth.ts index 1e36f77..2525caa 100644 --- a/src/api/jyh/auth.ts +++ b/src/api/jyh/auth.ts @@ -1,8 +1,22 @@ import request from '@/utils/request'; +import axios from 'axios'; -export const getCaptcha = (account: any, password: any) => { - return request({ - url: `/u-auth/index/getCaptcha`, +// export const getCaptcha = (account: any, password: any) => { +// return request({ +// url: `/u-auth/index/getCaptcha`, +// method: 'POST', +// data: { +// account, +// password, +// loginCode: 'admin' +// }, +// responseType: 'blob' +// }); +// }; + +export function getCaptcha(account: any, password: any) { + return axios.request({ + url: `/gateway/u-auth/index/getCaptcha`, method: 'POST', data: { account, @@ -11,7 +25,8 @@ export const getCaptcha = (account: any, password: any) => { }, responseType: 'blob' }); -}; +} + export const login = (account: any, code: any, password: any) => { return request({ url: `/u-auth/index/login`, diff --git a/src/components/LoginModal/index.vue b/src/components/LoginModal/index.vue index a389491..0ba9684 100644 --- a/src/components/LoginModal/index.vue +++ b/src/components/LoginModal/index.vue @@ -146,6 +146,8 @@ import { import { useRouter } from "vue-router"; // 引入页面2风格的接口逻辑 import { getCaptcha, login } from "@/api/jyh/auth"; +import getRsaCode from '@/utils/jsencrypt'; +import { useAccountStore } from '@/stores/user'; const props = withDefaults(defineProps<{ modelValue: boolean; @@ -252,12 +254,12 @@ const handleLogin = async () => { return; } Message.error(res.data.msg); - formModel.code = ''; + loginForm.code = ''; getCaptchaUrl(); }) .catch((err) => { console.log(err); - formModel.code = ''; + loginForm.code = ''; getCaptchaUrl(); }); diff --git a/yarn.lock b/yarn.lock index df19306..e099d8f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3661,6 +3661,11 @@ js-cookie@^3.0.5: resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz" integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== +jsencrypt@^3.5.4: + version "3.5.4" + resolved "https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.5.4.tgz#8db335ab164359449dd200d120f125f459476b25" + integrity sha512-kNjfYEMNASxrDGsmcSQh/rUTmcoRfSUkxnAz+MMywM8jtGu+fFEZ3nJjHM58zscVnwR0fYmG9sGkTDjqUdpiwA== + jsesc@^2.5.1: version "2.5.2" resolved "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz"