Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue

liuyg

2021-04-10 5e92639b063edcab154a235df05e1ddeaa839de6

 src/page/login/index.vue

@@ -3,32 +3,36 @@
       @keyup.enter.native="handleLogin">
    <top-color v-show="false"></top-color>
    <div class="login-weaper animated bounceInDown">
      <div class="login-left">
        <div class="login-time">
          {{time}}
        </div>
        <img class="img" src="/img/1.jpg" alt="">
        <p class="title">{{ $t('login.info') }}</p>
      </div>
      <!--      <div class="login-left">-->
      <!--        <div class="login-time">-->
      <!--          {{time}}-->
      <!--        </div>-->
      <!--        <img class="img" src="/img/1.jpg" alt="">-->
      <!--        <p class="title">{{ $t('login.info') }}</p>-->
      <!--      </div>-->

      <img src="/img/bg/bgzs.png" alt="" class="login-lefts">

      <div class="login-border">
        <div class="login-main">
          <h4 class="login-title">
            {{ $t('login.title') }}
<!--            <top-lang></top-lang>-->
            <!--            <top-lang></top-lang>-->
          </h4>
          <h4 class="login-title-child">IoT security cloud service platform</h4>
          <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>-->
            &lt;!&ndash;<a href="#"  @click.stop="zShow">{{ $t('login.phoneLogin') }}</a>&ndash;&gt;
            <a href="#" @click.stop="zShow">{{ $t('login.phoneLogin') }}</a>
            <!--   <a href="#" @click.stop="activeName='third'">{{ $t('login.thirdLogin') }}</a>-->
          </div>
        </div>

      </div>
    </div>
    <div class="z" v-show="activeName == 'code'" >
    <div class="z" v-show="activeName == 'code'">
      <codeLogin></codeLogin>
    </div>

@@ -125,7 +129,7 @@
</script>

<style lang="scss">
  .z{
  .z {
    position: fixed;
    margin: auto;
    padding: 10px;
@@ -137,8 +141,9 @@
    height: 500px;
    background-color: #fff;
    box-sizing: border-box;
    box-shadow:6px 6px 5px #909090;
    box-shadow: 6px 6px 5px #909090;
  }

  .company-jx {
    position: fixed;
    margin: auto;
@@ -147,8 +152,9 @@
    right: 0px;
    bottom: 120px;
    text-align: center;
    color: #fff;  
    color: #fff;
    font-size: 15px;
  }

  @import "@/styles/login.scss";
</style>