适配Django2.2 xadmin ueditor 可用性

Author: mtianyan

.idea/VueDjangoFrameWorkShop.iml

@@ -3,7 +3,7 @@
 [![Build Status](https://travis-ci.org/mtianyan/hexoBlog-Github.svg?branch=master)](https://travis-ci.org/mtianyan/hexoBlog-Github)
 [![MIT Licence](https://badges.frapsoft.com/os/mit/mit.svg?v=103)](https://opensource.org/licenses/mit-license.php)
 
-使用Python3.6与Django2.0.2(Django-rest-framework)以及前端vue开发的前后端分离的商城网站
+使用Python3.7与Django2.2(Django-rest-framework)以及前端vue开发的前后端分离的商城网站
 
 项目支持支付宝支付(暂不支持微信支付),支持手机短信验证码注册， 支持第三方登录。集成了sentry错误监控系统。
 
@@ -23,19 +23,14 @@ use the address: http://127.0.0.1:8000/
 
 ## Contents：
 
-对应教程已开通简书连载文集: https://www.jianshu.com/nb/22309475
-
-**欢迎大家关注订阅，点赞！！！**
-
 [原版视频课程地址:](https://coding.imooc.com/learn/list/131.html)
 
 ## About me
 
-[简书](https://www.jianshu.com/u/db9a7a0daa1f) && [mtianyan's blog](http://blog.mtianyan.cn/)
 
 有趣的Python群：619417153
 
-欢迎关注简书，star项目！谢谢！
+欢迎star项目！谢谢！
 
 你的关注支持是我继续分享前进的动力。
 

.idea/misc.xml

@@ -10,7 +10,7 @@
         'ENGINE': 'django.db.backends.mysql',
         'NAME': 'vue_shop',
         'USER': 'root',
-        'PASSWORD': 'tp158917',
+        'PASSWORD': 'mtianyanroot',
         'HOST': '127.0.0.1',
         "OPTIONS": {"init_command": "SET default_storage_engine=INNODB;"}
     }

.idea/workspace.xml

@@ -229,11 +229,17 @@
 import os
 import raven
 
+CORS_ORIGIN_WHITELIST = [
+    'http://localhost:3000',
+    'http://localhost:8000',
+    'http://localhost:8080',
+]
+
 RAVEN_CONFIG = {
     'dsn': 'https://<key>:<secret>@sentry.io/<project>',
 }
 
-REMOTE_DEBUG = True
+REMOTE_DEBUG = False
 PROJECT_ROOT = os.path.join(BASE_DIR, 'VueDjangoFrameWorkShop')
 if DEBUG and REMOTE_DEBUG:
     try:

Readme.md renamed to README.MD

@@ -26,6 +26,7 @@
 class GoodsPagination(PageNumberPagination):
     page_size = 12
     # 向后台要多少条
+
     page_size_query_param = 'page_size'
     # 定制多少页的参数
     page_query_param = "page"

VueDjangoFrameWorkShop/local_settings.py

@@ -0,0 +1,17 @@
+# Generated by Django 2.2.2 on 2019-06-19 16:50
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('trade', '0003_auto_20180304_1535'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='orderinfo',
+            name='pay_type',
+            field=models.CharField(choices=[('alipay', '支付宝'), ('wechat', '微信')], default='alipay', max_length=10, verbose_name='支付类型'),
+        ),
+    ]

VueDjangoFrameWorkShop/settings.py

@@ -64,11 +64,11 @@ class UserRegSerializer(serializers.ModelSerializer):
 
     # 调用父类的create方法，该方法会返回当前model的实例化对象即user。
     # 前面是将父类原有的create进行执行，后面是加入自己的逻辑
-    # def create(self, validated_data):
-    #     user = super(UserRegSerializer, self).create(validated_data=validated_data)
-    #     user.set_password(validated_data["password"])
-    #     user.save()
-    #     return user
+    def create(self, validated_data):
+        user = super(UserRegSerializer, self).create(validated_data=validated_data)
+        user.set_password(validated_data["password"])
+        user.save()
+        return user
 
     def validate_code(self, code):
 

apps/goods/views.py

@@ -17,6 +17,7 @@
 def create_auth_token(sender, instance=None, created=False, **kwargs):
     # 是否新建，因为update的时候也会进行post_save
     if created:
-        password = instance.password
-        instance.set_password(password)
-        instance.save()
+        pass
+        # password = instance.password
+        # instance.set_password(password)
+        # instance.save()