canrd-outside / order-erp-front · Commits

Commit e154d1366cfa9f605f20e817807ba96a048eceda

Authored by HUCHAOQI
Committed by GitHub
1 parent 34237ef0

Fix/views login (#2789) 

* fix(table): 使用lodash 的merge来递归assign,优化在多对象嵌套情况下的结构

* fix(view): 修复登入页面点击其他登入方式后返回时视图异常的bug
Inline Side-by-side
Showing 3 changed files with 6 additions and 6 deletions
src/views/sys/login/MobileForm.vue
  View file @e154d13
1 1 <template>
2   - <template v-if="getShow">
  2 + <div v-if="getShow">
3 3 <LoginFormTitle class="enter-x" />
4 4 <Form class="p-4 enter-x" :model="formData" :rules="getFormRules" ref="formRef">
5 5 <FormItem name="mobile" class="enter-x">
... ... @@ -28,7 +28,7 @@
28 28 </Button>
29 29 </FormItem>
30 30 </Form>
31   - </template>
  31 + </div>
32 32 </template>
33 33 <script lang="ts" setup>
34 34 import { reactive, ref, computed, unref } from 'vue';
... ...
src/views/sys/login/QrCodeForm.vue
  View file @e154d13
1 1 <template>
2   - <template v-if="getShow">
  2 + <div v-if="getShow">
3 3 <LoginFormTitle class="enter-x" />
4 4 <div class="enter-x min-w-64 min-h-64">
5 5 <QrCode
... ... @@ -12,7 +12,7 @@
12 12 {{ t('sys.login.backSignIn') }}
13 13 </Button>
14 14 </div>
15   - </template>
  15 + </div>
16 16 </template>
17 17 <script lang="ts" setup>
18 18 import { computed, unref } from 'vue';
... ...
src/views/sys/login/RegisterForm.vue
  View file @e154d13
1 1 <template>
2   - <template v-if="getShow">
  2 + <div v-if="getShow">
3 3 <LoginFormTitle class="enter-x" />
4 4 <Form class="p-4 enter-x" :model="formData" :rules="getFormRules" ref="formRef">
5 5 <FormItem name="account" class="enter-x">
... ... @@ -63,7 +63,7 @@
63 63 {{ t('sys.login.backSignIn') }}
64 64 </Button>
65 65 </Form>
66   - </template>
  66 + </div>
67 67 </template>
68 68 <script lang="ts" setup>
69 69 import { reactive, ref, unref, computed } from 'vue';
... ...