@@ -12,7 +12,7 @@ class GoodsInfoAdmin(admin.ModelAdmin):  | 
            ||
| 12 | 12 | 
                 | 
            
| 13 | 13 | 
                 | 
            
| 14 | 14 | 
                class RightInfoAdmin(admin.ModelAdmin):  | 
            
| 15 | 
                -    list_display = ('right_id', 'right_type', 'icon', 'title', 'subtitle', 'detail', 'minlevel', 'position', 'status', 'created_at', 'updated_at')
               | 
            |
| 15 | 
                +    list_display = ('right_id', 'right_type', 'icon', 'title', 'subtitle', 'detail', 'level1', 'level2', 'level3', 'level4', 'level5',  'minlevel', 'position', 'status', 'created_at', 'updated_at')
               | 
            |
| 16 | 16 | 
                     list_filter = ('right_type', 'status')
               | 
            
| 17 | 17 | 
                 | 
            
| 18 | 18 | 
                 | 
            
                @@ -0,0 +1,40 @@  | 
            ||
| 1 | 
                +# -*- coding: utf-8 -*-  | 
            |
| 2 | 
                +# Generated by Django 1.11.26 on 2019-11-19 06:46  | 
            |
| 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', '0002_auto_20191119_1428'),
               | 
            |
| 12 | 
                + ]  | 
            |
| 13 | 
                +  | 
            |
| 14 | 
                + operations = [  | 
            |
| 15 | 
                + migrations.AddField(  | 
            |
| 16 | 
                + model_name='rightinfo',  | 
            |
| 17 | 
                + name='level1',  | 
            |
| 18 | 
                + field=models.CharField(blank=True, help_text='level1', max_length=255, null=True, verbose_name='level1'),  | 
            |
| 19 | 
                + ),  | 
            |
| 20 | 
                + migrations.AddField(  | 
            |
| 21 | 
                + model_name='rightinfo',  | 
            |
| 22 | 
                + name='level2',  | 
            |
| 23 | 
                + field=models.CharField(blank=True, help_text='level2', max_length=255, null=True, verbose_name='level2'),  | 
            |
| 24 | 
                + ),  | 
            |
| 25 | 
                + migrations.AddField(  | 
            |
| 26 | 
                + model_name='rightinfo',  | 
            |
| 27 | 
                + name='level3',  | 
            |
| 28 | 
                + field=models.CharField(blank=True, help_text='level3', max_length=255, null=True, verbose_name='level3'),  | 
            |
| 29 | 
                + ),  | 
            |
| 30 | 
                + migrations.AddField(  | 
            |
| 31 | 
                + model_name='rightinfo',  | 
            |
| 32 | 
                + name='level4',  | 
            |
| 33 | 
                + field=models.CharField(blank=True, help_text='level4', max_length=255, null=True, verbose_name='level4'),  | 
            |
| 34 | 
                + ),  | 
            |
| 35 | 
                + migrations.AddField(  | 
            |
| 36 | 
                + model_name='rightinfo',  | 
            |
| 37 | 
                + name='level5',  | 
            |
| 38 | 
                + field=models.CharField(blank=True, help_text='level5', max_length=255, null=True, verbose_name='level5'),  | 
            |
| 39 | 
                + ),  | 
            |
| 40 | 
                + ]  | 
            
                @@ -94,6 +94,12 @@ class RightInfo(BaseModelMixin):  | 
            ||
| 94 | 94 | 
                subtitle = models.CharField(_(u'subtitle'), max_length=255, blank=True, null=True, help_text=u'权益二级名称')  | 
            
| 95 | 95 | 
                detail = RichTextField(_(u'detail'), blank=True, null=True, help_text=u'权益详情')  | 
            
| 96 | 96 | 
                 | 
            
| 97 | 
                + level1 = models.CharField(_(u'level1'), max_length=255, blank=True, null=True, help_text=u'level1')  | 
            |
| 98 | 
                + level2 = models.CharField(_(u'level2'), max_length=255, blank=True, null=True, help_text=u'level2')  | 
            |
| 99 | 
                + level3 = models.CharField(_(u'level3'), max_length=255, blank=True, null=True, help_text=u'level3')  | 
            |
| 100 | 
                + level4 = models.CharField(_(u'level4'), max_length=255, blank=True, null=True, help_text=u'level4')  | 
            |
| 101 | 
                + level5 = models.CharField(_(u'level5'), max_length=255, blank=True, null=True, help_text=u'level5')  | 
            |
| 102 | 
                +  | 
            |
| 97 | 103 | 
                minlevel = models.IntegerField(_(u'minlevel'), default=0, help_text=u'权益最低会员级别')  | 
            
| 98 | 104 | 
                 | 
            
| 99 | 105 | 
                position = models.IntegerField(_(u'position'), default=1, help_text=u'排序', db_index=True)  | 
            
                @@ -122,6 +128,11 @@ class RightInfo(BaseModelMixin):  | 
            ||
| 122 | 128 | 
                'title': self.title,  | 
            
| 123 | 129 | 
                'subtitle': self.subtitle,  | 
            
| 124 | 130 | 
                'detail': self.detail,  | 
            
| 131 | 
                + 'level1': self.level1,  | 
            |
| 132 | 
                + 'level2': self.level2,  | 
            |
| 133 | 
                + 'level3': self.level3,  | 
            |
| 134 | 
                + 'level4': self.level4,  | 
            |
| 135 | 
                + 'level5': self.level5,  | 
            |
| 125 | 136 | 
                'minlevel': self.minlevel,  | 
            
| 126 | 137 | 
                "able": True,  | 
            
| 127 | 138 | 
                "left_num": 3,  |