Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

doum

2 天以前 dd6a43fdbadaaf6d646b3eb2ca0a63f58ed77ea4

 admin/src/views/login.vue

@@ -3,7 +3,7 @@
    <img src="@/assets/images/bg@2x.png" class="main_bg" alt="">
    <div class="login_wrap">
      <div class="login_img">
        <div class="h2">安徽安泰物流有限责任公司</div>
        <div class="h2">芜湖烟草智慧安消安全防范系统</div>
        <div class="h3">智慧物流园区安消一体化系统</div>
      </div>
      <div class="form_wrap">
@@ -115,11 +115,11 @@
      if (this.loading) {
        return
      }
      this.loading = true
      if (this.activeTab == 0) {
        if (!this.__check()) {
          return
        }
        this.loading = true
        loginByPassword({
          username: this.username.trim(),
          password: this.password,
@@ -154,12 +154,15 @@
        if (!smsCode) {
          return Message.error('请输入验证码')
        }
        this.loading = true
        loginByPhone({ phone, code: smsCode }).then(res => {
          if (this.isRemPsd) {
            localStorage.setItem('phone', this.username.trim())
          }
          Cookies.set('dm_user_token', res)
          this.$router.push('index')
        }).catch(e => {
          this.refreshCaptcha()
        }).finally(() => {
          this.loading = false
        })
@@ -266,7 +269,8 @@
      background-size: 100% 100%;
      padding-left: 40px;
      padding-top: 60px;
      .h2{

      .h2 {
        color: $primary-color;
        background-color: #fff;
        height: 24px;
@@ -274,10 +278,11 @@
        align-items: center;
        justify-content: center;
        border-radius: 4px;
        width: 186px;
        width: 208px;
        display: flex;
        margin-bottom: 12px;
      }

      .h3 {
        font-size: 28px;
        font-weight: 700;