">
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
|
})
|