Merge branch 'ycl/fix_dev' into 'dev'

fix

See merge request alpha/sun!244

api/activity.py

@@ -111,8 +111,8 @@ class PictorialActivityView(APIView):
             "start_time": request.POST.get('start_time'),
             "end_time": request.POST.get('end_time'),
             "version": request.POST.get('version', '0.0.0'),
-            "banner": request.POST.get('banner'),
-            "description": request.POST.get('description'),
+            "banner": request.POST.get('banner', ''),
+            "description": request.POST.get('description',''),
             "titles": json.loads(request.POST.get('titles', '[]'))
         }
 

api/urls.py

@@ -195,7 +195,7 @@ urlpatterns = [
     url(r'^activity/pictorial$', PictorialActivityView.as_view()),
     url(r'^activity/pictorial$', PictorialActivityView.as_view()),
     url(r'^activity/pictorial/list$', PictorialActivityListView.as_view()),
-    url(r'^activity/pictorial/online$', PictorialActivityView.as_view()),
+    url(r'^activity/pictorial/online$', PictorialActivityOlineView.as_view()),
 
     # 品牌
     url(r'^brand/list$', BrandListView.as_view()),