renew
2 измененных файлов с 36 добавлено и 3 удалено
+ 1
- 1
api/member_views.py
@@ -31,7 +31,7 @@ def member(request): |
||
| 31 | 31 |
rights = [right.data for right in rights] |
| 32 | 32 |
|
| 33 | 33 |
goods = GoodsInfo.objects.filter(status=True).order_by('position')
|
| 34 |
- goods = [good.data for good in goods] |
|
| 34 |
+ goods = [good.data for good in goods][] |
|
| 35 | 35 |
|
| 36 | 36 |
return response(200, data={
|
| 37 | 37 |
'nickname': user.final_nickname, |
+ 35
- 2
member/models.py
@@ -66,7 +66,6 @@ class GoodsInfo(BaseModelMixin): |
||
| 66 | 66 |
'good_id': self.good_id, |
| 67 | 67 |
'good_type': self.good_type, |
| 68 | 68 |
'title': self.title, |
| 69 |
- 'desc': self.desc, |
|
| 70 | 69 |
'image': self.image_url, |
| 71 | 70 |
'slider_image': self.slider_image_url, |
| 72 | 71 |
'integral': self.integral, |
@@ -74,7 +73,21 @@ class GoodsInfo(BaseModelMixin): |
||
| 74 | 73 |
'minlevel': self.minlevel, |
| 75 | 74 |
'able': True, |
| 76 | 75 |
} |
| 77 |
- |
|
| 76 |
+ |
|
| 77 |
+ @property |
|
| 78 |
+ def details(self): |
|
| 79 |
+ return {
|
|
| 80 |
+ 'good_id': self.good_id, |
|
| 81 |
+ 'good_type': self.good_type, |
|
| 82 |
+ 'title': self.title, |
|
| 83 |
+ 'image': self.image_url, |
|
| 84 |
+ 'slider_image': self.slider_image_url, |
|
| 85 |
+ 'integral': self.integral, |
|
| 86 |
+ 'fee': self.fee, |
|
| 87 |
+ 'minlevel': self.minlevel, |
|
| 88 |
+ 'able': True, |
|
| 89 |
+ 'desc': self.desc, |
|
| 90 |
+ } |
|
| 78 | 91 |
|
| 79 | 92 |
class GoodsOrderInfo(BaseModelMixin): |
| 80 | 93 |
PHYSICAL = 0 |
@@ -361,7 +374,27 @@ class MemberActivityInfo(BaseModelMixin): |
||
| 361 | 374 |
'lon': self.lon, |
| 362 | 375 |
'integral': self.integral, |
| 363 | 376 |
'cover_url': self.cover_url, |
| 377 |
+ 'share_img_link': self.share_img_link, |
|
| 378 |
+ 'share_h5_link': self.share_h5_link, |
|
| 379 |
+ 'slider_image': self.slider_image_url, |
|
| 380 |
+ 'state': self.final_state, |
|
| 381 |
+ 'is_signed': self.is_signed(user_id), |
|
| 382 |
+ } |
|
| 383 |
+ |
|
| 384 |
+ def details(self, user_id): |
|
| 385 |
+ return {
|
|
| 386 |
+ 'id': self.activity_id, |
|
| 387 |
+ 'activity_id': self.activity_id, |
|
| 388 |
+ 'title': self.title, |
|
| 389 |
+ 'subtitle': self.subtitle, |
|
| 390 |
+ 'date': tc.local_string(self.date, format='%Y-%m-%d'), |
|
| 391 |
+ 'city': self.city, |
|
| 392 |
+ 'location': self.location, |
|
| 393 |
+ 'lat': self.lat, |
|
| 394 |
+ 'lon': self.lon, |
|
| 395 |
+ 'integral': self.integral, |
|
| 364 | 396 |
'content_rich_text': self.content_rich_text, |
| 397 |
+ 'cover_url': self.cover_url, |
|
| 365 | 398 |
'share_img_link': self.share_img_link, |
| 366 | 399 |
'share_h5_link': self.share_h5_link, |
| 367 | 400 |
'slider_image': self.slider_image_url, |