:bug: Fix Bug: TypeError: can only concatenate str (not relativedelta) to str
huangqimin001
共有 4 個文件被更改，包括 15 次插入 和 15 次删除
+ 5
- 5
api/admin_views.py
@@ -864,10 +864,10 @@ def member_activity_create(request, administrator): |
||
| 864 | 864 |
activity_type = int(request.POST.get('activity_type', 0))
|
| 865 | 865 |
title = request.POST.get('title', '')
|
| 866 | 866 |
subtitle = request.POST.get('subtitle', '')
|
| 867 |
- start_date = request.POST.get('start_date', '') or settings.DEFAULT_START_DATE
|
|
| 868 |
- end_date = date = request.POST.get('date', '') or request.POST.get('end_date', '') or settings.DEFAULT_END_DATE
|
|
| 869 |
- start_display_date = request.POST.get('start_display_date', '') or settings.DEFAULT_START_DATE
|
|
| 870 |
- end_display_date = request.POST.get('end_display_date', '') or settings.DEFAULT_END_DATE
|
|
| 867 |
+ start_date = tc.to_date(request.POST.get('start_date', '') or settings.DEFAULT_START_DATE)
|
|
| 868 |
+ end_date = date = tc.to_date(request.POST.get('date', '') or request.POST.get('end_date', '') or settings.DEFAULT_END_DATE)
|
|
| 869 |
+ start_display_date = tc.to_date(request.POST.get('start_display_date', '') or settings.DEFAULT_START_DATE)
|
|
| 870 |
+ end_display_date = tc.to_date(request.POST.get('end_display_date', '') or settings.DEFAULT_END_DATE)
|
|
| 871 | 871 |
city = request.POST.get('city', '')
|
| 872 | 872 |
location = request.POST.get('location', '')
|
| 873 | 873 |
integral = int(request.POST.get('integral', 0))
|
@@ -914,7 +914,7 @@ def member_activity_create(request, administrator): |
||
| 914 | 914 |
) |
| 915 | 915 |
|
| 916 | 916 |
return response(200, 'MemberActivityInfo Create Success', u'会员活动创建成功', data={
|
| 917 |
- activity: act.admindetails |
|
| 917 |
+ 'activity': act.admindetails |
|
| 918 | 918 |
}) |
| 919 | 919 |
|
| 920 | 920 |
|
+ 7
- 7
requirements.txt
@@ -1,7 +1,7 @@ |
||
| 1 | 1 |
CodeConvert==3.0.2 |
| 2 | 2 |
Pillow==9.2.0 |
| 3 | 3 |
StatusCode==1.0.0 |
| 4 |
-TimeConvert==2.0.4 |
|
| 4 |
+TimeConvert==3.0.9 |
|
| 5 | 5 |
furl==2.1.3 |
| 6 | 6 |
isoweek==1.3.3 |
| 7 | 7 |
jsonfield==3.1.0 |
@@ -9,13 +9,13 @@ mock==4.0.3 |
||
| 9 | 9 |
monetary==1.0.3 |
| 10 | 10 |
mysqlclient==2.1.1 |
| 11 | 11 |
pysnippets==1.1.4 |
| 12 |
-pyzbar==0.1.8 |
|
| 13 |
-qiniu==7.5.0 |
|
| 14 |
-requests==2.26.0 |
|
| 12 |
+pyzbar==0.1.9 |
|
| 13 |
+qiniu==7.9.0 |
|
| 14 |
+requests==2.28.1 |
|
| 15 | 15 |
rlog==0.3 |
| 16 |
-rsa==4.7.2 |
|
| 17 |
-shortuuid==1.0.1 |
|
| 18 |
-versions==0.10.0 |
|
| 16 |
+rsa==4.9 |
|
| 17 |
+shortuuid==1.0.9 |
|
| 18 |
+versions==1.3.0 |
|
| 19 | 19 |
xlrd==2.0.1 |
| 20 | 20 |
-r requirements_dj.txt |
| 21 | 21 |
-r requirements_pywe.txt |
+ 2
- 2
requirements_dj.txt
@@ -1,6 +1,6 @@ |
||
| 1 | 1 |
Django==3.2.16 |
| 2 | 2 |
django-admin==2.0.1 |
| 3 |
-django-cors-headers==3.10.0 |
|
| 3 |
+django-cors-headers==3.13.0 |
|
| 4 | 4 |
django-curtail-uuid==1.0.4 |
| 5 | 5 |
django-daterange-filter==1.3.0 |
| 6 | 6 |
django-detect==1.0.20 |
@@ -20,7 +20,7 @@ django-redis-connector==1.0.4 |
||
| 20 | 20 |
django-response==1.1.1 |
| 21 | 21 |
django-rlog==1.0.7 |
| 22 | 22 |
django-shortuuidfield==0.1.3 |
| 23 |
-django-simpleui==3.9.1 |
|
| 23 |
+django-simpleui==2022.7.29 |
|
| 24 | 24 |
django-six==1.0.4 |
| 25 | 25 |
django-uniapi==1.0.10 |
| 26 | 26 |
django-we==1.5.6 |
+ 1
- 1
requirements_redis.txt
@@ -1,3 +1,3 @@ |
||
| 1 | 1 |
hiredis==2.0.0 |
| 2 | 2 |
redis==4.3.4 |
| 3 |
-redis-extensions==4.0.1 |
|
| 3 |
+redis-extensions==4.1.1 |