diff --git a/api/start/login.js b/api/start/login.js index 5b1a9c5..ee730e0 100644 --- a/api/start/login.js +++ b/api/start/login.js @@ -15,8 +15,10 @@ import { http } from '../../utils/http' */ export const LoginApi = (data) => { return http({ + // method: 'POST', + // url: '/UserLogin/login', method: 'GET', - url: '/loginFailureWrongCode', + url: '/loginSuccessByEmail', data: { data }, @@ -26,14 +28,31 @@ export const LoginApi = (data) => { /** - * 发送验证码 - * @param {*} phoneNumber + * 发送邮箱验证码 + * @param {*} email * @returns */ -export const SendCodeApi = (data) => { +export const SendEmailCodeApi = (data) => { return http({ - method: 'GET', - url: '/sendCodeFailureTooFrequent', + method: 'POST', + url: '/UserLogin/sendEmail', + data:{ + data + } + }) +} + + + +/** + * 发送手机验证码 + * @param {*} email + * @returns + */ +export const SendPhoneCodeApi = (data) => { + return http({ + method: 'POST', + url: '/UserLogin/sendPhone', data:{ data } diff --git a/pages/start/login/login.vue b/pages/start/login/login.vue index 07e74ce..622fec5 100644 --- a/pages/start/login/login.vue +++ b/pages/start/login/login.vue @@ -191,7 +191,7 @@ - + { // 会员信息 diff --git a/utils/http.js b/utils/http.js index 2f5d2b6..4a55bde 100644 --- a/utils/http.js +++ b/utils/http.js @@ -1,4 +1,4 @@ -import { useMemberStore } from '@/stores' +import { useUserStore } from "../stores/modules/userInfo"; const baseURL = "http://localhost:8888" @@ -19,10 +19,12 @@ const httpInterceptor = { 'source-client': 'miniapp' } //4 添加token - const memberStore = useMemberStore() - const token = memberStore.profile?.token + const memberStore = useUserStore() + const token = memberStore.userInfo?.token if (token) { - options.header.Authorization = token + options.header.Authorization = { + 'token': token + } } return options } @@ -41,8 +43,8 @@ export const http = (options) => { resolve(result.data) } else if (result.statusCode === 401) { // 清除登录信息 - const memberStore = useMemberStore() - memberStore.clearProfile() + const memberStore = useUserStore() + memberStore.clearUserInfo() // 提示用户重新登录 uni.navigateTo({ url: '/pages/login/login'