|
|
@@ -44,23 +44,23 @@
|
|
|
</div>
|
|
|
</el-form-item>
|
|
|
<el-checkbox v-model="loginForm.rememberMe" style="margin: 0 0 25px 0">{{ proxy.$t('login.rememberPassword') }}</el-checkbox>
|
|
|
-<!-- <el-form-item style="float: right">-->
|
|
|
-<!-- <el-button circle :title="proxy.$t('login.social.wechat')" @click="doSocialLogin('wechat')">-->
|
|
|
-<!-- <svg-icon icon-class="wechat" />-->
|
|
|
-<!-- </el-button>-->
|
|
|
-<!-- <el-button circle :title="proxy.$t('login.social.maxkey')" @click="doSocialLogin('maxkey')">-->
|
|
|
-<!-- <svg-icon icon-class="maxkey" />-->
|
|
|
-<!-- </el-button>-->
|
|
|
-<!-- <el-button circle :title="proxy.$t('login.social.topiam')" @click="doSocialLogin('topiam')">-->
|
|
|
-<!-- <svg-icon icon-class="topiam" />-->
|
|
|
-<!-- </el-button>-->
|
|
|
-<!-- <el-button circle :title="proxy.$t('login.social.gitee')" @click="doSocialLogin('gitee')">-->
|
|
|
-<!-- <svg-icon icon-class="gitee" />-->
|
|
|
-<!-- </el-button>-->
|
|
|
-<!-- <el-button circle :title="proxy.$t('login.social.github')" @click="doSocialLogin('github')">-->
|
|
|
-<!-- <svg-icon icon-class="github" />-->
|
|
|
-<!-- </el-button>-->
|
|
|
-<!-- </el-form-item>-->
|
|
|
+ <!-- <el-form-item style="float: right">-->
|
|
|
+ <!-- <el-button circle :title="proxy.$t('login.social.wechat')" @click="doSocialLogin('wechat')">-->
|
|
|
+ <!-- <svg-icon icon-class="wechat" />-->
|
|
|
+ <!-- </el-button>-->
|
|
|
+ <!-- <el-button circle :title="proxy.$t('login.social.maxkey')" @click="doSocialLogin('maxkey')">-->
|
|
|
+ <!-- <svg-icon icon-class="maxkey" />-->
|
|
|
+ <!-- </el-button>-->
|
|
|
+ <!-- <el-button circle :title="proxy.$t('login.social.topiam')" @click="doSocialLogin('topiam')">-->
|
|
|
+ <!-- <svg-icon icon-class="topiam" />-->
|
|
|
+ <!-- </el-button>-->
|
|
|
+ <!-- <el-button circle :title="proxy.$t('login.social.gitee')" @click="doSocialLogin('gitee')">-->
|
|
|
+ <!-- <svg-icon icon-class="gitee" />-->
|
|
|
+ <!-- </el-button>-->
|
|
|
+ <!-- <el-button circle :title="proxy.$t('login.social.github')" @click="doSocialLogin('github')">-->
|
|
|
+ <!-- <svg-icon icon-class="github" />-->
|
|
|
+ <!-- </el-button>-->
|
|
|
+ <!-- </el-form-item>-->
|
|
|
<el-form-item style="width: 100%">
|
|
|
<el-button :loading="loading" size="large" type="primary" style="width: 100%" @click.prevent="handleLogin">
|
|
|
<span v-if="!loading">{{ proxy.$t('login.login') }}</span>
|
|
|
@@ -206,7 +206,9 @@ const initTenantList = async () => {
|
|
|
tenantEnabled.value = data.tenantEnabled === undefined ? true : data.tenantEnabled;
|
|
|
if (tenantEnabled.value) {
|
|
|
tenantList.value = data.voList;
|
|
|
- if (tenantList.value != null && tenantList.value.length !== 0) {
|
|
|
+ // 没有总控中心这一种商户 @author: Huanyi
|
|
|
+ tenantList.value = tenantList.value.filter((e) => e.tenantId !== '000000');
|
|
|
+ if (tenantList.value.length !== 0) {
|
|
|
loginForm.value.tenantId = tenantList.value[0].tenantId;
|
|
|
}
|
|
|
}
|