From bc76c2de5632fe1433acd92dddc5842b99a06890 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Wed, 03 Nov 2021 20:22:05 +0800
Subject: [PATCH] 解决冲突
---
src/page/login/index.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/page/login/index.vue b/src/page/login/index.vue
index 72d9d71..1c993ff 100644
--- a/src/page/login/index.vue
+++ b/src/page/login/index.vue
@@ -23,11 +23,11 @@
<userLogin></userLogin>
<!-- <codeLogin v-else-if="activeName==='code'"></codeLogin>-->
<!-- <thirdLogin v-else-if="activeName==='third'"></thirdLogin>-->
- <div class="login-menu">
- <!-- <a href="#" @click.stop="activeName='user'">{{ $t('login.userLogin') }}</a>-->
- <a href="#" @click.stop="zShow">{{ $t('login.phoneLogin') }}</a>
- <!-- <a href="#" @click.stop="activeName='third'">{{ $t('login.thirdLogin') }}</a>-->
- </div>
+<!-- <div class="login-menu">-->
+<!-- <!– <a href="#" @click.stop="activeName='user'">{{ $t('login.userLogin') }}</a>–>-->
+<!-- <a href="#" @click.stop="zShow">{{ $t('login.phoneLogin') }}</a>-->
+<!-- <!– <a href="#" @click.stop="activeName='third'">{{ $t('login.thirdLogin') }}</a>–>-->
+<!-- </div>-->
</div>
</div>
--
Gitblit v1.9.3