pc

Controller/FeedBack.py

@@ -178,11 +178,13 @@ class FeedBackView(View):
                 res = {}
                 auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
                 bucket = oss2.Bucket(auth, 'oss-cn-hongkong.aliyuncs.com', 'statres')
+                count = 0
                 for fb in fb_qs:
                     if fb['id'] in res:
                         if fb['FS__name']:
                             img_url = bucket.sign_url('GET', fb['FS__name'], 600)
                             res[fb['id']]['img_url'].append(img_url)
+                            count += 1
                     else:
                         print(fb['FS__name'])
                         if fb['FS__name']:
@@ -190,7 +192,8 @@ class FeedBackView(View):
                             fb['img_url'] = []
                             fb['img_url'].append(img_url)
                         res[fb['id']] = fb
-                return response.json(0, res)
+                        count += 1
+                return response.json(0, {'data': res, 'count': count})
             else:
                 return response.json(444, 'page,line')
         else:

Controller/SysMsg.py

@@ -82,11 +82,13 @@ class SysMsgView(View):
         if page and line:
             page = int(page)
             line = int(line)
-            sm_qs = SysMsgModel.objects.filter(userID_id=userID)[(page - 1) * line:page * line]. \
+            sm_qs = SysMsgModel.objects.filter(userID_id=userID)
+            count = sm_qs.count()
+            sm_qs = sm_qs[(page - 1) * line:page * line]. \
                 values('status', 'id', 'msg', 'addTime', 'updTime')
             # sm_qs = SysMsgModel.objects.filter(userID_id=userID)[(page - 1) * line:page * line].values('sta')
             if sm_qs.exists():
-                return response.json(0, list(sm_qs))
+                return response.json(0, {'data': list(sm_qs), 'count': count})
             else:
                 return response.json(0, [])
         else: