mirror of
https://github.com/vbenjs/vue-vben-admin.git
synced 2025-01-24 02:00:25 +08:00
Fix/views login (#2789)
* fix(table): 使用lodash 的merge来递归assign,优化在多对象嵌套情况下的结构 * fix(view): 修复登入页面点击其他登入方式后返回时视图异常的bug
This commit is contained in:
parent
34237ef033
commit
e154d1366c
@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<template v-if="getShow">
|
||||
<div v-if="getShow">
|
||||
<LoginFormTitle class="enter-x" />
|
||||
<Form class="p-4 enter-x" :model="formData" :rules="getFormRules" ref="formRef">
|
||||
<FormItem name="mobile" class="enter-x">
|
||||
@ -28,7 +28,7 @@
|
||||
</Button>
|
||||
</FormItem>
|
||||
</Form>
|
||||
</template>
|
||||
</div>
|
||||
</template>
|
||||
<script lang="ts" setup>
|
||||
import { reactive, ref, computed, unref } from 'vue';
|
||||
|
@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<template v-if="getShow">
|
||||
<div v-if="getShow">
|
||||
<LoginFormTitle class="enter-x" />
|
||||
<div class="enter-x min-w-64 min-h-64">
|
||||
<QrCode
|
||||
@ -12,7 +12,7 @@
|
||||
{{ t('sys.login.backSignIn') }}
|
||||
</Button>
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
</template>
|
||||
<script lang="ts" setup>
|
||||
import { computed, unref } from 'vue';
|
||||
|
@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<template v-if="getShow">
|
||||
<div v-if="getShow">
|
||||
<LoginFormTitle class="enter-x" />
|
||||
<Form class="p-4 enter-x" :model="formData" :rules="getFormRules" ref="formRef">
|
||||
<FormItem name="account" class="enter-x">
|
||||
@ -63,7 +63,7 @@
|
||||
{{ t('sys.login.backSignIn') }}
|
||||
</Button>
|
||||
</Form>
|
||||
</template>
|
||||
</div>
|
||||
</template>
|
||||
<script lang="ts" setup>
|
||||
import { reactive, ref, unref, computed } from 'vue';
|
||||
|
Loading…
Reference in New Issue
Block a user