+ group_share_integral=group_share_integral,
+ is_slider=is_slider,
+ content_rich_text=content_rich_text,
+ share_h5_link=share_h5_link,
+ )
+
+ return response(200, 'MemberActivityInfo Create Success', u'会员活动创建成功')
@@ -326,6 +326,11 @@ urlpatterns += [ |
||
| 326 | 326 |
|
| 327 | 327 |
url(r'^admin/member/goods/order$', admin_views.member_goods_order, name='member_goods_order'), |
| 328 | 328 |
url(r'^admin/member/goods/order/update$', admin_views.member_goods_order_update, name='member_goods_order_update'), |
| 329 |
+ |
|
| 330 |
+ url(r'^admin/member/activity/list$', admin_views.member_activity_list, name='member_activity_list'), |
|
| 331 |
+ url(r'^admin/member/activity/details$', admin_views.member_activity_details, name='member_activity_details'), |
|
| 332 |
+ url(r'^admin/member/activity/update$', admin_views.member_activity_update, name='member_activity_update'), |
|
| 333 |
+ url(r'^admin/member/activity/create$', admin_views.member_activity_create, name='member_activity_create'), |
|
| 329 | 334 |
] |
| 330 | 335 |
|
| 331 | 336 |
urlpatterns += [ |
@@ -353,7 +353,7 @@ class MemberActivityInfo(BaseModelMixin): |
||
| 353 | 353 |
return u'报名中' |
| 354 | 354 |
tdate = tc.local_date() |
| 355 | 355 |
if tdate < self.date: |
| 356 |
- return u'报名中' |
|
| 356 |
+ return u'报名中' if self.is_signup else '进行中' |
|
| 357 | 357 |
if tdate == self.date: |
| 358 | 358 |
return u'活动中' |
| 359 | 359 |
return u'已结束' |
@@ -404,6 +404,53 @@ class MemberActivityInfo(BaseModelMixin): |
||
| 404 | 404 |
'is_signed': self.is_signed(user_id), |
| 405 | 405 |
'is_signup': self.is_signup, |
| 406 | 406 |
} |
| 407 |
+ |
|
| 408 |
+ @property |
|
| 409 |
+ def admindata(self): |
|
| 410 |
+ return {
|
|
| 411 |
+ 'id': self.activity_id, |
|
| 412 |
+ 'activity_id': self.activity_id, |
|
| 413 |
+ 'title': self.title, |
|
| 414 |
+ 'subtitle': self.subtitle, |
|
| 415 |
+ 'date': self.date.strftime('%Y-%m-%d'),
|
|
| 416 |
+ 'city': self.city, |
|
| 417 |
+ 'location': self.location, |
|
| 418 |
+ 'lat': self.lat, |
|
| 419 |
+ 'lon': self.lon, |
|
| 420 |
+ 'integral': self.integral, |
|
| 421 |
+ 'cover_url': self.cover_url, |
|
| 422 |
+ 'share_img_link': self.share_img_link, |
|
| 423 |
+ 'share_h5_link': self.share_h5_link, |
|
| 424 |
+ 'slider_image': self.slider_image_url, |
|
| 425 |
+ 'state': self.final_state, |
|
| 426 |
+ 'is_signup': self.is_signup, |
|
| 427 |
+ 'share_integral': self.group_share_integral, |
|
| 428 |
+ 'share_max_integral': self.group_share_max_integral |
|
| 429 |
+ } |
|
| 430 |
+ |
|
| 431 |
+ @property |
|
| 432 |
+ def admindetails(self): |
|
| 433 |
+ return {
|
|
| 434 |
+ 'id': self.activity_id, |
|
| 435 |
+ 'activity_id': self.activity_id, |
|
| 436 |
+ 'title': self.title, |
|
| 437 |
+ 'subtitle': self.subtitle, |
|
| 438 |
+ 'date': self.date.strftime('%Y-%m-%d'),
|
|
| 439 |
+ 'city': self.city, |
|
| 440 |
+ 'location': self.location, |
|
| 441 |
+ 'lat': self.lat, |
|
| 442 |
+ 'lon': self.lon, |
|
| 443 |
+ 'integral': self.integral, |
|
| 444 |
+ 'content_rich_text': self.content_rich_text, |
|
| 445 |
+ 'cover_url': self.cover_url, |
|
| 446 |
+ 'share_img_link': self.share_img_link, |
|
| 447 |
+ 'share_h5_link': self.share_h5_link, |
|
| 448 |
+ 'slider_image': self.slider_image_url, |
|
| 449 |
+ 'state': self.final_state, |
|
| 450 |
+ 'is_signup': self.is_signup, |
|
| 451 |
+ 'share_integral': self.group_share_integral, |
|
| 452 |
+ 'share_max_integral': self.group_share_max_integral |
|
| 453 |
+ } |
|
| 407 | 454 |
|
| 408 | 455 |
|
| 409 | 456 |
class MemberActivitySignupInfo(BaseModelMixin): |