Merge branch 'master' of https://gitee.com/jyyforjava/hive-app into master

queenwuli

2021-01-06 5579e668ef0d3d923fb76d07b4c93d9c01f29d4a

 hive-app/pages/login/index.vue

@@ -5,7 +5,10 @@
      <view class="status_bar"></view>
      <!-- #endif -->
      <view class="login-header">
         <view class="logo"></view>
         <!-- <view class="logo-wrap"> -->
            <image src="../../static/images/logo.png" mode="widthFix" class="logo"></image>
         <!-- </view> -->
			
         <text>蜂巢美业</text>
      </view>
      <view class="login-box">
@@ -25,9 +28,9 @@
               <text @click="isHidePwd=true" class="iconfont iconyanjing1 gray"></text>
            </view>
         </template>
         <view class="forget-pwd">
         <navigator class="forget-pwd" url="./forgetPassword" hover-class="none">
            <text>忘记密码?</text>
         </view>
         </navigator>
         <button :disabled="isDisabled" class="blue-btn" @click="login">登录</button>
      </view>
   </view>
@@ -114,7 +117,7 @@
      font-size: 20px;
      color: #FFFFFF;
   }
   .logo{
   .logo-wrap{
      display: block;
      width: 72px;
      height: 72px;
@@ -122,6 +125,12 @@
      border-radius: 8px;
      margin: 0 auto 10px;
   }
   .logo{
      width: 72px;
      display: block;
      margin: 0 auto 10px;
      /* height: 72px; */
   }
   .login-box{
      margin: -50px 10px 0;
      padding: 30px 20px;