From 52ed3e076a514a8769a8feb31722f89df73d4b97 Mon Sep 17 00:00:00 2001
From: zhengkunwang223 <zhengkun@fit2cloud.com>
Date: Wed, 8 Mar 2023 15:35:01 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=BD=91=E7=AB=99=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=81=AE=E7=BD=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/website/ssl/acme-account/create/index.vue |  2 +-
 frontend/src/views/website/website/index.vue        | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/frontend/src/views/website/ssl/acme-account/create/index.vue b/frontend/src/views/website/ssl/acme-account/create/index.vue
index b006671ba..6a2fa0b62 100644
--- a/frontend/src/views/website/ssl/acme-account/create/index.vue
+++ b/frontend/src/views/website/ssl/acme-account/create/index.vue
@@ -9,7 +9,7 @@
     >
         <el-row v-loading="loading">
             <el-col :span="22" :offset="1">
-                <el-form ref="accountForm" label-position="top" :model="account" :rules="rules" v-loading="loading">
+                <el-form ref="accountForm" label-position="top" :model="account" :rules="rules">
                     <el-form-item :label="$t('website.email')" prop="email">
                         <el-input v-model.trim="account.email"></el-input>
                     </el-form-item>
diff --git a/frontend/src/views/website/website/index.vue b/frontend/src/views/website/website/index.vue
index 75af7de96..fa7354851 100644
--- a/frontend/src/views/website/website/index.vue
+++ b/frontend/src/views/website/website/index.vue
@@ -219,10 +219,15 @@ let req = reactive({
 const search = async () => {
     req.page = paginationConfig.currentPage;
     req.pageSize = paginationConfig.pageSize;
-    SearchWebsites(req).then((res) => {
-        data.value = res.data.items;
-        paginationConfig.total = res.data.total;
-    });
+    loading.value = true;
+    await SearchWebsites(req)
+        .then((res) => {
+            data.value = res.data.items;
+            paginationConfig.total = res.data.total;
+        })
+        .finally(() => {
+            loading.value = false;
+        });
 };
 
 const listGroup = async () => {