jiangyc/ruoyi-plus-soybean
1
0
Fork 0
mirror of https://github.com/m-xlsea/ruoyi-plus-soybean.git synced 2025-09-24 07:49:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(hooks): 修复登录页切换登录页参数丢失问题

Browse Source
This commit is contained in:
Soybean
2021-09-16 20:11:45 +08:00
parent b4adf678a4
commit 789855a378
12 changed files with 144 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/views/dashboard/workbench/index.vue
View File

@ -1,11 +1,20 @@
<template>
<div>
<h2>工作台</h2>
<router-link :to="EnumRoutePath['dashboard-analysis']">analysis</router-link>
<div class="p-10px">
<div class="flex-y-center flex-col h-500px bg-white">
<n-gradient-text type="primary" size="32">工作台</n-gradient-text>
<n-space>
<n-button>Default</n-button>
<n-button type="primary">Primary</n-button>
<n-button type="info">Info</n-button>
<n-button type="success">Success</n-button>
<n-button type="warning">Warning</n-button>
<n-button type="error">Error</n-button>
</n-space>
</div>
</div>
</template>
<script lang="ts" setup>
import { EnumRoutePath } from '@/enum';
import { NGradientText, NSpace, NButton } from 'naive-ui';
</script>
<style scoped></style>

4
src/views/system/login/components/CodeLogin/index.vue
View File

@ -13,7 +13,7 @@
</n-form-item>
<n-space :vertical="true" size="large">
<n-button type="primary" size="large" :block="true" :round="true" @click="handleSubmit">确定</n-button>
<n-button size="large" :block="true" :round="true" @click="toLogin('pwd-login')">返回</n-button>
<n-button size="large" :block="true" :round="true" @click="toCurrentLogin('pwd-login')">返回</n-button>
</n-space>
</n-form>
</div>
@ -26,7 +26,7 @@ import type { FormInst } from 'naive-ui';
import { useRouterChange, useSmsCode } from '@/hooks';
const message = useMessage();
const { toLogin } = useRouterChange();
const { toCurrentLogin } = useRouterChange();
const { label, isCounting, start } = useSmsCode();
const formRef = ref<(HTMLElement & FormInst) | null>(null);

10
src/views/system/login/components/PwdLogin/index.vue
View File

@ -10,15 +10,17 @@
<n-space :vertical="true" size="large">
<div class="flex-y-center justify-between">
<n-checkbox v-model:checked="rememberMe">记住我</n-checkbox>
<span class="text-primary cursor-pointer" @click="toLogin('reset-pwd')">忘记密码？</span>
<span class="text-primary cursor-pointer" @click="toCurrentLogin('reset-pwd')">忘记密码？</span>
</div>
<n-button type="primary" size="large" :block="true" :round="true" @click="handleSubmit">确定</n-button>
<div class="flex-y-center justify-between">
<n-button class="flex-1" :block="true" @click="toLogin('code-login')">
<n-button class="flex-1" :block="true" @click="toCurrentLogin('code-login')">
{{ EnumLoginModule['code-login'] }}
</n-button>
<div class="w-12px"></div>
<n-button class="flex-1" :block="true" @click="toLogin('register')">{{ EnumLoginModule.register }}</n-button>
<n-button class="flex-1" :block="true" @click="toCurrentLogin('register')">
{{ EnumLoginModule.register }}
</n-button>
</div>
</n-space>
</n-form>
@ -35,7 +37,7 @@ import { useRouterChange, useRouteQuery } from '@/hooks';
import { setToken, toLoginRedirectUrl } from '@/utils';
import { OtherLogin } from './components';
const { toLogin, toHome } = useRouterChange();
const { toHome, toCurrentLogin } = useRouterChange();
const { loginRedirectUrl } = useRouteQuery();
const notification = useNotification();

4
src/views/system/login/components/Register/index.vue
View File

@ -20,7 +20,7 @@
<n-space :vertical="true" size="large">
<n-checkbox v-model:checked="agreement">我已经仔细阅读并接受用户协议和隐私政策</n-checkbox>
<n-button type="primary" size="large" :block="true" :round="true" @click="handleSubmit">确定</n-button>
<n-button size="large" :block="true" :round="true" @click="toLogin('pwd-login')">返回</n-button>
<n-button size="large" :block="true" :round="true" @click="toCurrentLogin('pwd-login')">返回</n-button>
</n-space>
</n-form>
</div>
@ -33,7 +33,7 @@ import type { FormInst } from 'naive-ui';
import { useRouterChange, useSmsCode } from '@/hooks';
const message = useMessage();
const { toLogin } = useRouterChange();
const { toCurrentLogin } = useRouterChange();
const { label, isCounting, start } = useSmsCode();
const formRef = ref<(HTMLElement & FormInst) | null>(null);

4
src/views/system/login/components/ResetPwd/index.vue
View File

@ -19,7 +19,7 @@
</n-form-item>
<n-space :vertical="true" size="large">
<n-button type="primary" size="large" :block="true" :round="true" @click="handleSubmit">确定</n-button>
<n-button size="large" :block="true" :round="true" @click="toLogin('pwd-login')">返回</n-button>
<n-button size="large" :block="true" :round="true" @click="toCurrentLogin('pwd-login')">返回</n-button>
</n-space>
</n-form>
</div>
@ -32,7 +32,7 @@ import type { FormInst } from 'naive-ui';
import { useRouterChange, useSmsCode } from '@/hooks';
const message = useMessage();
const { toLogin } = useRouterChange();
const { toCurrentLogin } = useRouterChange();
const { label, isCounting, start } = useSmsCode();
const formRef = ref<(HTMLElement & FormInst) | null>(null);