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

rk

22 小时以前 609a1931953b2298016bd2b0d6b410666b5ad7b9

 admin/src/views/login.vue

@@ -73,12 +73,10 @@
        code: this.captcha.value.trim(),
        uuid: this.captcha.uuid
      })
        .then(() => {
          window.location.href = process.env.VUE_APP_CONTEXT_PATH
        })
        .catch(e => {
          this.refreshCaptcha()
          this.$tip.apiFailed(e)
        .then((res) => {
          if (res) {
            window.location.href = process.env.VUE_APP_CONTEXT_PATH
          }
        })
        .finally(() => {
          this.loading = false