Sign In

9 年之前 · 22b9954f45
--- a/group/views.py
+++ b/group/views.py
@@ -175,7 +175,7 @@ def group_list_api(request):
 
                     """ 群组列表 """
              
 
                     user_id = request.POST.get('user_id', '')
              
 
                     page = int(request.POST.get('page', 1))
              
 
                -    num = int(request.POST.get('num', settings.GROUP_PER_PAGE))
              
 
                +    num = int(request.POST.get('num', settings.GROUP_NUM_PER_PAGE))
              
 
                 
              
 
                     group_users = GroupUserInfo.objects.filter(user_id=user_id, user_status=GroupUserInfo.PASSED, status=True).order_by('-pk')
              
 
                     group_users, left = pagination(group_users, page, num)
              
--- a/message/views.py
+++ b/message/views.py
@@ -43,8 +43,8 @@ def message_list_api(request):
 
                 def message_type_list_api(request, msg_type):
              
 
                     """ 分类消息列表 """
              
 
                     user_id = request.POST.get('user_id', '') or request.GET.get('user_id', '')
              
 
                -    page = int(request.POST.get('page', 0) or request.GET.get('page', 0) or 1)
              
 
                -    num = int(request.POST.get('num', 0) or request.GET.get('num', 0) or settings.MESSAGE_NUM_PER_PAGE)
              
 
                +    page = int(request.POST.get('page') or request.GET.get('page') or 1)
              
 
                +    num = int(request.POST.get('num') or request.GET.get('num') or settings.MESSAGE_NUM_PER_PAGE)
              
 
                 
              
 
                     if msg_type == UserMessageInfo.SYSTEM:
              
 
                         type_messages = system_messages(user_id, SystemMessageInfo.PAIAI_USER)
              
--- a/pai2/settings.py
+++ b/pai2/settings.py
@@ -230,7 +230,7 @@ FILE_UPLOAD_MAX_MEMORY_SIZE = 5242880  # InMemoryUploadedFile 文件最大值
 
                 FILE_UPLOAD_PERMISSIONS = 0o644  # TemporaryUploadedFile 文件权限设置
              
 
                 
              
 
                 # 唯一标识设置
              
 
                -CURTAIL_UUID_LENGTH = 7
              
 
                +CURTAIL_UUID_LENGTH = 7  # Used in django-curtail-uuid==1.0.0
              
 
                 
              
 
                 # 水印设置
              
 
                 WATERMARK_LOGO = os.path.join(PROJ_DIR, 'static/pai2/img/paiai_96_96.png').replace('\\', '/')
              
@@ -269,9 +269,6 @@ PAI2_LENSMAN_DOWNLOAD_IOS_URL = 'https://pai.ai'
 
                 PAI2_TOURGUIDE_DOWNLOAD_WX_URL = 'https://pai.ai'
              
 
                 PAI2_TOURGUIDE_DOWNLOAD_IOS_URL = 'https://pai.ai'
              
 
                 
              
 
                -# 群组设置
              
 
                -GROUP_PER_PAGE = 20  # 群组每页数量
              
 
                -
              
 
                 # 游客设置
              
 
                 PAI2_TOURGUIDE_GUEST_UNIONID = 'oCGajv3Slxef2RuM4Sr-S2jTZwD4'
              
 
                 
              
@@ -280,7 +277,9 @@ MIN_VERSION = '0.0.0'
 
                 MAX_VERSION = '999.999.999'
              
 
                 CURRENT_VERSION = '1.0.0'
              
 
                 
              
 
                -# 订单设置
              
 
                +# 页码设置
              
 
                +GROUP_NUM_PER_PAGE = 20  # 群组每页数量
              
 
                +MESSAGE_NUM_PER_PAGE = 10  # 消息每页数量
              
 
                 ORDER_NUM_PER_PAGE = 10  # 订单每页数量
              
 
                 
              
 
                 # 域名设置
              
@@ -295,8 +294,7 @@ SYSTEM_MESSAGE_AVATAR = PAI2_LOGO_URL
 
                 COMMENT_MESSAGE_AVATAR = PAI2_LOGO_URL
              
 
                 THUMBUP_MESSAGE_AVATAR = PAI2_LOGO_URL
              
 
                 
              
 
                -MESSAGE_NUM_PER_PAGE = 10  # 消息每页数量
              
 
                -
              
 
                +# LOGIT 设置
              
 
                 LOGIT_BODY_FLAG = True
              
 
                 LOGIT_RES_FLAG = True
              
 
                 
              
@@ -332,7 +330,7 @@ try:
 
                 except ImportError:
              
 
                     REDIS_CACHE = None
              
 
                 
              
 
                -# logger setting
              
 
                +# 日志设置
              
 
                 LOGGING = {
              
 
                     'version': 1,
              
 
                     'disable_existing_loggers': False,

..
__init__.py	290ff6960f	pyzbar	преди 7 години
zbar.jpg	290ff6960f	pyzbar	преди 7 години
zbar.py	3e9628d0c9	iSort & Pycodestyle	преди 6 години
zbar2.py	b9de70e7be	:art: Change print to print()	преди 6 години