Merge branch 'haow/dev' into 'test'

fix user is_tcc and pictorial create faild message

See merge request !119

api/pictorial.py

@@ -65,6 +65,10 @@ class PictorialUpdateOrCreate(APIView):
         except Exception as e:
             error_logger.error(u'编辑%s用户信息失败%s' % (id, e))
             raise
+        if not data.get('id'):
+            return {
+                'message': '画报已存在'
+            }
         return {
             'message': '更新成功',
             'data': data

api/user.py

@@ -72,6 +72,7 @@ class UserUpdateOrCreate(APIView):
             'phone': request.POST.get('phone'),
             'email': request.POST.get('email'),
             'gender': request.POST.get('gender'),
+            'is_tcc': request.POST.get('is_tcc'),
         }
 
         try: