From 755d30156e038544cb13f9c1223862a64da1cef7 Mon Sep 17 00:00:00 2001
From: vguanyiwgd <v-guanyiw.gd@chinatelecom.cn>
Date: Thu, 18 Apr 2024 17:30:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dindex6=20=E6=89=93=E5=BC=80?=
 =?UTF-8?q?=E8=8F=9C=E5=93=81=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Ic2e315ce1ec4b3c5cb2ea53f2203b716fe271d85
---
 .../application/api/controllers/api/Dishes.php     |  5 ++++-
 m/js/main.js                                       | 14 ++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

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 +
             '</span><span class="icon icon-unfold"></div>' +
             '<div data-id=' +
-            date.date_id +
+            date_id +
             ' class="card-look card-look-' +
-            date.date_id +
+            date_id +
             ' card-content">' +
             '<ul class="cs">' +
             look_li +
@@ -2494,9 +2496,9 @@ $(function () {
             d +
             '</span><span class="icon icon-unfold"></div>' +
             '<div data-id=' +
-            date.date_id +
+            date_id +
             ' class="card-order card-order-' +
-            date.date_id +
+            date_id +
             ' card-content">' +
             '<ul class="cs">' +
             cs_li +