diff --git a/app/src/api/account.ts b/app/src/api/account.ts index a23ff489..c9f31de7 100644 --- a/app/src/api/account.ts +++ b/app/src/api/account.ts @@ -10,3 +10,8 @@ export function login(data: Record) { export function register(data: Record) { return request.post({ url: '/login/register', data: { ...data, client } }) } + +//忘记密码 +export function forgotPassword(data: Record) { + return request.post({ url: '/login/forgotPassword', data }) +} diff --git a/app/src/main.ts b/app/src/main.ts index 3251d788..9857b486 100644 --- a/app/src/main.ts +++ b/app/src/main.ts @@ -2,7 +2,6 @@ import { createSSRApp } from 'vue' import App from './App.vue' import plugins from './plugins' import './styles/index.scss' -import './router' export function createApp() { const app = createSSRApp(App) app.use(plugins) diff --git a/app/src/pages.json b/app/src/pages.json index 429ddc8a..f8c7acfc 100644 --- a/app/src/pages.json +++ b/app/src/pages.json @@ -30,6 +30,12 @@ "navigationBarTitleText": "注册" } }, + { + "path": "pages/forget_pwd/forget_pwd", + "style": { + "navigationBarTitleText": "忘记密码" + } + }, { "path": "pages/customer_service/customer_service", "style": { diff --git a/app/src/pages/forget_pwd/forget_pwd.vue b/app/src/pages/forget_pwd/forget_pwd.vue new file mode 100644 index 00000000..f91dce5f --- /dev/null +++ b/app/src/pages/forget_pwd/forget_pwd.vue @@ -0,0 +1,108 @@ + + + + + diff --git a/app/src/pages/login/login.vue b/app/src/pages/login/login.vue index f6ff2ab3..f4bda768 100644 --- a/app/src/pages/login/login.vue +++ b/app/src/pages/login/login.vue @@ -31,11 +31,13 @@ placeholder="请输入密码" :border="false" /> - - 忘记密码? - + + + 忘记密码? + + diff --git a/app/src/pages/register/register.vue b/app/src/pages/register/register.vue index b9fed846..bad6ae47 100644 --- a/app/src/pages/register/register.vue +++ b/app/src/pages/register/register.vue @@ -66,7 +66,7 @@ const accountRegister = async () => { if (!accountData.password2) return uni.$u.toast('请输入确认密码') if (accountData.password != accountData.password2) return uni.$u.toast('两次输入的密码不一致') await register(accountData) - uni.$u.toast('组册成功') + uni.$u.toast('注册成功') uni.navigateBack() } diff --git a/app/src/utils/request/index.ts b/app/src/utils/request/index.ts index 57fef43b..f35d82ad 100644 --- a/app/src/utils/request/index.ts +++ b/app/src/utils/request/index.ts @@ -3,6 +3,7 @@ import { merge } from 'lodash-es' import { HttpRequestOptions, RequestHooks } from './type' import { getToken } from '../auth' import { RequestCodeEnum } from '@/enums/requestEnums' +import { useUserStore } from '@/stores/user' const requestHooks: RequestHooks = { requestInterceptorsHook(options, config) { @@ -32,7 +33,7 @@ const requestHooks: RequestHooks = { if (!isTransformResponse) { return response.data } - console.log(response.data) + const { logout } = useUserStore() const { code, data, msg } = response.data as any switch (code) { case RequestCodeEnum.SUCCESS: @@ -52,6 +53,10 @@ const requestHooks: RequestHooks = { case RequestCodeEnum.TOKEN_INVALID: case RequestCodeEnum.TOKEN_EMPTY: + logout() + uni.navigateTo({ + url: '/pages/login/login' + }) return Promise.reject() default: diff --git a/app/src/utils/util.ts b/app/src/utils/util.ts index b7d35726..f77a3ef0 100644 --- a/app/src/utils/util.ts +++ b/app/src/utils/util.ts @@ -4,20 +4,22 @@ * @param { Boolean } all 是否多选 * @param { ctx } context 当前组件实例 */ -export const getRect = (selector: string, all: boolean = false, context?: any) => { +export const getRect = (selector: string, all = false, context?: any) => { return new Promise((resolve, reject) => { let qurey = uni.createSelectorQuery() if (context) { qurey = uni.createSelectorQuery().in(context) } - qurey[all ? 'selectAll' : 'select'](selector).boundingClientRect(function(rect) { - if (all && Array.isArray(rect) && rect.length) { - return resolve(rect) - } - if (!all && rect) { - return resolve(rect) - } - reject('找不到元素') - }).exec() + qurey[all ? 'selectAll' : 'select'](selector) + .boundingClientRect(function (rect) { + if (all && Array.isArray(rect) && rect.length) { + return resolve(rect) + } + if (!all && rect) { + return resolve(rect) + } + reject('找不到元素') + }) + .exec() }) -} \ No newline at end of file +}