基础设置

.idea/carwin_activity.iml

@@ -2,7 +2,7 @@
 <module type="PYTHON_MODULE" version="4">
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="Python 3.7 (carwin_activity)" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
   <component name="TestRunnerService">

.idea/misc.xml

@@ -3,5 +3,5 @@
   <component name="JavaScriptSettings">
     <option name="languageLevel" value="ES6" />
   </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 2.7" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7 (carwin_activity)" project-jdk-type="Python SDK" />
 </project>

apps/account/filters.py

@@ -4,9 +4,9 @@ from apps.base import clean_datetime_range
 from .models import *
 
 class EmployeeFilter(django_filters.FilterSet):
-    name = django_filters.CharFilter(name='name',lookup_expr='icontains')
-    username = django_filters.CharFilter(name='username', lookup_expr='icontains')
-    enabled = django_filters.CharFilter(name='product_base__enabled')
+    name = django_filters.CharFilter(field_name='name',lookup_expr='icontains')
+    username = django_filters.CharFilter(field_name='username', lookup_expr='icontains')
+    enabled = django_filters.CharFilter(field_name='product_base__enabled')
 
     class Meta:
         model = User

apps/activity/filters.py

@@ -5,9 +5,9 @@ from .models import *
 
 
 class BranchFilter(django_filters.FilterSet):
-    name = django_filters.CharFilter(name='name',lookup_expr='icontains')
-    tel = django_filters.CharFilter(name='tel', lookup_expr='icontains')
-    enabled = django_filters.CharFilter(name='product_base__enabled')
+    name = django_filters.CharFilter(field_name='name',lookup_expr='icontains')
+    tel = django_filters.CharFilter(field_name='tel', lookup_expr='icontains')
+    enabled = django_filters.CharFilter(field_name='product_base__enabled')
 
     class Meta:
         model = Branch

apps/base.py

@@ -25,7 +25,7 @@ class Formater():
         res = u''
         if value != None:
             try:
-                res = unicode(value)
+                res = str(value)
             except:
                 pass
         return res
@@ -36,7 +36,7 @@ class Formater():
         if value != None:
             if isinstance(value, datetime.datetime):
                 res = value.strftime('%Y-%m-%d %H:%M')
-            elif isinstance(value, unicode):
+            elif isinstance(value, str):
                 res = value
         return res
 
@@ -46,7 +46,7 @@ class Formater():
         if value != None:
             if isinstance(value, datetime.datetime):
                 res = value.strftime('%Y-%m-%d %H:%M:%S')
-            elif isinstance(value, unicode):
+            elif isinstance(value, str):
                 res = value
         return res
 
@@ -56,7 +56,7 @@ class Formater():
         if value != None:
             if isinstance(value, datetime.date):
                 res = strfdate(value)
-            elif isinstance(value, unicode):
+            elif isinstance(value, str):
                 res = value
         return res
 
@@ -98,7 +98,7 @@ class ExcelImporter():
     @staticmethod
     def formatUnicode(value):
         try:
-            return unicode(value).strip(u' ')
+            return str(value).strip(u' ')
         except:
             return ''
 
@@ -116,14 +116,14 @@ class ExcelImporter():
     @staticmethod
     def formatInt(value):
         try:
-            return int(float(unicode(value).strip(u' ')))
+            return int(float(str(value).strip(u' ')))
         except:
             raise CustomError(u'不能转换为整数')
 
     @staticmethod
     def formatFloat(value):
         try:
-            return round(float(unicode(value).strip(u' ')) or 0,2)
+            return round(float(str(value).strip(u' ')) or 0,2)
         except:
             raise CustomError(u'不能转换为小数')
 
@@ -144,7 +144,7 @@ class ExcelImporter():
     @staticmethod
     def formatTel(value):
         try:
-            value = unicode(value).strip(u' ')
+            value = str(value).strip(u' ')
         except:
             value = ''
         if value == '':

requirements

@@ -1,32 +1,12 @@
-certifi==2018.11.29
-chardet==3.0.4
-defusedxml==0.5.0
-diff-match-patch==20181111
-Django==1.11.13
-django-filter==1.1.0
-django-filters==0.2.1
-django-import-export==1.0.1
-django-validator==0.2.7
-djangorestframework==3.9.0
-djangorestframework-stubs==0.3.0
-et-xmlfile==1.0.1
-factory-boy==2.11.1
-Faker==1.0.1
-idna==2.8
-ipaddress==1.0.22
-jdcal==1.4
-odfpy==1.4.0
-openpyxl==2.5.12
-Pillow==5.4.1
-PyMySQL==0.9.3
-python-dateutil==2.7.5
-pytz==2018.9
-PyYAML==3.13
-requests==2.21.0
-six==1.12.0
+django==2.2.5
 tablib==0.11.4
-text-unidecode==1.2
-unicodecsv==0.14.1
-urllib3==1.24.1
-xlrd==1.2.0
-xlwt==1.3.0
+django-filter
+djangorestframework
+djangorestframework-jwt
+django-cors-headers
+mysqlclient
+aliyun-python-sdk-core
+Pillow
+pycryptodome
+requests
+xmltodict