diff --git a/backstage/application/api/controllers/api/Dishes.php b/backstage/application/api/controllers/api/Dishes.php index 3204b09..c9cb803 100644 --- a/backstage/application/api/controllers/api/Dishes.php +++ b/backstage/application/api/controllers/api/Dishes.php @@ -1137,10 +1137,13 @@ class Dishes extends REST_Controller $month = date('n', $date); $day = date('j', $date); $date_text = $month . '月' . $day . '日' . '(周' . cnWeek($date) . ')'; + + $dc_type_info = $this->Common_model->get_meal_type_by_id($cd->dc_type); $result[$cd->dining_hall_id]['data'][$cd->dc_date]['date_name'] = $date_text; $result[$cd->dining_hall_id]['data'][$cd->dc_date]['data'][$cd->dc_type]['type'] = $cd->type; $result[$cd->dining_hall_id]['data'][$cd->dc_date]['data'][$cd->dc_type]['date_id'] = $cd->date_id; - $result[$cd->dining_hall_id]['data'][$cd->dc_date]['data'][$cd->dc_type]['meal_name'] = $this->Common_model->get_meal_type_by_id($cd->dc_type)->name; + $result[$cd->dining_hall_id]['data'][$cd->dc_date]['data'][$cd->dc_type]['meal_name'] = $dc_type_info->name; + $result[$cd->dining_hall_id]['data'][$cd->dc_date]['data'][$cd->dc_type]['notes'] = $dc_type_info->notes; $dishes = $this->Dishes_model->get_dishes_by_dishes_id($cd->dish_id); $cd->dish_name = $dishes->dish_name; $result[$cd->dining_hall_id]['data'][$cd->dc_date]['data'][$cd->dc_type]['data'][] = $cd; diff --git a/m/js/main.js b/m/js/main.js index ca50c64..011dd94 100644 --- a/m/js/main.js +++ b/m/js/main.js @@ -8753,6 +8753,13 @@ $(function () { meal.rise_info.rise_tip + '

'; } + if(meal.notes){ + var notes = JSON.parse(meal.notes); + cartHtml += + '
  • 备注:' + + notes.text + + '

  • '; + } cartHtml += ''; }); });