From b43cbb7afeba7408b52aed2d61e7add743e4ade2 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Sat, 19 Apr 2025 22:00:02 +0800
Subject: [PATCH] no message

---
 .../assets/js/pages/manage/setting/device.vue | 56 ++++++++++---------
 resources/assets/sass/pages/page-setting.scss | 16 ++++++
 2 files changed, 47 insertions(+), 25 deletions(-)

diff --git a/resources/assets/js/pages/manage/setting/device.vue b/resources/assets/js/pages/manage/setting/device.vue
index 582d9ef77..84dc2d9d7 100644
--- a/resources/assets/js/pages/manage/setting/device.vue
+++ b/resources/assets/js/pages/manage/setting/device.vue
@@ -1,31 +1,36 @@
 <template>
     <div class="setting-device">
         <ul>
-            <li v-for="device in devices" :key="device.id">
-                <div class="icon">
-                    <span :class="getIcon(device.detail)"></span>
-                </div>
-                <div class="info">
-                    <div class="title">
-                        <span class="name">{{ getName(device.detail) }}</span>
-                        <span class="device">{{ device.detail.os }}</span>
-                    </div>
-                    <div class="time">
-                        <EPopover placement="bottom-start" trigger="click">
-                            <div class="setting-device-popover">
-                                <p>{{$L('登录时间')}}: {{device.created_at}}</p>
-                                <p>{{$L('更新时间')}}: {{device.updated_at}}</p>
-                                <p>{{$L('过期时间')}}: {{device.expired_at}}</p>
-                            </div>
-                            <span slot="reference">{{ device.updated_at }}</span>
-                        </EPopover>
-                    </div>
-                </div>
-                <div>
-                    <span v-if="device.is_current" class="current">{{$L('当前设备')}}</span>
-                    <Button v-else @click="onLogout(device)">{{$L('退出登录')}}</Button>
-                </div>
+            <li v-if="loadIng > 0 && devices.length === 0" class="loading">
+                <Loading/>
             </li>
+            <template v-else>
+                <li v-for="device in devices" :key="device.id">
+                    <div class="icon">
+                        <span :class="getIcon(device.detail)"></span>
+                    </div>
+                    <div class="info">
+                        <div class="title">
+                            <span class="name">{{ getName(device.detail) }}</span>
+                            <span class="device">{{ device.detail.os }}</span>
+                        </div>
+                        <div class="time">
+                            <EPopover placement="bottom-start" trigger="click">
+                                <div class="setting-device-popover">
+                                    <p>{{$L('登录时间')}}: {{device.created_at}}</p>
+                                    <p>{{$L('更新时间')}}: {{device.updated_at}}</p>
+                                    <p>{{$L('过期时间')}}: {{device.expired_at}}</p>
+                                </div>
+                                <span slot="reference">{{ device.updated_at }}</span>
+                            </EPopover>
+                        </div>
+                    </div>
+                    <div>
+                        <span v-if="device.is_current" class="current">{{$L('当前设备')}}</span>
+                        <Button v-else @click="onLogout(device)">{{$L('退出登录')}}</Button>
+                    </div>
+                </li>
+            </template>
         </ul>
     </div>
 </template>
@@ -54,7 +59,8 @@ export default {
                 if (typeof this.$parent.updateDeviceCount === "function") {
                     this.$parent.updateDeviceCount(this.devices.length);
                 }
-            }).catch(() => {
+            }).catch(({msg}) => {
+                $A.modalError(msg);
                 this.devices = []
             }).finally(() => {
                 this.loadIng--;
diff --git a/resources/assets/sass/pages/page-setting.scss b/resources/assets/sass/pages/page-setting.scss
index e961a18f4..1f6f36391 100755
--- a/resources/assets/sass/pages/page-setting.scss
+++ b/resources/assets/sass/pages/page-setting.scss
@@ -343,6 +343,13 @@
 }
 
 .setting-device {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    overflow: auto;
+
     > ul {
         display: flex;
         flex-direction: column;
@@ -358,6 +365,15 @@
             border-radius: 12px;
             background: rgba(79, 89, 102, .04);
 
+            &.loading {
+                background: transparent;
+
+                .common-loading {
+                    width: 24px;
+                    height: 24px;
+                }
+            }
+
             .icon {
                 align-self: flex-start;
                 display: flex;