解决冲突

liuyg

2021-11-03 bc76c2de5632fe1433acd92dddc5842b99a06890

 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">-->
<!--            &lt;!&ndash;    <a href="#" @click.stop="activeName='user'">{{ $t('login.userLogin') }}</a>&ndash;&gt;-->
<!--            <a href="#" @click.stop="zShow">{{ $t('login.phoneLogin') }}</a>-->
<!--            &lt;!&ndash;   <a href="#" @click.stop="activeName='third'">{{ $t('login.thirdLogin') }}</a>&ndash;&gt;-->
<!--          </div>-->
        </div>

      </div>