return response(data={
|
|
254
|
254
|
'nickname': user.final_nickname,
|
|
255
|
|
- 'avatar': user.avatar,
|
|
|
255
|
+ 'avatar': user.final_avatar,
|
|
256
|
256
|
'integral': user.integral,
|
|
257
|
257
|
'freeze_integral': user.freeze_integral,
|
|
258
|
258
|
'final_integral': user.final_integral,
|
|
|
|
@@ -578,7 +578,7 @@ def activity_contribute(request):
|
|
578
|
578
|
images=images,
|
|
579
|
579
|
video_url=video_url,
|
|
580
|
580
|
user_name=signup_info.name if signup_info else '',
|
|
581
|
|
- user_avatar=signup_info.avatar if signup_info else '',
|
|
|
581
|
+ user_avatar=signup_info.final_avatar if signup_info else '',
|
|
582
|
582
|
)
|
|
583
|
583
|
|
|
584
|
584
|
return response(data={
|
|
|
|
@@ -615,7 +615,7 @@ def activity_contribute_update(request):
|
|
615
|
615
|
'images': images,
|
|
616
|
616
|
'video_url': video_url,
|
|
617
|
617
|
'user_name': signup_info.name if signup_info else '',
|
|
618
|
|
- 'user_avatar': signup_info.avatar if signup_info else '',
|
|
|
618
|
+ 'user_avatar': signup_info.final_avatar if signup_info else '',
|
|
619
|
619
|
'audit_status': 0,
|
|
620
|
620
|
})
|
|
621
|
621
|
|
|
|
|
@@ -88,7 +88,7 @@ class Command(CompatibilityBaseCommand):
|
|
88
|
88
|
brand_id=b.brand_id,
|
|
89
|
89
|
sr_id=s.sr_id,
|
|
90
|
90
|
sr_name=s.name,
|
|
91
|
|
- sr_avatar=s.avatar,
|
|
|
91
|
+ sr_avatar=s.final_avatar,
|
|
92
|
92
|
ymd=day,
|
|
93
|
93
|
yesterday_num=yesterday_num,
|
|
94
|
94
|
current_month=current_month,
|
|
|
|
@@ -1,5 +1,6 @@
|
|
1
|
1
|
# -*- coding: utf-8 -*-
|
|
2
|
2
|
|
|
|
3
|
+from django.conf import settings
|
|
3
|
4
|
from django.db import models
|
|
4
|
5
|
from django.utils.translation import ugettext_lazy as _
|
|
5
|
6
|
from django_models_ext import BaseModelMixin, SexModelMixin
|
|
|
|
@@ -49,9 +50,13 @@ class ScreenAdminInfo(BaseModelMixin):
|
|
49
|
50
|
return '%d' % self.pk
|
|
50
|
51
|
|
|
51
|
52
|
@property
|
|
|
53
|
+ def final_avatar(self):
|
|
|
54
|
+ return self.avatar and self.avatar.replace(settings.QINIU_FILE_URL_BEFORE, settings.QINIU_FILE_URL_AFTER).replace(settings.QINIU_FILE_URL_BEFORE2, settings.QINIU_FILE_URL_AFTER)
|
|
|
55
|
+
|
|
|
56
|
+ @property
|
|
52
|
57
|
def data(self):
|
|
53
|
58
|
return {
|
|
54
|
59
|
'admin_id': self.admin_id,
|
|
55
|
60
|
'nickname': self.nickname,
|
|
56
|
|
- 'avatar': self.avatar,
|
|
|
61
|
+ 'avatar': self.final_avatar,
|
|
57
|
62
|
}
|
|
|
|
@@ -678,11 +678,15 @@ class MemberActivitySignupInfo(BaseModelMixin, BrandInfoMixin):
|
|
678
|
678
|
return '%d' % self.pk
|
|
679
|
679
|
|
|
680
|
680
|
@property
|
|
|
681
|
+ def final_avatar(self):
|
|
|
682
|
+ return self.avatar and self.avatar.replace(settings.QINIU_FILE_URL_BEFORE, settings.QINIU_FILE_URL_AFTER).replace(settings.QINIU_FILE_URL_BEFORE2, settings.QINIU_FILE_URL_AFTER)
|
|
|
683
|
+
|
|
|
684
|
+ @property
|
|
681
|
685
|
def data(self):
|
|
682
|
686
|
return {
|
|
683
|
687
|
'signup_id': self.signup_id,
|
|
684
|
688
|
'title': self.title,
|
|
685
|
|
- 'avatar': self.avatar,
|
|
|
689
|
+ 'avatar': self.final_avatar,
|
|
686
|
690
|
'name': self.name,
|
|
687
|
691
|
'phone': self.phone,
|
|
688
|
692
|
}
|
|
|
|
@@ -694,7 +698,7 @@ class MemberActivitySignupInfo(BaseModelMixin, BrandInfoMixin):
|
|
694
|
698
|
'user_id': self.user_id,
|
|
695
|
699
|
'activity_id': self.activity_id,
|
|
696
|
700
|
'title': self.title,
|
|
697
|
|
- 'avatar': self.avatar,
|
|
|
701
|
+ 'avatar': self.final_avatar,
|
|
698
|
702
|
'name': self.name,
|
|
699
|
703
|
'phone': self.phone,
|
|
700
|
704
|
}
|
|
|
|
@@ -969,5 +973,5 @@ class MemberActivityContributionWelfareUnlockingInfo(BaseModelMixin, BrandInfoMi
|
|
969
|
973
|
'created_at': tc.local_string(utc_dt=self.created_at),
|
|
970
|
974
|
|
|
971
|
975
|
'username': user.name if user else '',
|
|
972
|
|
- 'useravatar': user.avatar if user else '',
|
|
|
976
|
+ 'useravatar': user.final_avatar if user else '',
|
|
973
|
977
|
}
|
|
|
|
@@ -1,5 +1,6 @@
|
|
1
|
1
|
# -*- coding: utf-8 -*-
|
|
2
|
2
|
|
|
|
3
|
+from django.conf import settings
|
|
3
|
4
|
from django.db import models
|
|
4
|
5
|
from django.utils.translation import ugettext_lazy as _
|
|
5
|
6
|
from django_models_ext import BaseModelMixin, upload_file_url, upload_path
|
|
|
|
@@ -55,6 +56,10 @@ class SalesResponsibilityInfo(BaseModelMixin):
|
|
55
|
56
|
return u'{}-{}'.format(self.name, self.phone)
|
|
56
|
57
|
|
|
57
|
58
|
@property
|
|
|
59
|
+ def final_avatar(self):
|
|
|
60
|
+ return self.avatar and self.avatar.replace(settings.QINIU_FILE_URL_BEFORE, settings.QINIU_FILE_URL_AFTER).replace(settings.QINIU_FILE_URL_BEFORE2, settings.QINIU_FILE_URL_AFTER)
|
|
|
61
|
+
|
|
|
62
|
+ @property
|
|
58
|
63
|
def base_data(self):
|
|
59
|
64
|
return {
|
|
60
|
65
|
'sr_id': self.sr_id,
|
|
|
|
@@ -34,7 +34,7 @@ def sr_submit_api(request):
|
|
34
|
34
|
'openid': user.openid,
|
|
35
|
35
|
'name': name,
|
|
36
|
36
|
'phone': phone,
|
|
37
|
|
- 'avatar': user.avatar,
|
|
|
37
|
+ 'avatar': user.final_avatar,
|
|
38
|
38
|
'user_status': SalesResponsibilityInfo.UNVERIFIED,
|
|
39
|
39
|
'status': True,
|
|
40
|
40
|
})
|