|
|
@@ -115,8 +115,7 @@ class MealManage(View):
|
|
|
if page is None or line is None:
|
|
|
return response.json(444)
|
|
|
qs = Store_Meal.objects.values("id", "title", "price", "content", "day", "add_time", "update_time", "currency",
|
|
|
- "bucket_id",
|
|
|
- "bucket__bucket", "bucket__storeDay")
|
|
|
+ "type", "bucket_id", "bucket__bucket", "bucket__storeDay")
|
|
|
res = {}
|
|
|
if qs.exists():
|
|
|
res['count'] = qs.count()
|
|
|
@@ -190,6 +189,7 @@ class MealManage(View):
|
|
|
return response.json(0, send_json)
|
|
|
return response.json(0)
|
|
|
|
|
|
+
|
|
|
'''
|
|
|
用户获取全部套餐信息
|
|
|
http://192.168.136.40:8077/meal/list?token=local
|
|
|
@@ -228,7 +228,7 @@ class MealView(View):
|
|
|
|
|
|
def do_query(self, response):
|
|
|
qs = Store_Meal.objects.all().values("id", "title", "content", "price", "day", "currency", "bucket__storeDay",
|
|
|
- "bucket__bucket", "bucket__area")
|
|
|
+ "bucket__bucket", "bucket__area","type")
|
|
|
if qs.exists():
|
|
|
ql = list(qs)
|
|
|
from operator import itemgetter
|
|
|
@@ -240,7 +240,7 @@ class MealView(View):
|
|
|
res.append(res_c)
|
|
|
result = {'meals': res, 'extra': {
|
|
|
'cloud_banner': 'https://www.dvema.com/web/images/cloud_cn_banner.png',
|
|
|
- 'cloud_en_baner':'https://www.dvema.com/web/images/cloud_en_banner.png'
|
|
|
+ 'cloud_en_baner': 'https://www.dvema.com/web/images/cloud_en_banner.png'
|
|
|
}}
|
|
|
return response.json(0, result)
|
|
|
else:
|
chenjunkai