Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into dev

2025-09-18 17:58:14 +08:00
parent fce9536213 482ce981ce
commit 7689aff790
12 changed files with 1359 additions and 1343 deletions
--- a/packages/effects/common-ui/src/ui/authentication/code-login.vue
+++ b/packages/effects/common-ui/src/ui/authentication/code-login.vue
@@ -115,7 +115,12 @@ defineExpose({
        {{ submitButtonText || $t('common.login') }}
      </slot>
    </VbenButton>
-    <VbenButton v-if="showBack" class="mt-4 w-full" variant="outline" @click="goToLogin()">
+    <VbenButton
+      v-if="showBack"
+      class="mt-4 w-full"
+      variant="outline"
+      @click="goToLogin()"
+    >
      {{ $t('common.back') }}
    </VbenButton>
  </div>
--- a/packages/effects/common-ui/src/ui/authentication/qrcode-login.vue
+++ b/packages/effects/common-ui/src/ui/authentication/qrcode-login.vue
@@ -94,7 +94,12 @@ function goToLogin() {
      </p>
    </div>

-    <VbenButton v-if="showBack" class="mt-4 w-full" variant="outline" @click="goToLogin()">
+    <VbenButton
+      v-if="showBack"
+      class="mt-4 w-full"
+      variant="outline"
+      @click="goToLogin()"
+    >
      {{ $t('common.back') }}
    </VbenButton>
  </div>