api/member_views.py

@@ -155,12 +155,12 @@ def integrals(request):

                         'shots_types': get_shot_member_data(),
              

                         'enable_photo_upvote_integral': True,
              

                         'photo_upvote_integrals': {
              

                -            'headers': ['排名', '日', '周', '月'],
              

                +            'headers': [u'排名', u'日', u'周', u'月'],
              

                             'ranks': [
              

                -                ['第1名', '10', '20', '30'],
              

                -                ['第2名', '5', '10', '15'],
              

                -                ['第3名', '3', '6', '9'],
              

                -                ['第4-10名', '1', '2', '3'],
              

                +                [u'第1名', '10', '20', '30'],
              

                +                [u'第2名', '5', '10', '15'],
              

                +                [u'第3名', '3', '6', '9'],
              

                +                [u'第4-10名', '1', '2', '3'],
              

                             ]
              

                         },
              

                         'enable_activity_integral': True,
              

member/admin.py

@@ -29,7 +29,7 @@ class ShotTypeInfoAdmin(admin.ModelAdmin):

                 
              

                 
              

                 class MemberActivityInfoAdmin(admin.ModelAdmin):
              

                -    list_display = ('title', 'subtitle', 'date', 'location', 'image', 'is_slider', 'slider_image', 'position', 'status', 'created_at', 'updated_at')
              

                +    list_display = ('title', 'subtitle', 'date', 'city', 'location', 'lat', 'lon', 'image', 'is_slider', 'slider_image', 'position', 'status', 'created_at', 'updated_at')
              

                     list_filter = ('is_slider', 'status')
              

                 
              

                 
              

member/migrations/0005_memberactivityinfo_city.py

@@ -0,0 +1,20 @@

                +# -*- coding: utf-8 -*-
              

                +# Generated by Django 1.11.26 on 2019-11-20 04:05
              

                +from __future__ import unicode_literals
              

                +
              

                +from django.db import migrations, models
              

                +
              

                +
              

                +class Migration(migrations.Migration):
              

                +
              

                +    dependencies = [
              

                +        ('member', '0004_auto_20191119_2342'),
              

                +    ]
              

                +
              

                +    operations = [
              

                +        migrations.AddField(
              

                +            model_name='memberactivityinfo',
              

                +            name='city',
              

                +            field=models.CharField(blank=True, help_text='\u6d3b\u52a8\u57ce\u5e02', max_length=255, null=True, verbose_name='city'),
              

                +        ),
              

                +    ]
              

member/models.py

@@ -173,6 +173,7 @@ class MemberActivityInfo(BaseModelMixin):

                     subtitle = models.CharField(_(u'subtitle'), max_length=255, blank=True, null=True, help_text=u'活动二级名称')
              

                 
              

                     date = models.DateField(_(u'date'), blank=True, null=True, help_text=u'活动时间')
              

                +    city = models.CharField(_(u'city'), max_length=255, blank=True, null=True, help_text=u'活动城市')
              

                     location = models.CharField(_(u'location'), max_length=255, blank=True, null=True, help_text=u'活动地点')
              

                     lat = models.FloatField(_(u'lat'), default=1.0, help_text=u'纬度')
              

                     lon = models.FloatField(_(u'lon'), default=1.0, help_text=u'经度')
              
@@ -231,6 +232,7 @@ class MemberActivityInfo(BaseModelMixin):

                             'title': self.title,
              

                             'subtitle': self.subtitle,
              

                             'date': tc.local_string(self.date, '%Y-%m-%d'),
              

                +            'city': self.city,
              

                             'location': self.location,
              

                             'lat': self.lat,
              

                             'lon': self.lon,