From 372455bcb372b7fddad501af185dd444b1dadb80 Mon Sep 17 00:00:00 2001
From: youngS <ly_1301b@163.com>
Date: Wed, 10 Nov 2021 13:28:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E9=A1=B5=E4=B8=BE=E6=8A=A5?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fir_client/src/components/FirDownload.vue   | 46 +++++++++++++++++----
 fir_client/src/components/ShortDownload.vue | 33 +++++++++++----
 2 files changed, 64 insertions(+), 15 deletions(-)

diff --git a/fir_client/src/components/FirDownload.vue b/fir_client/src/components/FirDownload.vue
index d5f96e2..73a632b 100644
--- a/fir_client/src/components/FirDownload.vue
+++ b/fir_client/src/components/FirDownload.vue
@@ -2,7 +2,7 @@
   <el-container class="container">
     <meta content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0" name="viewport">
 
-    <el-main v-if="report_flag" style="margin-top: -60px">
+    <el-main v-if="report_flag" class="dialog" style="margin-top: -60px">
       <a style="color: #3888fa" @click="report_flag=false">&lt;&nbsp;返回下载页</a>
       <el-header style="text-align: center;height: 20px;margin-top: 10px">举报详情</el-header>
 
@@ -288,16 +288,15 @@
           <el-link :underline="false" type="warning">若安装异常，请复制UDID，发送给管理员</el-link>
         </div>
 
-        <div class="footer" style="margin-top: 30%;margin-bottom: 8px">
+        <div class="footer" style="margin-top: 30%;padding-bottom: 10px">
           免责声明：<br>
           本网站仅提供下载托管，应用为用户自行上传，请甄别应用风险后进行下载！<a class="one-key-report"
                                                @click="get_auth_code(),report_flag=true">举报</a>
 
         </div>
-        <div v-if="agent!==''">
-          <div v-if="ad_info.ad_uri" style="margin-bottom: 80px"/>
-          <div v-if="ad_info.ad_uri" class="app_bottom_fixed">
-            <div class="signhelp-title">
+        <div v-if="agent!=='' && ad_info.ad_uri" style="padding-bottom: 80px">
+          <div class="app_bottom_fixed" >
+            <div class="ad_title">
               <span><a class="closead" @click="ad_info.ad_uri=undefined">关闭</a></span>
             </div>
             <a :href="ad_info.ad_uri" target="_blank">
@@ -305,6 +304,8 @@
             </a>
           </div>
         </div>
+        <div v-else style="padding-bottom: 10px"></div>
+
 
       </div>
 
@@ -925,6 +926,17 @@ export default {
 </script>
 
 <style scoped>
+.dialog {
+  position: fixed;
+  width: 390px;
+  background-color: #fff;
+  left: 50%;
+  top: 50%;
+  padding: 20px;
+  box-shadow: 0 0 5px rgba(0, 0, 0, .5);
+  transform: translate(-50%, -50%)
+}
+
 .one-key-report {
   color: #fff;
   background-color: #32B2A7;
@@ -1447,6 +1459,18 @@ button:focus {
   .main > header .scan-tips {
     display: none
   }
+  .dialog {
+    height: 100%;
+    width: 100%;
+    margin: 0;
+    left: 0;
+    top: 60px;
+    bottom: 0;
+    border-radius: 0;
+    padding-top: 30px;
+    overflow-y: auto;
+    transform: translate(0, 0)
+  }
 }
 
 
@@ -1767,7 +1791,7 @@ body.hidden-overflow {
   cursor: move;
 }
 
-.signhelp-title span a {
+.signhelp-title span a,.ad_title span a {
   text-decoration: none;
   border: 1px solid gray;
   font-size: 12px;
@@ -1785,4 +1809,12 @@ body.hidden-overflow {
   top: 38px;
   right: -6px;
 }
+
+.ad_title .closead {
+  right: -6px;
+}
+.ad_title span a{
+  line-height: 40px;
+  margin-bottom: 20px;
+}
 </style>
diff --git a/fir_client/src/components/ShortDownload.vue b/fir_client/src/components/ShortDownload.vue
index 2193001..2d7c767 100644
--- a/fir_client/src/components/ShortDownload.vue
+++ b/fir_client/src/components/ShortDownload.vue
@@ -294,15 +294,14 @@
           <span style="color: #ebb563">若安装异常，请复制UDID，发送给管理员</span>
         </div>
 
-        <div class="footer" style="margin-top: 30%;margin-bottom: 8px">
+        <div class="footer" style="margin-top: 30%;padding-bottom: 10px">
           免责声明：<br>
           本网站仅提供下载托管，应用为用户自行上传，请甄别应用风险后进行下载！<a class="one-key-report"
                                                @click="get_auth_code(),report_flag=true">举报</a>
         </div>
-        <div v-if="agent!==''">
-          <div v-if="ad_info.ad_uri" style="margin-bottom: 80px"/>
-          <div v-if="ad_info.ad_uri" class="app_bottom_fixed">
-            <div class="signhelp-title">
+        <div v-if="agent!=='' && ad_info.ad_uri" style="padding-bottom: 80px">
+          <div class="app_bottom_fixed" >
+            <div class="ad_title">
               <span><a class="closead" @click="ad_info.ad_uri=undefined">关闭</a></span>
             </div>
             <a :href="ad_info.ad_uri" target="_blank">
@@ -310,6 +309,7 @@
             </a>
           </div>
         </div>
+        <div v-else style="padding-bottom: 10px"></div>
 
       </div>
 
@@ -977,7 +977,7 @@ export default {
   color: #8B8E93
 }
 
-.one-key-report-dialog .content-row .report_captcha {
+.one-key-report-dialog .content-row .report_captcha,.report_phone  {
   display: -ms-flexbox;
   display: flex
 }
@@ -992,6 +992,7 @@ export default {
   width: 125px;
   height: 50px;
   background: #F5F5F5;
+  padding: 5px 10px;
   cursor: pointer
 }
 
@@ -1007,7 +1008,6 @@ export default {
   height: 50px;
   background-color: #3888fa;
   padding: 5px 10px;
-  margin-top: -5px;
   font-size: 14px
 }
 
@@ -1593,6 +1593,7 @@ button:focus {
 
   .dialog {
     height: 100%;
+    width: 100%;
     margin: 0;
     left: 0;
     top: 60px;
@@ -1603,6 +1604,15 @@ button:focus {
     transform: translate(0, 0)
   }
 
+  .one-key-report-dialog .content-row .report_captcha,.report_phone input {
+    width: 60%;
+  }
+
+  .one-key-report-dialog .content-row .report_captcha,.report_phone img,.btn {
+    width: 35%;
+  }
+
+
   .dialog.animate {
     transition: left .5s
   }
@@ -1926,7 +1936,7 @@ body.hidden-overflow {
   cursor: move;
 }
 
-.signhelp-title span a {
+.signhelp-title span a,.ad_title span a {
   text-decoration: none;
   border: 1px solid gray;
   font-size: 12px;
@@ -1944,4 +1954,11 @@ body.hidden-overflow {
   top: 38px;
   right: -6px;
 }
+.ad_title .closead {
+  right: -6px;
+}
+.ad_title span a{
+  line-height: 40px;
+  margin-bottom: 20px;
+}
 </style>