From a580dddd83d41d5349e3626261159bbd6ad0c18d Mon Sep 17 00:00:00 2001
From: nineven <nineven@qq.com>
Date: Tue, 25 Jan 2022 19:29:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8B=E8=BD=BD=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fir_client/src/components/FirDownload.vue   | 21 +++++++++++++++++----
 fir_client/src/components/ShortDownload.vue | 19 +++++++++++++++----
 2 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/fir_client/src/components/FirDownload.vue b/fir_client/src/components/FirDownload.vue
index 4772516..772c9d5 100644
--- a/fir_client/src/components/FirDownload.vue
+++ b/fir_client/src/components/FirDownload.vue
@@ -311,11 +311,14 @@
 
     </el-container>
 
-    <el-container v-else style="margin-top:46%">
-      <div v-if="!report_flag" style="text-align: center;margin:0 auto">
+    <el-container v-else style="text-align: center;margin-top: 60px">
+      <el-header>
+        <img v-if="mcurrentappinfo.icon_url" :src="mcurrentappinfo.icon_url" class="imgloading"/>
+      </el-header>
+      <div v-if="wrong && msg" style="height: 20px;margin-bottom: 10px;"> {{ this.msg }}</div>
+      <div v-if="!report_flag" style="text-align: center;margin:0 auto;height: 100px">
         <span id="qrcode1" style="display: inline-block"></span>
-        <br/>
-        {{ this.currentappinfo.name }}
+        <div style="margin-top: 10px">{{ this.currentappinfo.name }}</div>
       </div>
     </el-container>
 
@@ -929,6 +932,16 @@ export default {
 </script>
 
 <style scoped>
+.imgloading {
+  margin-top: 143px;
+  height: 100px;
+  width: 100px;
+  border-radius: 50%;
+  -webkit-animation: rotate 6s linear infinite;
+  animation: rotate 6s linear infinite;
+  background: 0
+}
+
 .dialog {
   position: fixed;
   width: 390px;
diff --git a/fir_client/src/components/ShortDownload.vue b/fir_client/src/components/ShortDownload.vue
index 8f2787c..3ddedf0 100644
--- a/fir_client/src/components/ShortDownload.vue
+++ b/fir_client/src/components/ShortDownload.vue
@@ -315,13 +315,13 @@
 
     </div>
 
-    <div v-else style="margin-top:46%;text-align:center">
+    <div v-else style="text-align:center">
+      <img v-if="mcurrentappinfo.icon_url" :src="mcurrentappinfo.icon_url" alt="" class="imgloading">
+      <div v-if="wrong && msg" style="height: 20px;margin-bottom: 10px;"> {{ this.msg }}</div>
       <div v-if="!report_flag && !iserror" style="margin:0 auto;z-index: 10">
         <span id="qrcode1" style="display: inline-block"></span>
-        <br/>
-        {{ this.currentappinfo.name }}
+        <div style="margin-top: 10px">{{ this.currentappinfo.name }}</div>
       </div>
-
     </div>
     <div v-if='iserror' class="main">
       <div class="error-container">
@@ -890,6 +890,17 @@ export default {
 </script>
 
 <style scoped>
+
+.imgloading {
+  height: 100px;
+  width: 100px;
+  border-radius: 50%;
+  margin: 10px 0 20px;
+  -webkit-animation: rotate 6s linear infinite;
+  animation: rotate 6s linear infinite;
+  background: 0
+}
+
 .dialog {
   position: fixed;
   width: 390px;