From b772d2921e20de12d99c278a596e0895c77a5890 Mon Sep 17 00:00:00 2001
From: youngS <ly_1301b@163.com>
Date: Fri, 15 Oct 2021 15:27:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fir_client/src/components/FirDownload.vue   |  9 ++++++++-
 fir_client/src/components/ShortDownload.vue | 10 +++++++++-
 fir_ser/api/utils/serializer.py             |  8 ++++++--
 fir_ser/api/views/download.py               |  2 +-
 4 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/fir_client/src/components/FirDownload.vue b/fir_client/src/components/FirDownload.vue
index 683249e..f657f63 100644
--- a/fir_client/src/components/FirDownload.vue
+++ b/fir_client/src/components/FirDownload.vue
@@ -225,6 +225,9 @@
                 <div v-if="agent!==''">
                     <div v-if="ad_info.ad_uri" style="margin-bottom: 80px"/>
                     <div class="app_bottom_fixed" v-if="ad_info.ad_uri">
+                        <div class="signhelp-title">
+                            <span><a class="closead" @click="ad_info.ad_uri=undefined">关闭</a></span>
+                        </div>
                         <a :href="ad_info.ad_uri" target="_blank">
                             <img :src="ad_info.ad_pic" alt="welcome" style="object-fit: cover">
                         </a>
@@ -245,7 +248,7 @@
         <div ref="signhelp" class="signhelp screenshots-section">
             <div class="signhelp-title">
                 iOS安装教程
-                <span><a id="closeBtn" @click="jiaocheng('close')">关闭</a></span>
+                <span><a @click="jiaocheng('close')">关闭</a></span>
             </div>
 
             <div class="list-wrapper" style="width: 300px;">
@@ -1574,4 +1577,8 @@
         right: -20px;
     }
 
+    .signhelp-title .closead {
+        top: 38px;
+        right: -6px;
+    }
 </style>
diff --git a/fir_client/src/components/ShortDownload.vue b/fir_client/src/components/ShortDownload.vue
index 7ce1bc5..4741e99 100644
--- a/fir_client/src/components/ShortDownload.vue
+++ b/fir_client/src/components/ShortDownload.vue
@@ -5,7 +5,7 @@
         <div ref="signhelp" class="signhelp screenshots-section">
             <div class="signhelp-title">
                 iOS安装教程
-                <span><a id="closeBtn" @click="jiaocheng('close')">关闭</a></span>
+                <span><a @click="jiaocheng('close')">关闭</a></span>
             </div>
 
             <div class="list-wrapper" style="width: 300px;">
@@ -239,6 +239,9 @@
                 <div v-if="agent!==''">
                     <div v-if="ad_info.ad_uri" style="margin-bottom: 80px"/>
                     <div class="app_bottom_fixed" v-if="ad_info.ad_uri">
+                        <div class="signhelp-title">
+                            <span><a class="closead" @click="ad_info.ad_uri=undefined">关闭</a></span>
+                        </div>
                         <a :href="ad_info.ad_uri" target="_blank">
                             <img :src="ad_info.ad_pic" alt="welcome" style="object-fit: cover">
                         </a>
@@ -1578,4 +1581,9 @@
         top: -20px;
         right: -20px;
     }
+
+    .signhelp-title .closead {
+        top: 38px;
+        right: -6px;
+    }
 </style>
diff --git a/fir_ser/api/utils/serializer.py b/fir_ser/api/utils/serializer.py
index 6ec54de..d2b47dc 100644
--- a/fir_ser/api/utils/serializer.py
+++ b/fir_ser/api/utils/serializer.py
@@ -48,8 +48,7 @@ def get_app_master_obj_from_context(self, obj):
 def get_screenshots_from_self(self, obj, force_new=False):
     screenshots_list = []
     for screenshot_obj in models.AppScreenShot.objects.filter(app_id=obj).all():
-        key = ''
-        icon_url = get_download_url_from_context(self, obj, key, screenshot_obj.screenshot_url, force_new)
+        icon_url = get_download_url_from_context(self, obj, '', screenshot_obj.screenshot_url, force_new)
         screenshots_list.append({'id': screenshot_obj.pk, 'url': icon_url})
     return screenshots_list
 
@@ -671,3 +670,8 @@ class AppAdInfoSerializer(UserAdInfoSerializer):
     class Meta:
         model = models.UserAdDisplayInfo
         fields = ["ad_uri", "ad_pic"]
+
+    ad_pic = serializers.SerializerMethodField()
+
+    def get_ad_pic(self, obj):
+        return get_download_url_from_context(self, obj, '', obj.ad_pic, True)
diff --git a/fir_ser/api/views/download.py b/fir_ser/api/views/download.py
index cfcf6d1..175965c 100644
--- a/fir_ser/api/views/download.py
+++ b/fir_ser/api/views/download.py
@@ -174,7 +174,7 @@ class ShortDownloadView(APIView):
         res.udid = udid
         res.domain_name = domain_name
         if user_obj and user_obj.role and user_obj.role > 1:
-            res.ad = AppAdInfoSerializer(ad_random_weight(user_obj)).data
+            res.ad = AppAdInfoSerializer(ad_random_weight(user_obj), context={"key": "ShortDownloadView"}).data
         return Response(res.dict)
 
     # key的设置