diff --git a/src/api/oauth.js b/src/api/oauth.js index 2ab0f91..dbd87b3 100644 --- a/src/api/oauth.js +++ b/src/api/oauth.js @@ -7,7 +7,7 @@ import request from '@/utils/request' */ export function wxLogin(source,code) { return request({ - url: `/wx/login/${source}/${code}`, + url: `/oauth/wx/login/${source}/${code}`, headers: { isToken: false }, @@ -22,7 +22,7 @@ export function wxLogin(source,code) { */ export function wxRegister(source,code) { return request({ - url: `/wx/register/${source}/${code}`, + url: `/oauth/wx/register/${source}/${code}`, headers: { isToken: true }, diff --git a/src/pages/login.vue b/src/pages/login.vue index 5040836..77cf06c 100644 --- a/src/pages/login.vue +++ b/src/pages/login.vue @@ -45,7 +45,8 @@ import { wxLogin } from '@/api/oauth'; import { setToken } from '@/utils/auth'; const userStore = useUserStore() const codeUrl = ref(""); -const captchaEnabled = ref(true); +const captchaEnabled = ref(true); // 是否开启验证码 +const useWxLogin = ref(true); // 是否使用微信登录 const globalConfig = ref(config); const loginForm = ref({ username: "admin", @@ -53,7 +54,7 @@ const loginForm = ref({ code: "", uuid: '' }); -const useWxLogin = ref(true) + if (useWxLogin.value) { getWxCode().then(res => { console.log(res);