From e154d1366cfa9f605f20e817807ba96a048eceda Mon Sep 17 00:00:00 2001
From: HUCHAOQI <hyperq1g@gmail.com>
Date: Mon, 22 May 2023 10:10:37 +0800
Subject: [PATCH] Fix/views login (#2789)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

* fix(view): 修复登入页面点击其他登入方式后返回时视图异常的bug
---
 src/views/sys/login/MobileForm.vue   | 4 ++--
 src/views/sys/login/QrCodeForm.vue   | 4 ++--
 src/views/sys/login/RegisterForm.vue | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/sys/login/MobileForm.vue b/src/views/sys/login/MobileForm.vue
index 88b9f82e5..e34bf1d30 100644
--- a/src/views/sys/login/MobileForm.vue
+++ b/src/views/sys/login/MobileForm.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="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';
diff --git a/src/views/sys/login/QrCodeForm.vue b/src/views/sys/login/QrCodeForm.vue
index 7c2ec57d0..cbe29d7cf 100644
--- a/src/views/sys/login/QrCodeForm.vue
+++ b/src/views/sys/login/QrCodeForm.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';
diff --git a/src/views/sys/login/RegisterForm.vue b/src/views/sys/login/RegisterForm.vue
index e70917e48..a386cbe95 100644
--- a/src/views/sys/login/RegisterForm.vue
+++ b/src/views/sys/login/RegisterForm.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';