e nl-15 ol-15">
|
727
|
747
|
|
|
728
|
748
|
user_id = models.CharField(_(u'user_id'), max_length=32, blank=True, null=True, help_text=u'用户唯一标识', db_index=True)
|
|
|
|
@@ -738,10 +758,12 @@ class MemberActivitySignupInfo(BaseModelMixin, BrandInfoMixin):
|
|
738
|
758
|
|
|
739
|
759
|
fields = JSONField(_(u'fields'), blank=True, null=True, default='[]', help_text=u'自定义报名字段')
|
|
740
|
760
|
|
|
741
|
|
- passed = models.BooleanField(_(u'passed'), default=False, help_text=u'是否通过')
|
|
|
761
|
+ audit_status = models.IntegerField(_(u'audit_status'), choices=AUDIT_STATUS, default=UNAUDITED, help_text=u'审核状态', db_index=True)
|
|
742
|
762
|
|
|
743
|
763
|
is_signin = models.BooleanField(_(u'is_signin'), default=False, help_text=u'是否已签到')
|
|
744
|
764
|
|
|
|
765
|
+ is_read = models.BooleanField(_(u'is_read'), default=False, help_text=u'报名消息是否已读')
|
|
|
766
|
+
|
|
745
|
767
|
class Meta:
|
|
746
|
768
|
verbose_name = _(u'会员活动报名信息')
|
|
747
|
769
|
verbose_name_plural = _(u'会员活动报名信息')
|
|
|
|
@@ -756,6 +778,7 @@ class MemberActivitySignupInfo(BaseModelMixin, BrandInfoMixin):
|
|
756
|
778
|
@property
|
|
757
|
779
|
def final_avatar(self):
|
|
758
|
780
|
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)
|
|
|
781
|
+
|
|
759
|
782
|
|
|
760
|
783
|
@property
|
|
761
|
784
|
def data(self):
|
|
|
|
@@ -767,7 +790,7 @@ class MemberActivitySignupInfo(BaseModelMixin, BrandInfoMixin):
|
|
767
|
790
|
'name': self.name,
|
|
768
|
791
|
'phone': self.phone,
|
|
769
|
792
|
'fields': json.loads(self.fields) if self.fields else [],
|
|
770
|
|
- 'passed': self.passed,
|
|
|
793
|
+ 'audit_status': self.audit_status,
|
|
771
|
794
|
}
|
|
772
|
795
|
|
|
773
|
796
|
@property
|
|
|
|
@@ -783,7 +806,7 @@ class MemberActivitySignupInfo(BaseModelMixin, BrandInfoMixin):
|
|
783
|
806
|
'phone': self.phone,
|
|
784
|
807
|
'fields': json.loads(self.fields) if self.fields else [],
|
|
785
|
808
|
'is_signin': self.is_signin,
|
|
786
|
|
- 'passed': self.passed,
|
|
|
809
|
+ 'audit_status': self.audit_status,
|
|
787
|
810
|
}
|
|
788
|
811
|
|
|
789
|
812
|
class MemberActivityDataInfo(BaseModelMixin, BrandInfoMixin):
|
|
|
|
@@ -2,7 +2,7 @@
|
|
2
|
2
|
|
|
3
|
3
|
from django.conf.urls import url
|
|
4
|
4
|
|
|
5
|
|
-from member import activity_mp_views
|
|
|
5
|
+from member import activity_mp_views, lensman_activity_mp_views
|
|
6
|
6
|
|
|
7
|
7
|
# activity
|
|
8
|
8
|
urlpatterns = [
|
|
|
|
@@ -22,8 +22,8 @@ urlpatterns += [
|
|
22
|
22
|
|
|
23
|
23
|
# activity data
|
|
24
|
24
|
urlpatterns += [
|
|
25
|
|
- url(r'^member/activity/data/submit$', activity_mp_views.activity_data_submit, name='mp_member_activity_data_submit'), # 会员活动数据提交
|
|
26
|
|
- url(r'^member/activity/data/detail$', activity_mp_views.activity_data_detail, name='mp_member_activity_data_detail'), # 获取会员活动报名信息
|
|
|
25
|
+ url(r'^member/activity/data/submit$', lensman_activity_mp_views.activity_data_submit, name='mp_member_activity_data_submit'), # 会员活动数据提交
|
|
|
26
|
+ url(r'^member/activity/data/detail$', lensman_activity_mp_views.activity_data_detail, name='mp_member_activity_data_detail'), # 获取会员活动报名信息
|
|
27
|
27
|
]
|
|
28
|
28
|
|
|
29
|
29
|
|
|
|
|
@@ -36,3 +36,9 @@ urlpatterns += [
|
|
36
|
36
|
|
|
37
|
37
|
url(r'^member/activity/contribute/detail/lastest$', activity_mp_views.activity_contribute_detail_lastest, name='member_activity_contribute_detail_lastest'),
|
|
38
|
38
|
]
|
|
|
39
|
+
|
|
|
40
|
+#activity message
|
|
|
41
|
+urlpatterns += [
|
|
|
42
|
+ url(r'^member/activity/signup/message$', lensman_activity_mp_views.activity_signup_message, name='mp_member_activity_signup_message'),
|
|
|
43
|
+ url(r'^member/activity/signup/message/read$', lensman_activity_mp_views.activity_signup_message_read, name='mp_member_activity_signup_message_read'),
|
|
|
44
|
+]
|