diff --git a/.env.development b/.env.development index 1da8487..eac1010 100644 --- a/.env.development +++ b/.env.development @@ -1,3 +1 @@ -# VITE_APP_URL = http://192.168.31.82:8771 -# VITE_APP_URL = http://18.167.251.121:10095 -VITE_APP_URL = https://www.lc-api.aida.com.hk +VITE_APP_URL = http://192.168.31.82:10094 diff --git a/.env.production b/.env.production index 40b3f9c..eac1010 100644 --- a/.env.production +++ b/.env.production @@ -1,2 +1 @@ -VITE_APP_URL = https://www.lc-api.aida.com.hk -# VITE_APP_URL = http://18.167.251.121:10095 +VITE_APP_URL = http://192.168.31.82:10094 diff --git a/src/api/account.ts b/src/api/account.ts new file mode 100644 index 0000000..7683463 --- /dev/null +++ b/src/api/account.ts @@ -0,0 +1,63 @@ +import request from '@/utils/request' + +/** + * 登录发送验证码 + * @param data - 包含邮箱的参数 + * @param data.email - 邮箱 + * @param data.password - 密码 +*/ +export const AccountSendLoginCode = (data) => { + return request({ + url: '/buyer/account/preLogin', + method: 'post', + data, + loading: true + }) +} +/** + * 登录 + * @param data - 包含邮箱的参数 + * @param data.email - 邮箱 + * @param data.password - 密码 + * @param data.emailVerifyCode - 验证码 +*/ +export const AccountLogin = (data) => { + return request({ + url: '/buyer/account/login', + method: 'post', + data, + loading: true + }) +} + + +/** + * 注册 + * @param data - 包含注册信息的参数 + * @param data.email - 邮箱 + * @param data.password - 密码 + * @param data.username - 用户名 + * @param data.emailVerifyCode - 验证码 + */ +export const AccountRegister = (data) => { + return request({ + url: '/buyer/account/register', + method: 'post', + data, + loading: true + }) +} +/** + * 注册||忘记密码：发送邮箱验证码 + * @param data - 包含邮箱的参数 + * @param data.email - 邮箱 + * @param data.operationType - 操作类型：FORGET_PWD, REGISTER +*/ +export const AccountSendVerifyCode = (data) => { + return request({ + url: '/buyer/account/sendCode', + method: 'post', + data, + loading: true + }) +} diff --git a/src/api/login.ts b/src/api/login.ts deleted file mode 100644 index ee2b979..0000000 --- a/src/api/login.ts +++ /dev/null @@ -1,77 +0,0 @@ -import request from '@/utils/request' - -interface LoginParamsType { - name?: string // 姓名 - email: string // 邮箱 - password?: string // 密码 - operationType: 'REGISTER' | 'LOGIN' | 'FORGET_PWD' - verifyCode?: string // 验证码 -} - -// 发送验证码 -export const precheckEmail = (params: { email: string }): Promise => { - return request({ - url: '/api/auth/precheckEmail', - method: 'get', - params - }) -} - -export const fetchRegisterOrLogin = (data: LoginParamsType): Promise => { - return request({ - url: '/api/auth/registerOrLogin', - method: 'post', - data - }) -} - -export const resetPassword = (data: LoginParamsType): Promise => { - return request({ - url: '/api/auth/forgotPwd', - method: 'post', - data - }) -} - -export const checkLoginStatus = (): Promise> => { - return request({ - url: '/api/auth/checkLoginStatus', - method: 'get', - meta: { responseAll: true } - }) -} - -export const LogOut = (): Promise => { - return request({ - url: '/api/auth/logout', - method: 'get' - }) -} - -// Google登录/注册参数类型 -interface GoogleAuthParamsType { - accessToken?: string // Google ID Token (用于One Tap登录) -} -export const googleAuth = (data: GoogleAuthParamsType): Promise => { - return request({ - url: '/api/auth/parseGoogleAccessToken', - method: 'get', - params: data - }) -} - - -/** 更改用户信息 - * @param data 包含用户信息的对象 - * @param data.username 用户名 - * @param data.email 邮箱 - * @param data.password 密码 - * @returns 包含更新后的用户信息的对象 -*/ -export const updateUserInfo = (data: any) => { - return request({ - url: '/api/auth/updateUserInfo', - method: 'post', - data - }) -} diff --git a/src/stores/userInfo.ts b/src/stores/userInfo.ts index 3ce85a0..271fde0 100644 --- a/src/stores/userInfo.ts +++ b/src/stores/userInfo.ts @@ -4,67 +4,68 @@ import { ref, computed } from 'vue' import { removeLocal, setLocal } from '@/utils/local' import MyEvent from '@/utils/myEvent' export const useUserInfoStore = defineStore('userInfo', () => { - const state = ref({ - userInfo: {}, - token: '', - generateParams: { - stylist: '', - sex: '', - stylistImage: '' - } - }) + const state = ref({ + userInfo: {}, + token: '', + generateParams: { + stylist: '', + sex: '', + stylistImage: '' + } + }) - // getters - const getUserInfo = computed(() => state.value.userInfo) + // getters + const getUserInfo = computed(() => state.value.userInfo) - // actions - const setUserInfo = (data: any) => { - state.value.userInfo = data - } + // actions + const setUserInfo = (data: any) => { + state.value.userInfo = data + state.value.token = data.accessToken + } - const setToken = (data: string) => { - state.value.token = data - setLocal(data, 'token') - } + const setToken = (data: string) => { + state.value.token = data + setLocal(data, 'token') + } - const getGenerateParams = () => { - return state.value.generateParams - } + const getGenerateParams = () => { + return state.value.generateParams + } - const setGenerateParams = (data: any) => { - state.value.generateParams = data - } + const setGenerateParams = (data: any) => { + state.value.generateParams = data + } - const resetGenerateParams = () => { - state.value.generateParams = { - stylist: '', - sex: '', - stylistImage: '' - } - } + const resetGenerateParams = () => { + state.value.generateParams = { + stylist: '', + sex: '', + stylistImage: '' + } + } - const logOut = () => { - // 处理退出登录的一些逻辑 - return new Promise((resolve) => { - state.value.token = '' - state.value.userInfo = {} - removeLocal('token') - resetGenerateParams() - MyEvent.emit('clear-generate-state') - MyEvent.emit('clear-client-state') - MyEvent.emit('clearAllCache') - resolve('') - }) - } + const logOut = () => { + // 处理退出登录的一些逻辑 + return new Promise((resolve) => { + state.value.token = '' + state.value.userInfo = {} + removeLocal('token') + resetGenerateParams() + MyEvent.emit('clear-generate-state') + MyEvent.emit('clear-client-state') + MyEvent.emit('clearAllCache') + resolve('') + }) + } - return { - state, - getUserInfo, - setToken, - setUserInfo, - setGenerateParams, - getGenerateParams, - resetGenerateParams, - logOut - } + return { + state, + getUserInfo, + setToken, + setUserInfo, + setGenerateParams, + getGenerateParams, + resetGenerateParams, + logOut + } }) diff --git a/src/utils/request.ts b/src/utils/request.ts index a70affe..29fd714 100644 --- a/src/utils/request.ts +++ b/src/utils/request.ts @@ -75,7 +75,7 @@ service.interceptors.response.use( const res = response.data // 处理异常的情况 // console.log(res) - if (res.code != 200) { + if (res.errCode != 0) { ElMessage.error(res.message) return Promise.reject(new Error(res.errMsg || res.message || 'error')) } else { diff --git a/src/views/login/login-dialog.vue b/src/views/login/login-dialog.vue index 2bf3ed2..e9faecd 100644 --- a/src/views/login/login-dialog.vue +++ b/src/views/login/login-dialog.vue @@ -55,6 +55,12 @@ diff --git a/vite.config.ts b/vite.config.ts index af3a18c..4ce51dd 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -66,11 +66,10 @@ export default defineConfig(({ mode }) => { overlay: true }, proxy: { - '/api': { - //'/api'是自行设置的请求前缀 + '/buyer': { target: env.VITE_APP_URL, changeOrigin: true, //用于控制请求头中的host值 - rewrite: (path) => path.replace(/^\/api/, '/api') //路径重写，（正则）匹配以api开头的路径为空（将请求前缀删除） + rewrite: (path) => path.replace(/^\/buyer/, '/buyer') //路径重写，（正则）匹配以api开头的路径为空（将请求前缀删除） } } }