account/admin.py

@@ -8,7 +8,7 @@ from mch.models import ConsumeInfoSubmitLogInfo

                 
              

                 
              

                 class UserInfoAdmin(ChangeOnlyModelAdmin, admin.ModelAdmin):
              

                -    list_display = ('user_id', 'nickname', 'phone', 'unionid', 'openid', 'openid_miniapp', 'location', 'balance', 'user_status', 'test_user', 'status', 'created_at', 'updated_at')
              

                +    list_display = ('user_id', 'nickname', 'phone', 'unionid', 'openid', 'openid_miniapp', 'location', 'balance', 'integral', 'freeze_integral', 'user_status', 'test_user', 'status', 'created_at', 'updated_at')
              

                     list_filter = ('test_user', 'sex', 'user_status', 'status')
              

                     readonly_fields = ('user_id', )
              

                     search_fields = ('user_id', 'username', 'unionid', 'openid', 'openid_miniapp', 'name', 'phone', 'location')
              

account/migrations/0037_auto_20191119_1348.py

@@ -0,0 +1,35 @@

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

                +# Generated by Django 1.11.26 on 2019-11-19 05:48
              

                +from __future__ import unicode_literals
              

                +
              

                +from django.db import migrations, models
              

                +
              

                +
              

                +class Migration(migrations.Migration):
              

                +
              

                +    dependencies = [
              

                +        ('account', '0036_auto_20190826_1537'),
              

                +    ]
              

                +
              

                +    operations = [
              

                +        migrations.AddField(
              

                +            model_name='userinfo',
              

                +            name='freeze_integral',
              

                +            field=models.IntegerField(default=0, help_text='\u4f1a\u5458\u51bb\u7ed3\u79ef\u5206', verbose_name='freeze_integral'),
              

                +        ),
              

                +        migrations.AddField(
              

                +            model_name='userinfo',
              

                +            name='integral',
              

                +            field=models.IntegerField(default=0, help_text='\u4f1a\u5458\u79ef\u5206', verbose_name='integral'),
              

                +        ),
              

                +        migrations.AddField(
              

                +            model_name='userinfo',
              

                +            name='level',
              

                +            field=models.IntegerField(choices=[(0, '\u975e\u4f1a\u5458'), (1, 'LRC\u4f1a\u5458'), (2, '\u94f6\u5361\u4f1a\u5458'), (3, '\u91d1\u5361\u4f1a\u5458'), (4, '\u767d\u91d1\u5361\u4f1a\u5458'), (5, '\u9ed1\u91d1\u5361\u4f1a\u5458')], default=0, help_text='\u4f1a\u5458\u7b49\u7ea7', verbose_name='level'),
              

                +        ),
              

                +        migrations.AddField(
              

                +            model_name='userinfo',
              

                +            name='shots_num',
              

                +            field=models.IntegerField(default=0, help_text='\u4e3b\u6301\u955c\u5934\u6570', verbose_name='shots_num'),
              

                +        ),
              

                +    ]
              

account/models.py

@@ -290,6 +290,22 @@ class UserInfo(BaseModelMixin, LensmanTypeBoolMixin):

                         (FEMALE, u'女'),
              

                     )
              

                 
              

                +    MEMBER_NO = 0
              

                +    MEMBER_LRC = 1
              

                +    MEMBER_SILVER = 2
              

                +    MEMBER_GOLD = 3
              

                +    MEMBER_WHITE_GOLD = 4
              

                +    MEMBER_BLACK_GOLD = 5
              

                +
              

                +    LEVEL_TUPLE = (
              

                +        (MEMBER_NO, u'非会员'),
              

                +        (MEMBER_LRC, u'LRC会员'),
              

                +        (MEMBER_SILVER, u'银卡会员'),
              

                +        (MEMBER_GOLD, u'金卡会员'),
              

                +        (MEMBER_WHITE_GOLD, u'白金卡会员'),
              

                +        (MEMBER_BLACK_GOLD, u'黑金卡会员'),
              

                +    )
              

                +
              

                     user_id = models.CharField(_(u'user_id'), max_length=32, blank=True, null=True, help_text=u'用户唯一标识', db_index=True, unique=True)
              

                 
              

                     user_from = models.IntegerField(_(u'user_from'), choices=USER_FROM, default=APP_USER, help_text=u'用户来源')
              
@@ -341,6 +357,13 @@ class UserInfo(BaseModelMixin, LensmanTypeBoolMixin):

                 
              

                     test_user = models.BooleanField(_(u'test_user'), default=False, help_text=_(u'是否为测试用户'), db_index=True)
              

                 
              

                +    # 会员信息
              

                +    integral = models.IntegerField(_(u'integral'), default=0, help_text=u'会员积分')
              

                +    freeze_integral = models.IntegerField(_(u'freeze_integral'), default=0, help_text=u'会员冻结积分')
              

                +
              

                +    shots_num = models.IntegerField(_(u'shots_num'), default=0, help_text=u'主持镜头数')
              

                +    level = models.IntegerField(_(u'level'), choices=LEVEL_TUPLE, default=MEMBER_NO, help_text=u'会员等级')
              

                +
              

                     class Meta:
              

                         verbose_name = _(u'userinfo')
              

                         verbose_name_plural = _(u'userinfo')
              
@@ -349,6 +372,10 @@ class UserInfo(BaseModelMixin, LensmanTypeBoolMixin):

                         return unicode(self.pk)
              

                 
              

                     @property
              

                +    def final_integral(self):
              

                +        return self.integral + self.freeze_integral
              

                +
              

                +    @property
              

                     def final_nickname(self):
              

                         if self.user_from == self.APP_USER:
              

                             return self.username
              

api/member_views.py

