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 @@
+
+ 关闭 +
welcome @@ -245,7 +248,7 @@
iOS安装教程 - 关闭 + 关闭
@@ -1574,4 +1577,8 @@ right: -20px; } + .signhelp-title .closead { + top: 38px; + right: -6px; + } 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 @@
iOS安装教程 - 关闭 + 关闭
@@ -239,6 +239,9 @@
+
+ 关闭 +
welcome @@ -1578,4 +1581,9 @@ top: -20px; right: -20px; } + + .signhelp-title .closead { + top: 38px; + right: -6px; + } 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的设置