【新增】登录界面新增租户支持配置

_web/src/api/modular/system/loginManage.js

@@ -49,6 +49,20 @@ export function getLoginUser (parameter) {
  })
}
/**
 * 获取租户开关
 *
 * @author yubaoshan
 * @date 2020/9/5 1:24
 */
export function getTenantOpen (parameter) {
  return axios({
    url: '/getTenantOpen',
    method: 'get',
    params: parameter
  })
}
/**
 * 获取用户头像
 *

_web/src/views/userLoginReg/Login.vue

@@ -14,6 +14,16 @@
      >
        <a-tab-pane key="tab1" tab="账号密码登录">
          <a-alert v-if="isLoginError" type="error" showIcon style="margin-bottom: 24px;" :message="this.accountLoginErrMsg" />
          <a-form-item v-if="tenantOpen">
            <a-select style="width: 100%"
                      size="large"
                      placeholder="请选择租户"
                      v-decorator="['tenantCode', {rules: [{ required: true, message: '请选择租户！' }]}]" >
              <a-select-option v-for='(item,index) in tenantsList' :key="index" :value="item.code" >{{item.name}}</a-select-option>
            </a-select>
          </a-form-item>
          <a-form-item>
            <a-input
              size="large"
@@ -45,6 +55,14 @@
        </a-tab-pane>
        <a-tab-pane key="tab2" tab="手机号登录">
          <a-alert v-if="isLoginError" type="error" showIcon style="margin-bottom: 24px;" :message="this.accountLoginErrMsg" />
          <a-form-item v-if="tenantOpen">
            <a-select style="width: 100%"
                      size="large"
                      placeholder="请选择租户"
                      v-decorator="['tenantCode', {rules: [{ required: true, message: '请选择租户！' }]}]" >
              <a-select-option v-for='(item,index) in tenantsList' :key="index" :value="item.code" >{{item.name}}</a-select-option>
            </a-select>
          </a-form-item>
          <a-form-item>
            <a-input size="large" type="text" placeholder="手机号" v-decorator="['mobile', {rules: [{ required: true, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号' }], validateTrigger: 'change'}]">
              <a-icon slot="prefix" type="mobile" :style="{ color: 'rgba(0,0,0,.25)' }"/>
@@ -117,201 +135,225 @@
</template>
<script>
import md5 from 'md5'
import TwoStepCaptcha from '@/components/tools/TwoStepCaptcha'
import { mapActions } from 'vuex'
import { timeFix } from '@/utils/util'
import { getSmsCaptcha, twoStepCode } from '@/api/modular/system/loginManage'
  import TwoStepCaptcha from '@/components/tools/TwoStepCaptcha'
  import { mapActions } from 'vuex'
  import { timeFix } from '@/utils/util'
  import { tenantListTenants } from '@/api/modular/tenant/tenantManage'
  import { getTenantOpen,getSmsCaptcha, twoStepCode } from '@/api/modular/system/loginManage'
export default {
  components: {
    TwoStepCaptcha
  },
  data () {
    return {
      customActiveKey: 'tab1',
      loginBtn: false,
      // login type: 0 email, 1 username, 2 telephone
      loginType: 0,
      isLoginError: false,
      requiredTwoStepCaptcha: false,
      stepCaptchaVisible: false,
      form: this.$form.createForm(this),
      state: {
        time: 60,
  export default {
    components: {
      TwoStepCaptcha
    },
    data () {
      return {
        customActiveKey: 'tab1',
        loginBtn: false,
        // login type: 0 email, 1 username, 2 telephone
        loginType: 0,
        smsSendBtn: false
      },
      accountLoginErrMsg:''
    }
  },
  created () {
    twoStepCode({ })
      .then(res => {
        this.requiredTwoStepCaptcha = res.result.stepCode
      })
      .catch(() => {
        this.requiredTwoStepCaptcha = false
      })
    // this.requiredTwoStepCaptcha = true
  },
  methods: {
    ...mapActions(['Login', 'Logout']),
    // handler
    handleUsernameOrEmail (rule, value, callback) {
      const { state } = this
      const regex = /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+((\.[a-zA-Z0-9_-]{2,3}){1,2})$/
      if (regex.test(value)) {
        state.loginType = 0
      } else {
        state.loginType = 1
        isLoginError: false,
        requiredTwoStepCaptcha: false,
        stepCaptchaVisible: false,
        form: this.$form.createForm(this),
        state: {
          time: 60,
          loginBtn: false,
          // login type: 0 email, 1 username, 2 telephone
          loginType: 0,
          smsSendBtn: false
        },
        accountLoginErrMsg:'',
        tenantOpen: false,
        tenantsList: []
      }
      callback()
    },
    handleTabClick (key) {
      this.isLoginError = false
      this.customActiveKey = key
      // this.form.resetFields()
    },
    handleSubmit (e) {
      e.preventDefault()
      const {
        form: { validateFields },
        state,
        customActiveKey,
        Login
      } = this
    created () {
      twoStepCode({ })
        .then(res => {
          this.requiredTwoStepCaptcha = res.result.stepCode
        })
        .catch(() => {
          this.requiredTwoStepCaptcha = false
        })
      // this.requiredTwoStepCaptcha = true
      this.getTenantOpen()
      state.loginBtn = true
    },
    methods: {
      ...mapActions(['Login', 'Logout']),
      /**
       * 获取租户开关并取得租户列表
       */
      getTenantOpen(){
        getTenantOpen().then((res)=>{
          if(res.success){
            this.tenantOpen = res.data
            if(res.data){
              tenantListTenants().then((res)=>{
                this.tenantsList = res.data
              })
            }
          }
        })
      },
      // handler
      handleUsernameOrEmail (rule, value, callback) {
        const { state } = this
        const regex = /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+((\.[a-zA-Z0-9_-]{2,3}){1,2})$/
        if (regex.test(value)) {
          state.loginType = 0
        } else {
          state.loginType = 1
        }
        callback()
      },
      handleTabClick (key) {
        this.isLoginError = false
        this.customActiveKey = key
        // this.form.resetFields()
      },
      handleSubmit (e) {
        e.preventDefault()
        const {
          form: { validateFields },
          state,
          customActiveKey,
          Login
        } = this
      const validateFieldsKey = customActiveKey === 'tab1' ? ['account', 'password'] : ['mobile', 'captcha']
        state.loginBtn = true
      validateFields(validateFieldsKey, { force: true }, (err, values) => {
        if (!err) {
          const loginParams = { ...values }
          delete loginParams.account
          loginParams[!state.loginType ? 'email' : 'account'] = values.account
          loginParams.password = values.password//md5(values.password)
          Login(loginParams)
            .then((res) => this.loginSuccess(res))
            .catch(err => this.requestFailed(err))
            .finally(() => {
              state.loginBtn = false
            })
        } else {
          setTimeout(() => {
            state.loginBtn = false
          }, 600)
        const validateFieldsKey = customActiveKey === 'tab1' ? ['account', 'password'] : ['mobile', 'captcha']
        if(this.tenantOpen){
          validateFieldsKey.push('tenantCode')
        }
      })
    },
    getCaptcha (e) {
      e.preventDefault()
      const { form: { validateFields }, state } = this
        validateFields(validateFieldsKey, { force: true }, (err, values) => {
          if (!err) {
            const loginParams = { ...values }
            delete loginParams.account
            loginParams[!state.loginType ? 'email' : 'account'] = values.account
            loginParams.password = values.password
            if(this.tenantOpen){
              loginParams.tenantCode = values.tenantCode
            }
            Login(loginParams)
              .then((res) => this.loginSuccess(res))
              .catch(err => this.requestFailed(err))
              .finally(() => {
                state.loginBtn = false
              })
          } else {
            setTimeout(() => {
              state.loginBtn = false
            }, 600)
          }
        })
      },
      getCaptcha (e) {
        e.preventDefault()
        const { form: { validateFields }, state } = this
        validateFields(['mobile'], { force: true }, (err, values) => {
          if (!err) {
            state.smsSendBtn = true
      validateFields(['mobile'], { force: true }, (err, values) => {
        if (!err) {
          state.smsSendBtn = true
            const interval = window.setInterval(() => {
              if (state.time-- <= 0) {
                state.time = 60
                state.smsSendBtn = false
                window.clearInterval(interval)
              }
            }, 1000)
          const interval = window.setInterval(() => {
            if (state.time-- <= 0) {
            const hide = this.$message.loading('验证码发送中..', 0)
            getSmsCaptcha({ mobile: values.mobile }).then(res => {
              setTimeout(hide, 2500)
              this.$notification['success']({
                message: '提示',
                description: '验证码获取成功，您的验证码为：' + res.result.captcha,
                duration: 8
              })
            }).catch(err => {
              setTimeout(hide, 1)
              clearInterval(interval)
              state.time = 60
              state.smsSendBtn = false
              window.clearInterval(interval)
            }
          }, 1000)
          const hide = this.$message.loading('验证码发送中..', 0)
          getSmsCaptcha({ mobile: values.mobile }).then(res => {
            setTimeout(hide, 2500)
            this.$notification['success']({
              message: '提示',
              description: '验证码获取成功，您的验证码为：' + res.result.captcha,
              duration: 8
              this.requestFailed(err)
            })
          }).catch(err => {
            setTimeout(hide, 1)
            clearInterval(interval)
            state.time = 60
            state.smsSendBtn = false
            this.requestFailed(err)
          })
        }
      })
    },
    stepCaptchaSuccess () {
      this.loginSuccess()
    },
    stepCaptchaCancel () {
      this.Logout().then(() => {
        this.loginBtn = false
        this.stepCaptchaVisible = false
      })
    },
    loginSuccess (res) {
      this.$router.push({ path: '/' })
      this.isLoginError = false
    },
    requestFailed (err) {
      this.accountLoginErrMsg = err
      this.isLoginError = true
      //提示框方式去掉
      /*this.$notification['error']({
        message: '错误',
        description: err,//((err.response || {}).data || {}).message || '请求出现错误，请稍后再试',
        duration: 4
      })*/
          }
        })
      },
      stepCaptchaSuccess () {
        this.loginSuccess()
      },
      stepCaptchaCancel () {
        this.Logout().then(() => {
          this.loginBtn = false
          this.stepCaptchaVisible = false
        })
      },
      loginSuccess (res) {
        this.$router.push({ path: '/' })
        this.isLoginError = false
      },
      requestFailed (err) {
        this.accountLoginErrMsg = err
        this.isLoginError = true
        //提示框方式去掉
        /*this.$notification['error']({
          message: '错误',
          description: err,//((err.response || {}).data || {}).message || '请求出现错误，请稍后再试',
          duration: 4
        })*/
      }
    }
  }
}
</script>
<style lang="less" scoped>
.user-layout-login {
  label {
    font-size: 14px;
  }
  .user-layout-login {
    label {
      font-size: 14px;
    }
  .getCaptcha {
    display: block;
    width: 100%;
    height: 40px;
  }
    .getCaptcha {
      display: block;
      width: 100%;
      height: 40px;
    }
  .forge-password {
    font-size: 14px;
  }
    .forge-password {
      font-size: 14px;
    }
  button.login-button {
    padding: 0 15px;
    font-size: 16px;
    height: 40px;
    width: 100%;
  }
    button.login-button {
      padding: 0 15px;
      font-size: 16px;
      height: 40px;
      width: 100%;
    }
  .user-login-other {
    text-align: left;
    margin-top: 24px;
    line-height: 22px;
    .user-login-other {
      text-align: left;
      margin-top: 24px;
      line-height: 22px;
    .item-icon {
      font-size: 24px;
      color: rgba(0, 0, 0, 0.2);
      margin-left: 16px;
      vertical-align: middle;
      cursor: pointer;
      transition: color 0.3s;
      .item-icon {
        font-size: 24px;
        color: rgba(0, 0, 0, 0.2);
        margin-left: 16px;
        vertical-align: middle;
        cursor: pointer;
        transition: color 0.3s;
      &:hover {
        color: #1890ff;
        &:hover {
          color: #1890ff;
        }
      }
    }
    .register {
      float: right;
      .register {
        float: right;
      }
    }
  }
}
</style>