|
@@ -179,20 +179,19 @@ class IcloudServeView(View):
|
|
line = request_dict.get('pageSize', None)
|
|
line = request_dict.get('pageSize', None)
|
|
if not all([page, line]):
|
|
if not all([page, line]):
|
|
return response.json(444)
|
|
return response.json(444)
|
|
- icloud_meal_qs = ICloudStoreMeal.objects.all()
|
|
|
|
|
|
+ lang = Lang.objects.filter(type=3)
|
|
page = int(page)
|
|
page = int(page)
|
|
line = int(line)
|
|
line = int(line)
|
|
- total = icloud_meal_qs.count()
|
|
|
|
|
|
+ total = lang.count()
|
|
if is_select:
|
|
if is_select:
|
|
- icloud_meal_qs = icloud_meal_qs.values('id', 'lang__title')
|
|
|
|
|
|
+ lang = lang.values('id', 'title')
|
|
else:
|
|
else:
|
|
if meal_id:
|
|
if meal_id:
|
|
- icloud_meal_qs = icloud_meal_qs.filter(id=meal_id).values('id', 'lang__id', 'lang__lang', 'lang__title',
|
|
|
|
- 'lang__content')
|
|
|
|
|
|
+ lang = lang.filter(icloudstoremeal__id=meal_id).values('icloudstoremeal__id', 'id', 'lang', 'title',
|
|
|
|
+ 'content')
|
|
else:
|
|
else:
|
|
- icloud_meal_qs = icloud_meal_qs.values('id', 'lang__id', 'lang__lang', 'lang__title',
|
|
|
|
- 'lang__content')[(page - 1) * line:page * line]
|
|
|
|
- return response.json(0, {'langList': list(icloud_meal_qs), 'total': total})
|
|
|
|
|
|
+ lang = lang.values('icloudstoremeal__id', 'id', 'lang', 'title', 'content')[(page - 1) * line:page * line]
|
|
|
|
+ return response.json(0, {'langList': list(lang), 'total': total})
|
|
|
|
|
|
@staticmethod
|
|
@staticmethod
|
|
def add_or_edit_lang(request_dict, response):
|
|
def add_or_edit_lang(request_dict, response):
|