增加活动内容图片

FFIB %!s(int64=2) %!d(string=hace) años
padre
commit
5f53207bdc
Se han modificado 2 ficheros con 21 adiciones y 12 borrados
  1. 4 4
      api/admin_views.py
  2. 17 8
      member/models.py

+ 4 - 4
api/admin_views.py

@@ -817,7 +817,7 @@ def member_activity_update(request, administrator):
817 817
     is_slider = request.POST.get('is_slider', 0)
818 818
     slider_image_path = request.POST.get('banner_path', '') or request.POST.get('slider_image_path', '')
819 819
     cover_path = request.POST.get('cover_path', '')
820
-    # image_path = request.POST.get('image_path', '') or request.POST.get('banner_path', '')
820
+    detail_image_path = request.POST.get('detail_image_path', '')
821 821
     limit_image_num = int(request.POST.get('limit_image_num', 3))
822 822
     is_signup = request.POST.get('is_signup', 0)
823 823
     group_share_max_integral = int(request.POST.get('share_max_integral', 0))
@@ -848,7 +848,7 @@ def member_activity_update(request, administrator):
848 848
     log.is_slider = is_slider
849 849
     log.slider_image = slider_image_path
850 850
     log.cover = cover_path
851
-    # log.image = image_path
851
+    log.image = detail_image_path
852 852
     log.limit_image_num = limit_image_num
853 853
     log.is_signup = is_signup
854 854
     log.group_share_integral = group_share_integral
@@ -879,7 +879,7 @@ def member_activity_create(request, administrator):
879 879
     is_slider = request.POST.get('is_slider', 0)
880 880
     slider_image_path = request.POST.get('banner_path', '') or request.POST.get('slider_image_path', '')
881 881
     cover_path = request.POST.get('cover_path', '')
882
-    # image_path = request.POST.get('image_path', '') or request.POST.get('banner_path', '')
882
+    detail_image_path = request.POST.get('detail_image_path', '')
883 883
     limit_image_num = int(request.POST.get('limit_image_num', 3))
884 884
     is_signup = request.POST.get('is_signup', 0)
885 885
     group_share_max_integral = int(request.POST.get('share_max_integral', 0))
@@ -907,7 +907,7 @@ def member_activity_create(request, administrator):
907 907
         is_slider=is_slider,
908 908
         slider_image=slider_image_path,
909 909
         cover=cover_path,
910
-        # image=image_path,
910
+        image=detail_image_path,
911 911
         limit_image_num=limit_image_num,
912 912
         is_signup=is_signup,
913 913
         group_share_max_integral=group_share_max_integral,

+ 17 - 8
member/models.py

@@ -429,13 +429,13 @@ class MemberActivityInfo(BaseModelMixin, BrandInfoMixin):
429 429
     def cover_url(self):
430 430
         return qiniu_file_url(self.cover.name, bucket='tamron') if self.final_is_upload_qiniu else upload_file_url(self.cover)
431 431
 
432
-    # @property
433
-    # def image_path(self):
434
-    #     return upload_file_path(self.image)
435
-    #
436
-    # @property
437
-    # def image_url(self):
438
-    #     return qiniu_file_url(self.image.name, bucket='tamron') if self.is_upload_qiniu else upload_file_url(self.image)
432
+    @property
433
+    def image_path(self):
434
+        return upload_file_path(self.image)
435
+
436
+    @property
437
+    def image_url(self):
438
+        return qiniu_file_url(self.image.name, bucket='tamron') if self.is_upload_qiniu else upload_file_url(self.image)
439 439
 
440 440
     @property
441 441
     def final_state(self):
@@ -491,7 +491,9 @@ class MemberActivityInfo(BaseModelMixin, BrandInfoMixin):
491 491
             'lon': self.lon,
492 492
             'integral': self.integral,
493 493
             'slider_image': self.slider_image_url,
494
+            'slider_image_url': self.slider_image_url,
494 495
             'cover_url': self.cover_url,
496
+            'detail_image_url': self.image_url,
495 497
             'limit_image_num': self.limit_image_num,
496 498
             'share_img_link': self.share_img_link,
497 499
             'share_h5_link': self.share_h5_link,
@@ -522,7 +524,9 @@ class MemberActivityInfo(BaseModelMixin, BrandInfoMixin):
522 524
             'lon': self.lon,
523 525
             'integral': self.integral,
524 526
             'slider_image': self.slider_image_url,
527
+            'slider_image_url': self.slider_image_url,
525 528
             'cover_url': self.cover_url,
529
+            'detail_image_url': self.image_url,
526 530
             'limit_image_num': self.limit_image_num,
527 531
             'content_rich_text': self.final_content_rich_text,
528 532
             'share_img_link': self.share_img_link,
@@ -533,7 +537,6 @@ class MemberActivityInfo(BaseModelMixin, BrandInfoMixin):
533 537
             'poster_kv_img_url': self.final_poster_kv_img_url,
534 538
             'poster_content': self.poster_content,
535 539
             'contribution_content_placeholder': self.contribution_content_placeholder,
536
-
537 540
         }
538 541
 
539 542
     @property
@@ -557,7 +560,9 @@ class MemberActivityInfo(BaseModelMixin, BrandInfoMixin):
557 560
             'integral': self.integral,
558 561
             'is_slider': self.is_slider,
559 562
             'slider_image': self.slider_image_url,
563
+            'slider_image_url': self.slider_image_url,
560 564
             'cover_url': self.cover_url,
565
+            'detail_image_url': self.image_url,
561 566
             'limit_image_num': self.limit_image_num,
562 567
             'share_img_link': self.share_img_link,
563 568
             'share_h5_link': self.share_h5_link,
@@ -595,8 +600,12 @@ class MemberActivityInfo(BaseModelMixin, BrandInfoMixin):
595 600
             'is_slider': self.is_slider,
596 601
             'banner_path': self.slider_image_path,
597 602
             'slider_image': self.slider_image_url,
603
+            'slider_image_path': self.slider_image_path,
604
+            'slider_image_url': self.slider_image_url,
598 605
             'cover_path': self.cover_path,
599 606
             'cover_url': self.cover_url,
607
+            'detail_image_path': self.image_path,
608
+            'detail_image_url': self.image_url,
600 609
             'limit_image_num': self.limit_image_num,
601 610
             'content_rich_text': self.final_content_rich_text,
602 611
             'share_img_link': self.share_img_link,