diff --git a/backstage/application/api/controllers/api/Dishes.php b/backstage/application/api/controllers/api/Dishes.php index 14d47f9..7461aeb 100644 --- a/backstage/application/api/controllers/api/Dishes.php +++ b/backstage/application/api/controllers/api/Dishes.php @@ -862,9 +862,12 @@ class Dishes extends REST_Controller // } // if(!empty($meal_list)){ +// $jcmeal[$book_v['dc_date']]['date_id'] = $date_id; $jcmeal[$book_v['dc_date']]['cart_num'] += $dishes_type_num; $jcmeal[$book_v['dc_date']]['active'] = $book_v['dc_date'] == $date_get ? 1 : 0; - $jcmeal[$book_v['dc_date']]['meal_list'][$explode[1]] = $dishes; + + $jcmeal[$book_v['dc_date']]['meal_list'][$explode[1]]['date_id'] = $date_id; + $jcmeal[$book_v['dc_date']]['meal_list'][$explode[1]]['list'] = $dishes; // $jcmeal[$book_v['dc_date']] = array( // 'cart_num' => $cart_arr[$book_v['dc_date']], diff --git a/m/js/main.js b/m/js/main.js index d04fbd1..86e53ac 100644 --- a/m/js/main.js +++ b/m/js/main.js @@ -2404,10 +2404,12 @@ $(function () { var cs_date = ''; if (Object.keys(meal_list).length > 0) { $.each(meal_list, function (d, date) { + var date_id = date.date_id; + var list = date.list; var look_li = ''; var cs_li = ''; - if (date.length > 0) { - $.each(date, function (i, cs) { + if (list.length > 0) { + $.each(list, function (i, cs) { if (cs.book_type != '2') { var addClass = @@ -2478,9 +2480,9 @@ $(function () { d + '' + '
' + '
' + '
' + '