:bug: Fix Bug: response error
huangqimin
4 fichiers modifiés avec 28 ajouts et 6 suppressions
+ 5
- 5
api/member_views.py
@@ -155,12 +155,12 @@ def integrals(request): |
||
| 155 | 155 |
'shots_types': get_shot_member_data(), |
| 156 | 156 |
'enable_photo_upvote_integral': True, |
| 157 | 157 |
'photo_upvote_integrals': {
|
| 158 |
- 'headers': ['排名', '日', '周', '月'], |
|
| 158 |
+ 'headers': [u'排名', u'日', u'周', u'月'], |
|
| 159 | 159 |
'ranks': [ |
| 160 |
- ['第1名', '10', '20', '30'], |
|
| 161 |
- ['第2名', '5', '10', '15'], |
|
| 162 |
- ['第3名', '3', '6', '9'], |
|
| 163 |
- ['第4-10名', '1', '2', '3'], |
|
| 160 |
+ [u'第1名', '10', '20', '30'], |
|
| 161 |
+ [u'第2名', '5', '10', '15'], |
|
| 162 |
+ [u'第3名', '3', '6', '9'], |
|
| 163 |
+ [u'第4-10名', '1', '2', '3'], |
|
| 164 | 164 |
] |
| 165 | 165 |
}, |
| 166 | 166 |
'enable_activity_integral': True, |
+ 1
- 1
member/admin.py
@@ -29,7 +29,7 @@ class ShotTypeInfoAdmin(admin.ModelAdmin): |
||
| 29 | 29 |
|
| 30 | 30 |
|
| 31 | 31 |
class MemberActivityInfoAdmin(admin.ModelAdmin): |
| 32 |
- list_display = ('title', 'subtitle', 'date', 'location', 'image', 'is_slider', 'slider_image', 'position', 'status', 'created_at', 'updated_at')
|
|
| 32 |
+ list_display = ('title', 'subtitle', 'date', 'city', 'location', 'lat', 'lon', 'image', 'is_slider', 'slider_image', 'position', 'status', 'created_at', 'updated_at')
|
|
| 33 | 33 |
list_filter = ('is_slider', 'status')
|
| 34 | 34 |
|
| 35 | 35 |
|
+ 20
- 0
member/migrations/0005_memberactivityinfo_city.py
@@ -0,0 +1,20 @@ |
||
| 1 |
+# -*- coding: utf-8 -*- |
|
| 2 |
+# Generated by Django 1.11.26 on 2019-11-20 04:05 |
|
| 3 |
+from __future__ import unicode_literals |
|
| 4 |
+ |
|
| 5 |
+from django.db import migrations, models |
|
| 6 |
+ |
|
| 7 |
+ |
|
| 8 |
+class Migration(migrations.Migration): |
|
| 9 |
+ |
|
| 10 |
+ dependencies = [ |
|
| 11 |
+ ('member', '0004_auto_20191119_2342'),
|
|
| 12 |
+ ] |
|
| 13 |
+ |
|
| 14 |
+ operations = [ |
|
| 15 |
+ migrations.AddField( |
|
| 16 |
+ model_name='memberactivityinfo', |
|
| 17 |
+ name='city', |
|
| 18 |
+ field=models.CharField(blank=True, help_text='\u6d3b\u52a8\u57ce\u5e02', max_length=255, null=True, verbose_name='city'), |
|
| 19 |
+ ), |
|
| 20 |
+ ] |
+ 2
- 0
member/models.py
@@ -173,6 +173,7 @@ class MemberActivityInfo(BaseModelMixin): |
||
| 173 | 173 |
subtitle = models.CharField(_(u'subtitle'), max_length=255, blank=True, null=True, help_text=u'活动二级名称') |
| 174 | 174 |
|
| 175 | 175 |
date = models.DateField(_(u'date'), blank=True, null=True, help_text=u'活动时间') |
| 176 |
+ city = models.CharField(_(u'city'), max_length=255, blank=True, null=True, help_text=u'活动城市') |
|
| 176 | 177 |
location = models.CharField(_(u'location'), max_length=255, blank=True, null=True, help_text=u'活动地点') |
| 177 | 178 |
lat = models.FloatField(_(u'lat'), default=1.0, help_text=u'纬度') |
| 178 | 179 |
lon = models.FloatField(_(u'lon'), default=1.0, help_text=u'经度') |
@@ -231,6 +232,7 @@ class MemberActivityInfo(BaseModelMixin): |
||
| 231 | 232 |
'title': self.title, |
| 232 | 233 |
'subtitle': self.subtitle, |
| 233 | 234 |
'date': tc.local_string(self.date, '%Y-%m-%d'), |
| 235 |
+ 'city': self.city, |
|
| 234 | 236 |
'location': self.location, |
| 235 | 237 |
'lat': self.lat, |
| 236 | 238 |
'lon': self.lon, |