@@ -0,0 +1,200 @@

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

                +
              

                +from __future__ import division
              

                +
              

                +from django.conf import settings
              

                +from django_logit import logit
              

                +from django_response import response
              

                +from paginator import pagination
              

                +
              

                +from account.models import UserInfo
              

                +from member.models import GoodsInfo, MemberActivityInfo, RightInfo
              

                +from utils.error.errno_utils import UserStatusCode
              

                +from utils.redis.rshot import get_shot_member_data
              

                +
              

                +
              

                +@logit
              

                +def member(request):
              

                +    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
              

                +    user_id = request.POST.get('user_id', '')
              

                +
              

                +    # 校验用户是否存在
              

                +    try:
              

                +        user = UserInfo.objects.get(user_id=user_id)
              

                +    except UserInfo.DoesNotExist:
              

                +        return response(UserStatusCode.USER_NOT_FOUND)
              

                +
              

                +    rights = RightInfo.objects.filter(status=True).order_by('position')
              

                +    rights = [right.data for right in rights]
              

                +
              

                +    goods = GoodsInfo.objects.filter(status=True).order_by('position')
              

                +    goods = [good.data for good in goods]
              

                +
              

                +    return response(200, data={
              

                +        'nickname': user.final_nickname,
              

                +        'avatar': user.avatar,
              

                +        'integral': user.integral,
              

                +        'freeze_integral': user.freeze_integral,
              

                +        'final_integral': user.final_integral,
              

                +        'shots_num': user.shots_num,
              

                +        'level': user.level,
              

                +        'rights': rights,
              

                +        'goods': goods,
              

                +    })
              

                +
              

                +
              

                +@logit
              

                +def rights(request):
              

                +    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
              

                +    user_id = request.POST.get('user_id', '')
              

                +    level = request.POST.get('level', '')
              

                +
              

                +    # 校验用户是否存在
              

                +    try:
              

                +        user = UserInfo.objects.get(user_id=user_id)
              

                +    except UserInfo.DoesNotExist:
              

                +        return response(UserStatusCode.USER_NOT_FOUND)
              

                +
              

                +    rights = RightInfo.objects.filter(status=True).order_by('position')
              

                +    rights = [right.data for right in rights]
              

                +
              

                +    return response(200, data={
              

                +        'nickname': user.final_nickname,
              

                +        'avatar': user.avatar,
              

                +        'integral': user.integral,
              

                +        'freeze_integral': user.freeze_integral,
              

                +        'final_integral': user.final_integral,
              

                +        'shots_num': user.shots_num,
              

                +        'level': user.level,
              

                +        'rights': rights,
              

                +    })
              

                +
              

                +
              

                +@logit
              

                +def right_detail(request):
              

                +    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
              

                +    user_id = request.POST.get('user_id', '')
              

                +    right_id = request.POST.get('right_id', '')
              

                +
              

                +    try:
              

                +        right = RightInfo.objects.get(right_id=right_id)
              

                +    except RightInfo.DoesNotExist:
              

                +        return response()
              

                +
              

                +    return response(200, data={
              

                +        'right': right.data,
              

                +    })
              

                +
              

                +
              

                +@logit
              

                +def goods(request):
              

                +    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
              

                +    user_id = request.POST.get('user_id', '')
              

                +
              

                +    # 校验用户是否存在
              

                +    try:
              

                +        user = UserInfo.objects.get(user_id=user_id)
              

                +    except UserInfo.DoesNotExist:
              

                +        return response(UserStatusCode.USER_NOT_FOUND)
              

                +
              

                +    raw_goods = GoodsInfo.objects.filter(status=True).order_by('position')
              

                +    banners = goods = []
              

                +    for good in raw_goods:
              

                +        if good.is_slider:
              

                +            banners.append(good.data)
              

                +        else:
              

                +            goods.append(good.data)
              

                +
              

                +    return response(200, data={
              

                +        'nickname': user.final_nickname,
              

                +        'avatar': user.avatar,
              

                +        'integral': user.integral,
              

                +        'freeze_integral': user.freeze_integral,
              

                +        'final_integral': user.final_integral,
              

                +        'shots_num': user.shots_num,
              

                +        'level': user.level,
              

                +        'banners': banners,
              

                +        'goods': goods,
              

                +    })
              

                +
              

                +
              

                +@logit
              

                +def good_detail(request):
              

                +    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
              

                +    user_id = request.POST.get('user_id', '')
              

                +    good_id = request.POST.get('good_id', '')
              

                +
              

                +    # 校验用户是否存在
              

                +    try:
              

                +        user = UserInfo.objects.get(user_id=user_id)
              

                +    except UserInfo.DoesNotExist:
              

                +        return response(UserStatusCode.USER_NOT_FOUND)
              

                +
              

                +    try:
              

                +        good = GoodsInfo.objects.get(good_id=good_id)
              

                +    except GoodsInfo.DoesNotExist:
              

                +        return response()
              

                +
              

                +    return response(200, data={
              

                +        'nickname': user.final_nickname,
              

                +        'avatar': user.avatar,
              

                +        'integral': user.integral,
              

                +        'freeze_integral': user.freeze_integral,
              

                +        'final_integral': user.final_integral,
              

                +        'shots_num': user.shots_num,
              

                +        'level': user.level,
              

                +        'good': good.data,
              

                +    })
              

                +
              

                +
              

                +@logit
              

                +def integrals(request):
              

                +    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
              

                +
              

                +    return response(200, data={
              

                +        'shots_types': get_shot_member_data(),
              

                +        'enable_photo_upvote_integral': True,
              

                +        'photo_upvote_integrals': {
              

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

                +            'ranks': [
              

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

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

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

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

                +            ]
              

                +        },
              

                +        'enable_activity_integral': True,
              

                +    })
              

                +
              

                +
              

                +@logit
              

                +def activity_list(request):
              

                +    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
              

                +
              

                +    raw_activitys = MemberActivityInfo.objects.filter(status=True).order_by('position')
              

                +    banners = activitys = []
              

                +    for act in raw_activitys:
              

                +        if act.is_slider:
              

                +            banners.append(act.data)
              

                +        else:
              

                +            goods.append(act.data)
              

                +
              

                +    return response(200, data={
              

                +        'banners': banners,
              

                +        'activitys': activitys,
              

                +    })
              

                +
              

                +
              

                +@logit
              

                +def activity_detail(request):
              

                +    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
              

                +    activity_id = request.POST.get('activity_id')
              

                +
              

                +    try:
              

                +        act = MemberActivityInfo.objects.get(pk=activity_id, status=True)
              

                +    except MemberActivityInfo.DoesNotExist:
              

                +        return response()
              

                +
              

                +    return response(200, data={
              

                +        'activity': act.data,
              

                +    })
              

api/urls.py

