From 74127bac080dd38eb040b7b8b15490197683896e Mon Sep 17 00:00:00 2001
From: youngS <ly_1301b@163.com>
Date: Thu, 18 Mar 2021 15:58:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8B=E8=BD=BD=E9=A1=B5?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fir_client/src/components/FirDownload.vue   | 26 +++++++++++++++------
 fir_client/src/components/ShortDownload.vue | 26 ++++++++++++++++-----
 2 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/fir_client/src/components/FirDownload.vue b/fir_client/src/components/FirDownload.vue
index d5615bf..ccaccfa 100644
--- a/fir_client/src/components/FirDownload.vue
+++ b/fir_client/src/components/FirDownload.vue
@@ -93,7 +93,7 @@
                                             </div>
                                         </div>
 
-                                        <div v-else>
+                                        <div v-else style="margin-top: 10%;margin-bottom: 10%">
                                             <div v-if="currentappinfo.need_password" style="margin:0 auto; width:166px">
                                                 <el-input prefix-icon="el-icon-lock" clearable
                                                           placeholder="请输入密码" v-model="password"
@@ -109,7 +109,7 @@
                                             </button>
                                             <a v-if="currentappinfo.issupersign && !$route.query.udid"
                                                @click="jiaocheng('open')"
-                                               style="float: right;width: 30px;height: 30px;text-align: center;border-radius: 15px;background-color:#32b2a7;color: white;font-size: 20px">?</a>
+                                               class="jiaocheng" style="color: white;font-size: 20px;">?</a>
                                         </div>
 
                                     </div>
@@ -120,7 +120,6 @@
                         </div>
                     </div>
                 </header>
-
                 <div class="per-type-info section" v-if="currentappinfo.app_id && agent === ''">
                     <div class="type" v-if="miscomboappinfo.release_id">
                         <div class="info">
@@ -183,7 +182,7 @@
                 </div>
 
 
-                <div class="screenshots-section" v-if="imagelist && imagelist.length > 0">
+                <div class="screenshots-section" v-if="imagelist && imagelist.length > 0" style="margin-top: 30%">
                     <el-divider></el-divider>
                     <div v-if="miscomboappinfo.release_id">
                         <h3 v-if="currentappinfo.type === 0">
@@ -205,7 +204,7 @@
 
                 </div>
 
-                <div class="footer" style="margin-top: 20px;background-color: #d1eef9">
+                <div class="footer" style="margin-top: 30%;background-color: #d1eef9">
                     免责声明：<br>
                     本网站仅提供下载托管，应用为用户自行上传，请甄别应用风险后进行下载！
                 </div>
@@ -372,12 +371,14 @@
                                 window.location.href = this.downloadurl;
                             } else {
                                 this.isdownload = false;
-                                this.password = '';
                                 this.$message({
                                     message: "密码错误，或者下载链接失效",
                                     type: 'error',
                                 });
-                                window.location.reload();
+                                if (!this.password) {
+                                    window.location.reload();
+                                }
+                                this.password = '';
                             }
                         }, {
                             'data': {
@@ -629,6 +630,17 @@
         color: #505556
     }
 
+    .jiaocheng {
+        float: right;
+        width: 30px;
+        height: 30px;
+        text-align: center;
+        border-radius: 15px;
+        background-color: #32b2a7;
+        margin-right: -30px;
+        margin-top: 7px;
+    }
+
     .wechat_tip, .wechat_tip > i {
         position: absolute;
         right: 10px
diff --git a/fir_client/src/components/ShortDownload.vue b/fir_client/src/components/ShortDownload.vue
index 34d88d5..5894f1e 100644
--- a/fir_client/src/components/ShortDownload.vue
+++ b/fir_client/src/components/ShortDownload.vue
@@ -114,7 +114,7 @@
                                             </div>
                                         </div>
 
-                                        <div v-else>
+                                        <div v-else style="margin-top: 10%;margin-bottom: 10%">
                                             <div v-if="currentappinfo.need_password" style="margin:0 auto; width:166px">
                                                 <input class="passwd" placeholder="请输入密码" v-model="password"/>
                                             </div>
@@ -122,9 +122,9 @@
                                             <button @click="download">
                                                 <a icon="el-icon-loadings" type="primary" :underline="false"> 下载安装 </a>
                                             </button>
-                                            <a v-if="currentappinfo.issupersign && ! $route.query.udid"
+                                            <a v-if="currentappinfo.issupersign && !$route.query.udid"
                                                @click="jiaocheng('open')"
-                                               style="float: right;width: 30px;height: 30px;text-align: center;border-radius: 15px;background-color:#32b2a7;color: white;font-size: 20px">?</a>
+                                               class="jiaocheng" style="color: white;font-size: 20px;">?</a>
                                         </div>
 
                                     </div>
@@ -196,7 +196,7 @@
                     </div>
 
                 </div>
-                <div class="screenshots-section" v-if="imagelist && imagelist.length > 0">
+                <div class="screenshots-section" v-if="imagelist && imagelist.length > 0" style="margin-top: 30%">
                     <br/>
                     <div v-if="miscomboappinfo.release_id">
                         <h3 v-if="currentappinfo.type === 0">
@@ -216,7 +216,7 @@
                     </div>
 
                 </div>
-                <div class="footer" style="margin-top: 20px;background-color: #d1eef9">
+                <div class="footer" style="margin-top: 30%;background-color: #d1eef9">
                     免责声明：<br>
                     本网站仅提供下载托管，应用为用户自行上传，请甄别应用风险后进行下载！
                 </div>
@@ -365,7 +365,10 @@
                             } else {
                                 this.isdownload = false;
                                 alert("密码错误，或者下载链接失效");
-                                window.location.reload();
+                                if (!this.password) {
+                                    window.location.reload();
+                                }
+                                this.password = '';
                             }
                         }, {
                             'data': {
@@ -609,6 +612,17 @@
         color: #505556
     }
 
+    .jiaocheng {
+        float: right;
+        width: 30px;
+        height: 30px;
+        text-align: center;
+        border-radius: 15px;
+        background-color: #32b2a7;
+        margin-right: -30px;
+        margin-top: 7px;
+    }
+
     .wechat_tip, .wechat_tip > i {
         position: absolute;
         right: 10px