Merge branch 'ycl/pictorial_activity' into 'dev'

add total

See merge request alpha/sun!240

api/activity.py

@@ -76,28 +76,28 @@ class ActivityDeleteView(APIView):
         return data
 
 
-class PictorialActivityInfoView(APIView):
+class PictorialActivityListView(APIView):
 
     def get(self, request):
 
-        id_ = int(request.GET.get('id'))
+        name = request.GET.get('name')
+        page = int(request.GET.get('page', 1))
+        count = int(request.GET.get('count', 10))
 
-        data = self.rpc['venus/sun/activity/pictrial/info'](id_=id_).unwrap()
+        data = self.rpc['venus/sun/activity/pictrial/list'](name=name, offset=(page - 1) * count, count=count).unwrap()
         if not data:
             return r'获取失败'
 
-        return data.get("data")
+        return data
 
 
 class PictorialActivityView(APIView):
 
     def get(self, request):
 
-        name = request.GET.get('name')
-        page = int(request.GET.get('page', 1))
-        count = int(request.GET.get('count', 10))
+        id_ = int(request.GET.get('id'))
 
-        data = self.rpc['venus/sun/activity/pictrial/list'](name=name, offset=(page - 1) * count, count=count).unwrap()
+        data = self.rpc['venus/sun/activity/pictrial/info'](id_=id_).unwrap()
         if not data:
             return r'获取失败'
 
@@ -108,8 +108,8 @@ class PictorialActivityView(APIView):
         data = {
             "id": request.POST.get('id'),
             "name": request.POST.get('name', None),
-            "start_time": int(request.POST.get('start_time'))/1000,
-            "end_time": int(request.POST.get('end_time'))/1000,
+            "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'),

api/urls.py

@@ -192,8 +192,9 @@ urlpatterns = [
     url(r'^activity/create$', ActivityCreateView.as_view()),
     url(r'^activity/update$', ActivityUpdateView.as_view()),
     url(r'^activity/delete$', ActivityDeleteView.as_view()),
-    url(r'^activity/pictorial/get', PictorialActivityInfoView.as_view()),
     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()),
 
     # 品牌