@@ -5,8 +5,8 @@ from django_file_upload import views as file_views

                 
              

                 from account import tourguide_views
              

                 from account import views as account_views
              

                -from api import (admin_views, clerk_views, distributor_views, encrypt_views, mch_views, model_views, operator_views,
              

                -                 sr_views)
              

                +from api import (admin_views, clerk_views, distributor_views, encrypt_views, mch_views, member_views, model_views,
              

                +                 operator_views, sr_views)
              

                 from box import views as box_views
              

                 from geo import views as geo_views
              

                 from group import (groupuser_views, lensman_views, tourguidegroup_views, tourguidegroupadmin_views,
              
@@ -298,3 +298,22 @@ urlpatterns += [

                 urlpatterns += [
              

                     url(r'^supersr/sr/tj$', sales_views.supersr_sr_tj, name='supersr_sr_tj'),
              

                 ]
              

                +
              

                +urlpatterns += [
              

                +    url(r'^member$', member_views.member, name='member'),
              

                +
              

                +    url(r'^member/rights$', member_views.rights, name='member_rights'),
              

                +    url(r'^member/right/detail$', member_views.right_detail, name='member_right_detail'),
              

                +    url(r'^member/goods$', member_views.goods, name='member_goods'),
              

                +    url(r'^member/good/detail$', member_views.good_detail, name='member_good_detail'),
              

                +    url(r'^member/integrals$', member_views.integrals, name='member_integrals'),
              

                +
              

                +    url(r'^member/activity/list$', member_views.activity_list, name='member_activity_list'),
              

                +    url(r'^member/activity/detail$', member_views.activity_detail, name='member_activity_detail'),
              

                +
              

                +    url(r'^rights$', member_views.rights, name='rights'),
              

                +    url(r'^right/detail$', member_views.right_detail, name='right_detail'),
              

                +    url(r'^goods$', member_views.goods, name='goods'),
              

                +    url(r'^good/detail$', member_views.good_detail, name='good_detail'),
              

                +    url(r'^integrals$', member_views.integrals, name='integrals'),
              

                +]
              

integral/migrations/0011_auto_20191119_1348.py

@@ -0,0 +1,25 @@

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

                +# Generated by Django 1.11.26 on 2019-11-19 05:48
              

                +from __future__ import unicode_literals
              

                +
              

                +from django.db import migrations, models
              

                +
              

                +
              

                +class Migration(migrations.Migration):
              

                +
              

                +    dependencies = [
              

                +        ('integral', '0010_auto_20190909_1456'),
              

                +    ]
              

                +
              

                +    operations = [
              

                +        migrations.AddField(
              

                +            model_name='saleclerksubmitloginfo',
              

                +            name='has_scan',
              

                +            field=models.BooleanField(db_index=True, default=False, help_text='\u662f\u5426\u88ab\u6d88\u8d39\u8005\u626b\u8fc7', verbose_name='has_scan'),
              

                +        ),
              

                +        migrations.AddField(
              

                +            model_name='saleclerksubmitloginfo',
              

                +            name='trackingNo',
              

                +            field=models.CharField(blank=True, help_text='\u5feb\u9012\u5355\u53f7', max_length=32, null=True, verbose_name='trackingNo'),
              

                +        ),
              

                +    ]
              

kodo/settings.py

@@ -49,6 +49,7 @@ INSTALLED_APPS = (

                     'django_rlog',
              

                     'django_we',
              

                     'corsheaders',
              

                +    'simditor',
              

                     'api',
              

                     'account',
              

                     'box',
              
@@ -58,6 +59,7 @@ INSTALLED_APPS = (

                     'integral',
              

                     'logs',
              

                     'mch',
              

                +    'member',
              

                     'message',
              

                     'miniapp',
              

                     'operation',
              
@@ -346,6 +348,25 @@ CORS_ORIGIN_WHITELIST = (

                 )
              

                 CORS_ALLOW_CREDENTIALS = True
              

                 
              

                +# 富文本编辑器
              

                +SIMDITOR_UPLOAD_PATH = 'uploads/'
              

                +SIMDITOR_TOOLBAR = [
              

                +    'markdown', 'title', 'bold', 'italic', 'underline', 'strikethrough', 'fontScale',
              

                +    'color', '|', 'ol', 'ul', 'blockquote', 'code', 'table', '|', 'link',
              

                +    'image', 'hr', '|', 'indent', 'outdent', 'alignment', 'checklist', 'fullscreen', 'emoji'
              

                +]
              

                +SIMDITOR_CONFIGS = {
              

                +    'toolbar': SIMDITOR_TOOLBAR,
              

                +    'upload': {
              

                +        'url': '/simditor/upload/',
              

                +        'fileKey': 'upload',
              

                +        'image_size': 1024 * 1024 * 4  # max image size 4MB
              

                +    },
              

                +    'emoji': {
              

                +        'imagePath': '/static/simditor/images/emoji/'
              

                +    }
              

                +}
              

                +
              

                 # 错误信息邮件设置
              

                 # Email address that error messages come from.
              

                 SERVER_EMAIL = 'kimi@pai.ai'
              

mch/admin.py

@@ -10,6 +10,7 @@ from pysnippets.strsnippets import strip

                 
              

                 from mch.models import (ActivityInfo, AdministratorInfo, BrandInfo, ConsumeInfoSubmitLogInfo, DistributorInfo,
              

                                         LatestAppInfo, LatestAppScreenInfo, ModelInfo, OperatorInfo, SaleclerkInfo)
              

                +from utils.redis.rshot import update_shot_member_data
              

                 
              

                 
              

                 class AdministratorInfoAdmin(admin.ModelAdmin):
              
@@ -64,7 +65,7 @@ class BrandInfoAdmin(admin.ModelAdmin):

                 
              

                 class ModelInfoAdmin(admin.ModelAdmin):
              

                     list_display = ('brand_id', 'brand_name', 'jancode', 'model_id', 'model_name', 'model_uni_name', 'model_full_name', 'model_descr', 'category', 'warehouse', 'image', 'url', 'image2', 'factory_yuan', 'integral', 'position', 'display', 'status', 'created_at', 'updated_at')
              

                -    list_filter = ('brand_name', 'category', 'warehouse', 'display', 'status')
              

                +    list_filter = ('brand_name', 'category', 'warehouse', 'shot_type_id', 'display', 'status')
              

                     readonly_fields = ('brand_name', 'factory_fee')
              

                     search_fields = ('brand_id', 'brand_name', 'jancode', 'model_id', 'model_name', 'model_uni_name', 'model_full_name', 'model_descr', 'category', 'warehouse')
              

                 
              
@@ -80,6 +81,12 @@ class ModelInfoAdmin(admin.ModelAdmin):

                 
              

                         obj.save()
              

                 
              

                +        update_shot_member_data()
              

                +
              

                +    def delete_model(self, request, obj):
              

                +        obj.delete()
              

                +        update_shot_member_data()
              

                +
              

                 
              

                 class ModelImageInfoAdmin(admin.ModelAdmin):
              

                     list_display = ('model_id', 'model_name', 'image', 'url', 'position', 'status', 'created_at', 'updated_at')
              

mch/migrations/0039_auto_20191119_1348.py

@@ -0,0 +1,36 @@

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

                +# Generated by Django 1.11.26 on 2019-11-19 05:48
              

                +from __future__ import unicode_literals
              

                +
              

                +from django.db import migrations, models
              

                +import django_models_ext.fileext
              

                +
              

                +
              

                +class Migration(migrations.Migration):
              

                +
              

                +    dependencies = [
              

                +        ('mch', '0038_auto_20190826_1625'),
              

                +    ]
              

                +
              

                +    operations = [
              

                +        migrations.AddField(
              

                +            model_name='modelinfo',
              

                +            name='shot_member_image',
              

                +            field=models.ImageField(blank=True, help_text='\u955c\u5934\u4f1a\u5458\u56fe\u7247', null=True, upload_to=django_models_ext.fileext.upload_path, verbose_name='shot_member_image'),
              

                +        ),
              

                +        migrations.AddField(
              

                +            model_name='modelinfo',
              

                +            name='shot_member_integral',
              

                +            field=models.IntegerField(default=0, help_text='\u955c\u5934\u4f1a\u5458\u79ef\u5206', verbose_name='shot_member_integral'),
              

                +        ),
              

                +        migrations.AddField(
              

                +            model_name='modelinfo',
              

                +            name='shot_type_id',
              

                +            field=models.CharField(blank=True, db_index=True, help_text='\u955c\u5934\u7c7b\u578b\u552f\u4e00\u6807\u8bc6', max_length=32, null=True, verbose_name='shot_type_id'),
              

                +        ),
              

                +        migrations.AddField(
              

                +            model_name='saleclerkinfo',
              

                +            name='is_online_sales',
              

                +            field=models.BooleanField(db_index=True, default=False, help_text='\u662f\u5426\u4e3a\u7f51\u9500', verbose_name='is_online_sales'),
              

                +        ),
              

                +    ]
              

mch/models.py

@@ -161,6 +161,10 @@ class ModelInfo(BaseModelMixin):

                 
              

                     is_important = models.BooleanField(_(u'is_important'), default=False, help_text=_(u'是否重要型号'), db_index=True)
              

                 
              

                +    shot_type_id = models.CharField(_(u'shot_type_id'), max_length=32, blank=True, null=True, help_text=u'镜头类型唯一标识', db_index=True)
              

                +    shot_member_integral = models.IntegerField(_(u'shot_member_integral'), default=0, help_text=u'镜头会员积分')
              

                +    shot_member_image = models.ImageField(_(u'shot_member_image'), upload_to=upload_path, blank=True, null=True, help_text=u'镜头会员图片')
              

                +
              

                     class Meta:
              

                         verbose_name = _(u'型号信息')
              

                         verbose_name_plural = _(u'型号信息')
              
@@ -185,6 +189,14 @@ class ModelInfo(BaseModelMixin):

                         return upload_file_url(self.image2)
              

                 
              

                     @property
              

                +    def shot_member_image_path(self):
              

                +        return upload_file_path(self.shot_member_image)
              

                +
              

                +    @property
              

                +    def shot_member_image_url(self):
              

                +        return upload_file_url(self.shot_member_image)
              

                +
              

                +    @property
              

                     def data(self):
              

                         return {
              

                             'jancode': self.jancode,
              
@@ -228,6 +240,15 @@ class ModelInfo(BaseModelMixin):

                 
              

                     fulldata = admindata
              

                 
              

                +    @property
              

                +    def shot_member_data(self):
              

                +        return {
              

                +            'shot_id': self.model_id,
              

                +            'shot_name': self.model_name,
              

                +            'shot_image': self.shot_member_image_url,
              

                +            'integral': self.shot_member_integral,
              

                +        }
              

                +
              

                 
              

                 class ModelImageInfo(BaseModelMixin):
              

                     model_id = models.CharField(_(u'model_id'), max_length=32, blank=True, null=True, help_text=u'型号唯一标识', db_index=True)
              

member/admin.py

@@ -0,0 +1,38 @@

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

                +
              

                +from django.contrib import admin
              

                +
              

                +from member.models import GoodsInfo, MemberActivityInfo, ShotTypeInfo, RightInfo
              

                +from utils.redis.rshot import update_shot_member_data
              

                +
              

                +
              

                +class GoodsInfoAdmin(admin.ModelAdmin):
              

                +    list_display = ('good_id', 'good_type', 'title', 'desc', 'image', 'is_slider', 'slider_image', 'integral', 'fee', 'minlevel', 'position', 'status', 'created_at', 'updated_at')
              

                +    list_filter = ('is_slider', 'status')
              

                +
              

                +
              

                +class RightInfoAdmin(admin.ModelAdmin):
              

                +    list_display = ('right_id', 'icon', 'title', 'subtitle', 'detail', 'minlevel', 'position', 'status', 'created_at', 'updated_at')
              

                +
              

                +
              

                +class ShotTypeInfoAdmin(admin.ModelAdmin):
              

                +    list_display = ('shot_type_id', 'shot_type_name', 'position', 'status', 'created_at', 'updated_at')
              

                +
              

                +    def save_model(self, request, obj, form, change):
              

                +        obj.save()
              

                +        update_shot_member_data()
              

                +
              

                +    def delete_model(self, request, obj):
              

                +        obj.delete()
              

                +        update_shot_member_data()
              

                +
              

                +
              

                +class MemberActivityInfoAdmin(admin.ModelAdmin):
              

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

                +    list_filter = ('is_slider', 'status')
              

                +
              

                +
              

                +admin.site.register(GoodsInfo, GoodsInfoAdmin)
              

                +admin.site.register(RightInfo, RightInfoAdmin)
              

                +admin.site.register(ShotTypeInfo, ShotTypeInfoAdmin)
              

                +admin.site.register(MemberActivityInfo, MemberActivityInfoAdmin)
              

member/apps.py

@@ -0,0 +1,8 @@

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

                +from __future__ import unicode_literals
              

                +
              

                +from django.apps import AppConfig
              

                +
              

                +
              

                +class MemberConfig(AppConfig):
              

                +    name = 'member'
              

member/migrations/0001_initial.py

@@ -0,0 +1,104 @@

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

                +# Generated by Django 1.11.26 on 2019-11-19 05:48
              

                +from __future__ import unicode_literals
              

                +
              

                +from django.db import migrations, models
              

                +import django_models_ext.fileext
              

                +import shortuuidfield.fields
              

                +import simditor.fields
              

                +
              

                +
              

                +class Migration(migrations.Migration):
              

                +
              

                +    initial = True
              

                +
              

                +    dependencies = [
              

                +    ]
              

                +
              

                +    operations = [
              

                +        migrations.CreateModel(
              

                +            name='GoodsInfo',
              

                +            fields=[
              

                +                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
              

                +                ('status', models.BooleanField(db_index=True, default=True, help_text='Status', verbose_name='status')),
              

                +                ('created_at', models.DateTimeField(auto_now_add=True, help_text='Create Time', verbose_name='created_at')),
              

                +                ('updated_at', models.DateTimeField(auto_now=True, help_text='Update Time', verbose_name='updated_at')),
              

                +                ('good_id', shortuuidfield.fields.ShortUUIDField(blank=True, db_index=True, editable=False, help_text='\u5546\u54c1\u552f\u4e00\u6807\u8bc6', max_length=22, null=True, unique=True)),
              

                +                ('good_type', models.IntegerField(choices=[(0, '\u5b9e\u7269'), (1, '\u865a\u62df')], db_index=True, default=1, help_text='\u5546\u54c1\u7c7b\u578b', verbose_name='good_type')),
              

                +                ('title', models.CharField(blank=True, help_text='\u5546\u54c1\u540d\u79f0', max_length=255, null=True, verbose_name='title')),
              

                +                ('desc', simditor.fields.RichTextField(blank=True, help_text='\u5546\u54c1\u63cf\u8ff0', null=True, verbose_name='desc')),
              

                +                ('image', models.ImageField(blank=True, help_text='\u5546\u54c1\u56fe\u7247', null=True, upload_to=django_models_ext.fileext.upload_path, verbose_name='image')),
              

                +                ('is_slider', models.BooleanField(db_index=True, default=True, help_text='\u662f\u5426\u4e3a\u8f6e\u64ad\u5546\u54c1', verbose_name='is_slider')),
              

                +                ('slider_image', models.ImageField(blank=True, help_text='\u5546\u54c1\u8f6e\u64ad\u56fe\u7247', null=True, upload_to=django_models_ext.fileext.upload_path, verbose_name='slider_image')),
              

                +                ('integral', models.IntegerField(default=99999, help_text='\u5151\u6362\u6240\u9700\u79ef\u5206', verbose_name='integral')),
              

                +                ('fee', models.IntegerField(default=99999, help_text='\u5151\u6362\u9700\u989d\u5916\u652f\u4ed8\u91d1\u989d\uff0c\u5355\u4f4d\u5206', verbose_name='fee')),
              

                +                ('minlevel', models.IntegerField(default=0, help_text='\u5151\u6362\u6700\u4f4e\u4f1a\u5458\u7ea7\u522b', verbose_name='minlevel')),
              

                +                ('position', models.IntegerField(db_index=True, default=1, help_text='\u6392\u5e8f', verbose_name='position')),
              

                +            ],
              

                +            options={
              

                +                'verbose_name': '\u5546\u54c1\u4fe1\u606f',
              

                +                'verbose_name_plural': '\u5546\u54c1\u4fe1\u606f',
              

                +            },
              

                +        ),
              

                +        migrations.CreateModel(
              

                +            name='MemberActivityInfo',
              

                +            fields=[
              

                +                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
              

                +                ('status', models.BooleanField(db_index=True, default=True, help_text='Status', verbose_name='status')),
              

                +                ('created_at', models.DateTimeField(auto_now_add=True, help_text='Create Time', verbose_name='created_at')),
              

                +                ('updated_at', models.DateTimeField(auto_now=True, help_text='Update Time', verbose_name='updated_at')),
              

                +                ('title', models.CharField(blank=True, help_text='\u6d3b\u52a8\u540d\u79f0', max_length=255, null=True, verbose_name='title')),
              

                +                ('subtitle', models.CharField(blank=True, help_text='\u6d3b\u52a8\u4e8c\u7ea7\u540d\u79f0', max_length=255, null=True, verbose_name='subtitle')),
              

                +                ('date', models.DateField(blank=True, help_text='\u6d3b\u52a8\u65f6\u95f4', null=True, verbose_name='date')),
              

                +                ('location', models.CharField(blank=True, help_text='\u6d3b\u52a8\u5730\u70b9', max_length=255, null=True, verbose_name='location')),
              

                +                ('image', models.ImageField(blank=True, help_text='\u6d3b\u52a8\u5185\u5bb9\u56fe\u7247', null=True, upload_to=django_models_ext.fileext.upload_path, verbose_name='image')),
              

                +                ('cover', models.ImageField(blank=True, help_text='\u6d3b\u52a8\u5217\u8868\u56fe\u7247', null=True, upload_to=django_models_ext.fileext.upload_path, verbose_name='cover')),
              

                +                ('is_slider', models.BooleanField(db_index=True, default=True, help_text='\u662f\u5426\u4e3a\u8f6e\u64ad\u6d3b\u52a8', verbose_name='is_slider')),
              

                +                ('slider_image', models.ImageField(blank=True, help_text='\u6d3b\u52a8\u8f6e\u64ad\u56fe\u7247', null=True, upload_to=django_models_ext.fileext.upload_path, verbose_name='slider_image')),
              

                +                ('content_rich_text', simditor.fields.RichTextField(blank=True, help_text='\u6d3b\u52a8\u63cf\u8ff0', null=True, verbose_name='content_rich_text')),
              

                +                ('share_img_link', models.CharField(blank=True, help_text='\u6d3b\u52a8\u56fe\u7247\u5206\u4eab', max_length=255, null=True, verbose_name='share_img_link')),
              

                +                ('share_h5_link', models.CharField(blank=True, help_text='\u6d3b\u52a8H5\u5206\u4eab', max_length=255, null=True, verbose_name='share_h5_link')),
              

                +                ('position', models.IntegerField(db_index=True, default=1, help_text='\u6392\u5e8f', verbose_name='position')),
              

                +            ],
              

                +            options={
              

                +                'verbose_name': '\u4f1a\u5458\u6d3b\u52a8\u4fe1\u606f',
              

                +                'verbose_name_plural': '\u4f1a\u5458\u6d3b\u52a8\u4fe1\u606f',
              

                +            },
              

                +        ),
              

                +        migrations.CreateModel(
              

                +            name='RightInfo',
              

                +            fields=[
              

                +                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
              

                +                ('status', models.BooleanField(db_index=True, default=True, help_text='Status', verbose_name='status')),
              

                +                ('created_at', models.DateTimeField(auto_now_add=True, help_text='Create Time', verbose_name='created_at')),
              

                +                ('updated_at', models.DateTimeField(auto_now=True, help_text='Update Time', verbose_name='updated_at')),
              

                +                ('right_id', shortuuidfield.fields.ShortUUIDField(blank=True, db_index=True, editable=False, help_text='\u6743\u76ca\u552f\u4e00\u6807\u8bc6', max_length=22, null=True, unique=True)),
              

                +                ('icon', models.ImageField(blank=True, help_text='\u6743\u76ca\u56fe\u6807', null=True, upload_to=django_models_ext.fileext.upload_path, verbose_name='icon')),
              

                +                ('title', models.CharField(blank=True, help_text='\u6743\u76ca\u540d\u79f0', max_length=255, null=True, verbose_name='title')),
              

                +                ('subtitle', models.CharField(blank=True, help_text='\u6743\u76ca\u4e8c\u7ea7\u540d\u79f0', max_length=255, null=True, verbose_name='subtitle')),
              

                +                ('detail', simditor.fields.RichTextField(blank=True, help_text='\u6743\u76ca\u8be6\u60c5', null=True, verbose_name='detail')),
              

                +                ('minlevel', models.IntegerField(default=0, help_text='\u6743\u76ca\u6700\u4f4e\u4f1a\u5458\u7ea7\u522b', verbose_name='minlevel')),
              

                +                ('position', models.IntegerField(db_index=True, default=1, help_text='\u6392\u5e8f', verbose_name='position')),
              

                +            ],
              

                +            options={
              

                +                'verbose_name': '\u6743\u76ca\u4fe1\u606f',
              

                +                'verbose_name_plural': '\u6743\u76ca\u4fe1\u606f',
              

                +            },
              

                +        ),
              

                +        migrations.CreateModel(
              

                +            name='ShotTypeInfo',
              

                +            fields=[
              

                +                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
              

                +                ('status', models.BooleanField(db_index=True, default=True, help_text='Status', verbose_name='status')),
              

                +                ('created_at', models.DateTimeField(auto_now_add=True, help_text='Create Time', verbose_name='created_at')),
              

                +                ('updated_at', models.DateTimeField(auto_now=True, help_text='Update Time', verbose_name='updated_at')),
              

                +                ('shot_type_id', shortuuidfield.fields.ShortUUIDField(blank=True, db_index=True, editable=False, help_text='\u955c\u5934\u7c7b\u578b\u552f\u4e00\u6807\u8bc6', max_length=22, null=True, unique=True)),
              

                +                ('shot_type_name', models.CharField(blank=True, help_text='\u955c\u5934\u7c7b\u578b\u540d\u79f0', max_length=255, null=True, verbose_name='shot_type_name')),
              

                +                ('position', models.IntegerField(db_index=True, default=1, help_text='\u6392\u5e8f', verbose_name='position')),
              

                +            ],
              

                +            options={
              

                +                'verbose_name': '\u955c\u5934\u7c7b\u578b\u4fe1\u606f',
              

                +                'verbose_name_plural': '\u955c\u5934\u7c7b\u578b\u4fe1\u606f',
              

                +            },
              

                +        ),
              

                +    ]
              

member/models.py

@@ -0,0 +1,211 @@

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

                +
              

                +from django.db import models
              

                +from django.utils.translation import ugettext_lazy as _
              

                +from django_models_ext import BaseModelMixin, upload_file_path, upload_file_url, upload_path
              

                +from simditor.fields import RichTextField
              

                +from shortuuidfield import ShortUUIDField
              

                +
              

                +from mch.models import ModelInfo
              

                +
              

                +
              

                +class GoodsInfo(BaseModelMixin):
              

                +    PHYSICAL = 0
              

                +    VIRTUAL = 1
              

                +
              

                +    GOOD_TYPE_TUPLE = (
              

                +        (PHYSICAL, u'实物'),
              

                +        (VIRTUAL, u'虚拟'),
              

                +    )
              

                +
              

                +    good_id = ShortUUIDField(_(u'good_id'), max_length=32, blank=True, null=True, help_text=u'商品唯一标识', db_index=True, unique=True)
              

                +    good_type = models.IntegerField(_(u'good_type'), choices=GOOD_TYPE_TUPLE, default=VIRTUAL, help_text=u'商品类型', db_index=True)
              

                +
              

                +    title = models.CharField(_(u'title'), max_length=255, blank=True, null=True, help_text=u'商品名称')
              

                +    desc = RichTextField(_(u'desc'), blank=True, null=True, help_text=u'商品描述')
              

                +
              

                +    image = models.ImageField(_(u'image'), upload_to=upload_path, blank=True, null=True, help_text=u'商品图片')
              

                +
              

                +    is_slider = models.BooleanField(_(u'is_slider'), default=True, help_text=_(u'是否为轮播商品'), db_index=True)
              

                +    slider_image = models.ImageField(_(u'slider_image'), upload_to=upload_path, blank=True, null=True, help_text=u'商品轮播图片')
              

                +
              

                +    integral = models.IntegerField(_(u'integral'), default=99999, help_text=u'兑换所需积分')
              

                +    fee = models.IntegerField(_(u'fee'), default=99999, help_text=u'兑换需额外支付金额，单位分')
              

                +
              

                +    minlevel = models.IntegerField(_(u'minlevel'), default=0, help_text=u'兑换最低会员级别')
              

                +
              

                +    position = models.IntegerField(_(u'position'), default=1, help_text=u'排序', db_index=True)
              

                +
              

                +    class Meta:
              

                +        verbose_name = _(u'会员商品信息')
              

                +        verbose_name_plural = _(u'会员商品信息')
              

                +
              

                +    def __unicode__(self):
              

                +        return unicode(self.pk)
              

                +
              

                +    @property
              

                +    def image_path(self):
              

                +        return upload_file_path(self.image)
              

                +
              

                +    @property
              

                +    def image_url(self):
              

                +        return upload_file_url(self.image)
              

                +
              

                +    @property
              

                +    def slider_image_path(self):
              

                +        return upload_file_path(self.slider_image)
              

                +
              

                +    @property
              

                +    def slider_image_url(self):
              

                +        return upload_file_url(self.slider_image)
              

                +
              

                +    @property
              

                +    def data(self):
              

                +        return {
              

                +            'good_id': self.good_id,
              

                +            'good_type': self.good_type,
              

                +            'title': self.title,
              

                +            'desc': self.desc,
              

                +            'image': self.image_url,
              

                +            'slider_image': self.slider_image_url,
              

                +            'integral': self.integral,
              

                +            'fee': self.fee,
              

                +            'minlevel': self.minlevel,
              

                +            'able': True,
              

                +        }
              

                +
              

                +
              

                +class RightInfo(BaseModelMixin):
              

                +    right_id = ShortUUIDField(_(u'right_id'), max_length=32, blank=True, null=True, help_text=u'权益唯一标识', db_index=True, unique=True)
              

                +
              

                +    icon = models.ImageField(_(u'icon'), upload_to=upload_path, blank=True, null=True, help_text=u'权益图标')
              

                +    title = models.CharField(_(u'title'), max_length=255, blank=True, null=True, help_text=u'权益名称')
              

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

                +    detail = RichTextField(_(u'detail'), blank=True, null=True, help_text=u'权益详情')
              

                +
              

                +    minlevel = models.IntegerField(_(u'minlevel'), default=0, help_text=u'权益最低会员级别')
              

                +
              

                +    position = models.IntegerField(_(u'position'), default=1, help_text=u'排序', db_index=True)
              

                +
              

                +    class Meta:
              

                +        verbose_name = _(u'会员权益信息')
              

                +        verbose_name_plural = _(u'会员权益信息')
              

                +
              

                +    def __unicode__(self):
              

                +        return unicode(self.pk)
              

                +
              

                +    @property
              

                +    def icon_path(self):
              

                +        return upload_file_path(self.icon)
              

                +
              

                +    @property
              

                +    def icon_url(self):
              

                +        return upload_file_url(self.icon)
              

                +
              

                +    @property
              

                +    def data(self):
              

                +        return {
              

                +            'right_id': self.right_id,
              

                +            'icon': self.icon_url,
              

                +            'title': self.title,
              

                +            'subtitle': self.subtitle,
              

                +            'detail': self.detail,
              

                +            'minlevel': self.minlevel,
              

                +            "able": True,
              

                +            "left_num": 3,
              

                +            "left_tip": 3,
              

                +        }
              

                +
              

                +
              

                +class ShotTypeInfo(BaseModelMixin):
              

                +    shot_type_id = ShortUUIDField(_(u'shot_type_id'), max_length=32, blank=True, null=True, help_text=u'镜头类型唯一标识', db_index=True, unique=True)
              

                +    shot_type_name = models.CharField(_(u'shot_type_name'), max_length=255, blank=True, null=True, help_text=u'镜头类型名称')
              

                +
              

                +    position = models.IntegerField(_(u'position'), default=1, help_text=u'排序', db_index=True)
              

                +
              

                +    class Meta:
              

                +        verbose_name = _(u'镜头类型信息')
              

                +        verbose_name_plural = _(u'镜头类型信息')
              

                +
              

                +    def __unicode__(self):
              

                +        return unicode(self.pk)
              

                +
              

                +    @property
              

                +    def shots(self):
              

                +        models = ModelInfo.objects.filter(shot_type_id=self.shot_type_id, status=True)
              

                +        return [model.shot_data for model in models]
              

                +
              

                +    @property
              

                +    def data(self):
              

                +        return {
              

                +            'type_id': self.shot_type_id,
              

                +            'type_name': self.shot_type_name,
              

                +            'shots': self.shots,
              

                +        }
              

                +
              

                +
              

                +class MemberActivityInfo(BaseModelMixin):
              

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

                +    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'活动时间')
              

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

                +
              

                +    image = models.ImageField(_(u'image'), upload_to=upload_path, blank=True, null=True, help_text=u'活动内容图片')
              

                +
              

                +    cover = models.ImageField(_(u'cover'), upload_to=upload_path, blank=True, null=True, help_text=u'活动列表图片')
              

                +
              

                +    is_slider = models.BooleanField(_(u'is_slider'), default=True, help_text=_(u'是否为轮播活动'), db_index=True)
              

                +    slider_image = models.ImageField(_(u'slider_image'), upload_to=upload_path, blank=True, null=True, help_text=u'活动轮播图片')
              

                +
              

                +    content_rich_text = RichTextField(_(u'content_rich_text'), blank=True, null=True, help_text=u'活动描述')
              

                +
              

                +    share_img_link = models.CharField(_(u'share_img_link'), max_length=255, blank=True, null=True, help_text=u'活动图片分享')
              

                +    share_h5_link = models.CharField(_(u'share_h5_link'), max_length=255, blank=True, null=True, help_text=u'活动H5分享')
              

                +
              

                +    position = models.IntegerField(_(u'position'), default=1, help_text=u'排序', db_index=True)
              

                +
              

                +    class Meta:
              

                +        verbose_name = _(u'会员活动信息')
              

                +        verbose_name_plural = _(u'会员活动信息')
              

                +
              

                +    def __unicode__(self):
              

                +        return unicode(self.pk)
              

                +
              

                +    @property
              

                +    def image_path(self):
              

                +        return upload_file_path(self.image)
              

                +
              

                +    @property
              

                +    def image_url(self):
              

                +        return upload_file_url(self.image)
              

                +
              

                +    @property
              

                +    def cover_path(self):
              

                +        return upload_file_path(self.cover)
              

                +
              

                +    @property
              

                +    def cover_url(self):
              

                +        return upload_file_url(self.cover)
              

                +
              

                +    @property
              

                +    def slider_image_path(self):
              

                +        return upload_file_path(self.slider_image)
              

                +
              

                +    @property
              

                +    def slider_image_url(self):
              

                +        return upload_file_url(self.slider_image)
              

                +
              

                +    @property
              

                +    def data(self):
              

                +        return {
              

                +            'id': self.pk,
              

                +            'title': self.title,
              

                +            'subtitle': self.subtitle,
              

                +            'date': self.date,
              

                +            'location': self.location,
              

                +            'cover_url': self.cover_url,
              

                +            'content_rich_text': self.content_rich_text,
              

                +            'state': 0,
              

                +            'is_signed': 0,
              

                +        }
              

member/tests.py

@@ -0,0 +1,7 @@

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

                +from __future__ import unicode_literals
              

                +
              

                +from django.test import TestCase
              

                +
              

                +
              

                +# Create your tests here.
              

member/views.py

@@ -0,0 +1,7 @@

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

                +from __future__ import unicode_literals
              

                +
              

                +from django.shortcuts import render
              

                +
              

                +
              

                +# Create your views here.
              

pre/views.py

@@ -2,11 +2,11 @@

                 
              

                 from __future__ import division
              

                 
              

                +import xlrd
              

                 from django.conf import settings
              

                 from pysnippets.strsnippets import strip
              

                 from TimeConvert import TimeConvert as tc
              

                 
              

                -import xlrd
              

                 from mch.models import BrandInfo, ConsumeInfoSubmitLogInfo, DistributorInfo, ModelInfo
              

                 from statistic.models import (ConsumeDistributorSaleStatisticInfo, ConsumeModelSaleStatisticInfo,
              

                                               ConsumeProvinceSaleStatisticInfo, ConsumeSaleStatisticInfo, ConsumeUserStatisticInfo,
              

requirements.txt

@@ -1,15 +1,15 @@

                 CodeConvert==2.0.5
              

                -MySQL-python==1.2.5
              

                 Pillow==5.0.0
              

                 StatusCode==1.0.0
              

                 TimeConvert==1.5.0
              

                -furl==2.0.0
              

                +furl==2.1.0
              

                 isoweek==1.3.3
              

                 jsonfield==2.0.2
              

                 mock==2.0.0
              

                 monetary==1.0.3
              

                -pysnippets==1.0.8
              

                -qiniu==7.2.2
              

                +mysqlclient==1.4.5
              

                +pysnippets==1.1.2
              

                +qiniu==7.2.6
              

                 requests==2.21.0
              

                 rlog==0.3
              

                 rsa==3.4.2
              

requirements_dj.txt

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

                -Django==1.11.25
              

                +Django==1.11.26
              

                 django-admin==2.0.0
              

                -django-cors-headers==2.4.0
              

                +django-cors-headers==3.0.2
              

                 django-curtail-uuid==1.0.4
              

                -django-detect==1.0.8
              

                +django-detect==1.0.16
              

                 django-file-md5==1.0.3
              

                 django-file-upload==1.1.1
              

                 django-ip==1.0.2
              

                -django-json-render==1.0.2
              

                +django-json-render==1.0.3
              

                 django-json-response==1.1.5
              

                 django-logit==1.1.3
              

                 django-mobi==0.1.7
              

                 django-models-ext==1.1.9
              

                 django-multidomain==1.1.4
              

                 django-paginator2==1.1.3
              

                -django-query==1.0.3
              

                -django-redis-connector==1.0.1
              

                +django-query==1.0.6
              

                +django-redis-connector==1.0.3
              

                 django-response==1.1.1
              

                 django-rlog==1.0.7
              

                 django-shortuuidfield==0.1.3
              

requirements_pywe.txt

@@ -4,7 +4,7 @@ pywe-jssdk==1.1.0

                 pywe-membercard==1.0.1
              

                 pywe-miniapp==1.1.5
              

                 pywe-oauth==1.0.7
              

                -pywe-pay==1.0.12
              

                +pywe-pay==1.0.13
              

                 pywe-pay-notify==1.0.4
              

                 pywe-response==1.0.1
              

                 pywe-sign==1.1.0
              

requirements_redis.txt

@@ -1,3 +1,3 @@

                -hiredis==1.0.0
              

                +hiredis==1.0.1
              

                 redis==2.10.6
              

                 redis-extensions==1.2.5
              

simditor/fields.py

@@ -0,0 +1,36 @@

                +# -- coding: utf-8 --
              

                +"""simditor fields."""
              

                +from django import forms
              

                +from django.db import models
              

                +
              

                +from .widgets import SimditorWidget
              

                +
              

                +
              

                +class RichTextFormField(forms.fields.CharField):
              

                +    """RichTextFormField."""
              

                +
              

                +    def __init__(self, *args, **kwargs):
              

                +        kwargs.update(
              

                +            {
              

                +                'widget': SimditorWidget()
              

                +            }
              

                +        )
              

                +        super(RichTextFormField, self).__init__(*args, **kwargs)
              

                +
              

                +
              

                +class RichTextField(models.TextField):
              

                +    """RichTextField."""
              

                +
              

                +    def __init__(self, *args, **kwargs):
              

                +        super(RichTextField, self).__init__(*args, **kwargs)
              

                +
              

                +    def formfield(self, **kwargs):
              

                +        defaults = {
              

                +            'form_class': self._get_form_class()
              

                +        }
              

                +        defaults.update(kwargs)
              

                +        return super(RichTextField, self).formfield(**defaults)
              

                +
              

                +    @staticmethod
              

                +    def _get_form_class():
              

                +        return RichTextFormField
              

simditor/image/dummy_backend.py

@@ -0,0 +1,11 @@

                +# -- coding: utf-8 --
              

                +"""simditor image pillow_backend."""
              

                +from __future__ import absolute_import
              

                +
              

                +from simditor import utils
              

                +
              

                +
              

                +def image_verify(file_object):
              

                +    """image_verify."""
              

                +    if not utils.is_valid_image_extension(file_object.name):
              

                +        raise utils.NotAnImageException
              

simditor/image/pillow_backend.py

@@ -0,0 +1,28 @@

                +# -- coding: utf-8 --
              

                +"""simditor image pillow_backend."""
              

                +from __future__ import absolute_import
              

                +
              

                +import os
              

                +from io import BytesIO
              

                +
              

                +from django.core.files.storage import default_storage
              

                +from django.core.files.uploadedfile import InMemoryUploadedFile
              

                +
              

                +from simditor import utils
              

                +
              

                +
              

                +try:
              

                +    from PIL import Image, ImageOps
              

                +except ImportError:
              

                +    import Image
              

                +    import ImageOps
              

                +
              

                +
              

                +THUMBNAIL_SIZE = (75, 75)
              

                +
              

                +
              

                +def image_verify(f):
              

                +    try:
              

                +        Image.open(f).verify()
              

                +    except IOError:
              

                +        raise utils.NotAnImageException
              

simditor/image_processing.py

@@ -0,0 +1,16 @@

                +# -- coding: utf-8 --
              

                +"""simditor image_processing."""
              

                +from __future__ import absolute_import
              

                +
              

                +from django.conf import settings
              

                +
              

                +
              

                +def get_backend():
              

                +    """Get backend."""
              

                +    backend = getattr(settings, 'SIMDITOR_IMAGE_BACKEND', None)
              

                +
              

                +    if backend == 'pillow':
              

                +        from simditor.image import pillow_backend as backend
              

                +    else:
              

                +        from simditor.image import dummy_backend as backend
              

                +    return backend
              

simditor/static/simditor/fonts/icomoon.svg

@@ -0,0 +1,11 @@

                +<?xml version="1.0" standalone="no"?>
              

                +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
              

                +<svg xmlns="http://www.w3.org/2000/svg">
              

                +<metadata>Generated by IcoMoon</metadata>
              

                +<defs>
              

                +<font id="icomoon" horiz-adv-x="512">
              

                +<font-face units-per-em="512" ascent="480" descent="-32" />
              

                +<missing-glyph horiz-adv-x="512" />
              

                +<glyph unicode="&#x20;" d="" horiz-adv-x="256" />
              

                +<glyph unicode="&#xe600;" d="M438.624 86.624l-73.376 73.376-45.248-45.248 73.376-73.376-73.376-73.376h192v192zM192 480h-192v-192l73.376 73.376 72.688-72.624 45.248 45.248-72.688 72.624zM192 114.752l-45.248 45.248-73.376-73.376-73.376 73.376v-192h192l-73.376 73.376zM512 480h-192l73.376-73.376-72.688-72.624 45.248-45.248 72.688 72.624 73.376-73.376z" />
              

                +</font></defs></svg>
              

simditor/static/simditor/fonts/selection.json

@@ -0,0 +1,82 @@

                +{
              

                +	"IcoMoonType": "selection",
              

                +	"icons": [
              

                +		{
              

                +			"icon": {
              

                +				"paths": [
              

                +					"M877.248 786.752l-146.752-146.752-90.496 90.496 146.752 146.752-146.752 146.752h384v-384zM384 0h-384v384l146.752-146.752 145.376 145.248 90.496-90.496-145.376-145.248zM384 730.496l-90.496-90.496-146.752 146.752-146.752-146.752v384h384l-146.752-146.752zM1024 0h-384l146.752 146.752-145.376 145.248 90.496 90.496 145.376-145.248 146.752 146.752z"
              

                +				],
              

                +				"tags": [
              

                +					"fullscreen",
              

                +					"expand"
              

                +				],
              

                +				"grid": 16,
              

                +				"attrs": []
              

                +			},
              

                +			"attrs": [],
              

                +			"properties": {
              

                +				"id": 99,
              

                +				"order": 2,
              

                +				"prevSize": 16,
              

                +				"code": 58880,
              

                +				"name": "fullscreen"
              

                +			},
              

                +			"setIdx": 1,
              

                +			"setId": 6,
              

                +			"iconIdx": 99
              

                +		}
              

                +	],
              

                +	"height": 1024,
              

                +	"metadata": {
              

                +		"name": "icomoon"
              

                +	},
              

                +	"preferences": {
              

                +		"fontPref": {
              

                +			"prefix": "icon-",
              

                +			"metadata": {
              

                +				"fontFamily": "icomoon",
              

                +				"majorVersion": 1,
              

                +				"minorVersion": 0
              

                +			},
              

                +			"showGlyphs": true,
              

                +			"metrics": {
              

                +				"emSize": 512,
              

                +				"baseline": 6.25,
              

                +				"whitespace": 50
              

                +			},
              

                +			"resetPoint": 58880,
              

                +			"showQuickUse": true,
              

                +			"quickUsageToken": false,
              

                +			"showMetrics": false,
              

                +			"showMetadata": false,
              

                +			"autoHost": true,
              

                +			"embed": false,
              

                +			"ie7": false,
              

                +			"showSelector": false,
              

                +			"showVersion": true
              

                +		},
              

                +		"imagePref": {
              

                +			"color": 0,
              

                +			"height": 32,
              

                +			"columns": 16,
              

                +			"margin": 16,
              

                +			"png": false,
              

                +			"sprites": true,
              

                +			"prefix": "icon-"
              

                +		},
              

                +		"historySize": 100,
              

                +		"showCodes": true,
              

                +		"gridSize": 16,
              

                +		"showLiga": false,
              

                +		"showGrid": true,
              

                +		"showGlyphs": true,
              

                +		"showQuickUse": true,
              

                +		"search": "",
              

                +		"quickUsageToken": {
              

                +			"UntitledProject1": "ZWEwOTk2NTRmNjMyOGQ1MzAwZWFiYmJlODViMWMzZDcjMiMxNDA3NzM0MTA2IyMj"
              

                +		},
              

                +		"showQuickUse2": true,
              

                +		"showSVGs": true,
              

                +		"fontHostingName": false
              

                +	}
              

                +}
              

simditor/static/simditor/images/emoji/emojify.css

@@ -0,0 +1 @@