@@ -177,8 +177,12 @@ def group_list_api(request): |
||
| 177 | 177 |
:return: |
| 178 | 178 |
""" |
| 179 | 179 |
user_id = request.POST.get('user_id', '')
|
| 180 |
+ page = int(request.POST.get('page', 1))
|
|
| 181 |
+ num = int(request.POST.get('num', settings.GROUP_PER_PAGE))
|
|
| 180 | 182 |
|
| 181 | 183 |
group_users = GroupUserInfo.objects.filter(user_id=user_id, user_status=GroupUserInfo.PASSED) |
| 184 |
+ group_users, left = pagination(group_users, page, num) |
|
| 185 |
+ |
|
| 182 | 186 |
groups = [] |
| 183 | 187 |
for group_user in group_users: |
| 184 | 188 |
group_info = get_group_info(group_user.group_id) |
@@ -189,6 +193,7 @@ def group_list_api(request): |
||
| 189 | 193 |
'message': u'获取群组列表成功', |
| 190 | 194 |
'data': {
|
| 191 | 195 |
'groups': groups, |
| 196 |
+ 'left': left, |
|
| 192 | 197 |
}, |
| 193 | 198 |
}) |
| 194 | 199 |
|
@@ -204,11 +204,14 @@ WATERMARK_LOGO = os.path.join(PROJ_DIR, 'static/pai2/img/paiai_96_96.png').repla |
||
| 204 | 204 |
# 缩略图设置 |
| 205 | 205 |
THUMBNAIL_MAX_WIDTH = 360 |
| 206 | 206 |
|
| 207 |
-# 分页设置 |
|
| 207 |
+# 首页设置 |
|
| 208 | 208 |
PAI2_HOME_PER_PAGE = 20 |
| 209 | 209 |
PAI2_HOME_MAX_PAGE = 20 |
| 210 | 210 |
PAI2_HOME_MAX_ROWS = 400 # PAI2_HOME_PER_PAGE * PAI2_HOME_MAX_PAGE = 20 * 20 = 400 |
| 211 | 211 |
|
| 212 |
+# 群组设置 |
|
| 213 |
+GROUP_PER_PAGE = 20 |
|
| 214 |
+ |
|
| 212 | 215 |
# 域名设置 |
| 213 | 216 |
DOMAIN = 'http://pai.ai' |
| 214 | 217 |
IMG_DOMAIN = 'http://img.pai.ai' |