Merge remote-tracking branch 'origin/master'

doum

2025-10-23 ace847c89da4a0a772aa513b4343d8fc54a0adc9

 admin/src/views/login.vue

@@ -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
        })
@@ -174,7 +177,7 @@
      }
      sendSmsPost({ phone, type: 0 }).then(res => {
        Message.success('短信发送成功')
        this.downTime = 10
        this.downTime = 60
        let timer = setInterval(() => {
          if (this.downTime == 0) {
            return clearInterval(timer)
@@ -266,7 +269,8 @@
      background-size: 100% 100%;
      padding-left: 40px;
      padding-top: 60px;
      .h2{

      .h2 {
        color: $primary-color;
        background-color: #fff;
        height: 24px;
@@ -278,6 +282,7 @@
        display: flex;
        margin-bottom: 12px;
      }

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