update loading

public/js/hash

@@ -1 +1 @@
-1068357027585caf
+3815ac139a58e98a

resources/assets/js/components/Loading.vue

@@ -1,8 +1,9 @@
 <template>
     <ETooltip :disabled="windowSmall || content == ''" :content="content">
-        <svg viewBox="25 25 50 50" class="common-loading">
+        <svg v-if="type === 'svg'" viewBox="25 25 50 50" class="common-loading">
             <circle cx="50" cy="50" r="20" fill="none" stroke-width="5" stroke-miterlimit="10" class="common-path"></circle>
         </svg>
+        <div v-else class="common-pureing"></div>
     </ETooltip>
 </template>
 
@@ -10,6 +11,10 @@
     export default {
         name: 'Loading',
         props: {
+            type: {
+                type: String,
+                default: 'svg'
+            },
             content: {
                 type: [String, Number],
                 default: ''

resources/assets/js/pages/manage/components/DialogWrapper.vue

@@ -106,9 +106,7 @@
             @on-emoji="onEmoji"
             @on-show-emoji-user="onShowEmojiUser">
             <template slot="header">
-                <div v-if="(allMsgs.length === 0 && loadMsg) || prevId > 0" class="dialog-item loading">
+                <div v-if="(allMsgs.length === 0 && loadMsg) || prevId > 0" class="dialog-item loading"><Loading type="pure"/></div>
-                    <div class="loading-spinner"></div>
-                </div>
                 <div v-else-if="allMsgs.length === 0" class="dialog-item nothing">{{$L('暂无消息')}}</div>
             </template>
         </VirtualList>

resources/assets/sass/components/loading.scss

@@ -6,22 +6,35 @@
     max-height: 100%;
     margin: auto;
     overflow: hidden;
-    animation: rotate 2s linear infinite;
+    animation: loading-rotate 2s linear infinite;
 
     .common-path {
         fill: none;
         stroke-dasharray: 1, 200;
         stroke-dashoffset: 0;
         stroke-linecap: round;
-        animation: dash 1.5s ease-in-out infinite, color 6s ease-in-out infinite;
+        animation: path-dash 1.5s ease-in-out infinite, path-color 6s ease-in-out infinite;
     }
 }
-@keyframes rotate {
+
+.common-pureing {
+    width: 30px;
+    height: 30px;
+    border: 3px solid #eeeeee;
+    border-bottom-color: $primary-color;
+    border-radius: 50%;
+    display: inline-block;
+    box-sizing: border-box;
+    animation: pureing-rotation 0.75s linear infinite;
+}
+
+@keyframes loading-rotate {
     to {
         transform: rotate(1turn)
     }
 }
-@keyframes dash {
+
+@keyframes path-dash {
     0% {
         stroke-dasharray: 1, 200;
         stroke-dashoffset: 0
@@ -37,7 +50,8 @@
         stroke-dashoffset: -124
     }
 }
-@keyframes color {
+
+@keyframes path-color {
     0%, to {
         stroke: #d62d20
     }
@@ -54,3 +68,12 @@
         stroke: #ffa700
     }
 }
+
+@keyframes pureing-rotation {
+    0% {
+        transform: rotate(0deg);
+    }
+    100% {
+        transform: rotate(360deg);
+    }
+}

resources/assets/sass/pages/components/dialog-wrapper.scss

@@ -920,45 +920,11 @@
                 box-sizing: content-box;
                 justify-content: center;
 
-                .loading-spinner {
+                .common-pureing {
-                    position: relative;
+                    margin: 0;
                     width: 18px;
                     height: 18px;
-                    text-indent: -9999em;
+                    border-width: 2px;
-                    border-radius: 50%;
-                    background: linear-gradient(to right, #ccc 10%, rgba(255, 255, 255, 0) 42%);
-                    animation: spinner-load 1.4s infinite linear;
-                    transform: translateZ(0);
-
-                    @keyframes spinner-load {
-                        0% {transform: rotate(0deg);}
-                        100% {transform: rotate(360deg);}
-                    }
-
-                    &:before {
-                        width: 50%;
-                        height: 50%;
-                        background: #ccc;
-                        border-radius: 100% 0 0 0;
-                        position: absolute;
-                        top: 0;
-                        left: 0;
-                        content: '';
-                    }
-
-                    &:after {
-                        background: #ffffff;
-                        width: 75%;
-                        height: 75%;
-                        border-radius: 50%;
-                        content: '';
-                        margin: auto;
-                        position: absolute;
-                        top: 0;
-                        left: 0;
-                        bottom: 0;
-                        right: 0;
-                    }
                 }
             }