diff --git a/src/api/oauth.js b/src/api/oauth.js new file mode 100644 index 0000000..2ab0f91 --- /dev/null +++ b/src/api/oauth.js @@ -0,0 +1,31 @@ +import request from '@/utils/request' +/** + * 微信登录 + * @param {*} source pub miniapp + * @param {*} code + * @returns + */ +export function wxLogin(source,code) { + return request({ + url: `/wx/login/${source}/${code}`, + headers: { + isToken: false + }, + method: 'post', + }) +} +/** + * 微信绑定 + * @param {*} source 微信绑定 + * @param {*} code + * @returns + */ +export function wxRegister(source,code) { + return request({ + url: `/wx/register/${source}/${code}`, + headers: { + isToken: true + }, + method: 'post', + }) +} \ No newline at end of file diff --git a/src/config.js b/src/config.js index de0850f..903bc2c 100644 --- a/src/config.js +++ b/src/config.js @@ -1,8 +1,10 @@ // 应用全局配置 const config = { - baseUrl: 'https://vue.ruoyi.vip/prod-api', + // baseUrl: 'https://vue.ruoyi.vip/prod-api', + // baseUrl: 'http://localhost/prod-api', + baseUrl: 'http://localhost:8080', //cloud后台网关地址 - // baseUrl: 'http://192.168.10.3:8080', + // baseUrl: 'http://192.168.10.3:8080', // 应用信息 appInfo: { // 应用名称 diff --git a/src/pages/login.vue b/src/pages/login.vue index d9ec0ad..5040836 100644 --- a/src/pages/login.vue +++ b/src/pages/login.vue @@ -40,6 +40,9 @@ import { getCodeImg } from '@/api/login' import { ref } from "vue"; import config from '@/config.js' import useUserStore from '@/store/modules/user' +import { getWxCode } from '@/utils/geek'; +import { wxLogin } from '@/api/oauth'; +import { setToken } from '@/utils/auth'; const userStore = useUserStore() const codeUrl = ref(""); const captchaEnabled = ref(true); @@ -50,6 +53,18 @@ const loginForm = ref({ code: "", uuid: '' }); +const useWxLogin = ref(true) +if (useWxLogin.value) { + getWxCode().then(res => { + console.log(res); + wxLogin('miniapp',res).then(res => { + if(res.token != null){ + setToken(res.token); + loginSuccess() + } + }); + }) +} // 获取图形验证码 diff --git a/src/pages_mine/pages/info/index.vue b/src/pages_mine/pages/info/index.vue index 74de413..287aa9f 100644 --- a/src/pages_mine/pages/info/index.vue +++ b/src/pages_mine/pages/info/index.vue @@ -10,33 +10,40 @@ + + 绑定微信 -