Merge remote-tracking branch 'origin/master'

康鲁杰

2025-05-30 45b5f1580ef43a8eb881d2e2efe7e8821753f510

 easegen-front/src/views/Login/components/LoginForm.vue

@@ -59,7 +59,7 @@
              </el-checkbox>
            </el-col>
            <el-col :offset="6" :span="12">
              <el-link style="float: right" type="primary">{{ t('login.forgetPassword') }}</el-link>
              <!-- <el-link style="float: right" type="primary">{{ t('login.forgetPassword') }}</el-link> -->
            </el-col>
          </el-row>
        </el-form-item>
@@ -85,13 +85,13 @@
      <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
        <el-form-item>
          <el-row :gutter="5" justify="space-between" style="width: 100%">
            <el-col :span="12">
            <!-- <el-col :span="12">
              <XButton
                :title="t('login.btnMobile')"
                class="w-[100%]"
                @click="setLoginState(LoginStateEnum.MOBILE)"
              />
            </el-col>
            </el-col> -->
<!--            <el-col :span="8">-->
<!--              <XButton-->
<!--                :title="t('login.btnQRCode')"-->
@@ -99,7 +99,7 @@
<!--                @click="setLoginState(LoginStateEnum.QR_CODE)"-->
<!--              />-->
<!--            </el-col>-->
            <el-col :span="12">
            <el-col :span="24">
              <XButton
                :title="t('login.btnRegister')"
                class="w-[100%]"