diff --git a/Laravel/app/Http/Controllers/API/H5/ComboController.php b/Laravel/app/Http/Controllers/API/H5/ComboController.php index 9e2f1b2..8294877 100644 --- a/Laravel/app/Http/Controllers/API/H5/ComboController.php +++ b/Laravel/app/Http/Controllers/API/H5/ComboController.php @@ -113,10 +113,14 @@ class ComboController extends Controller ->pluck('combo_id')->toArray(); $count = count($combo_ids); $placeholders = implode(', ', array_fill(0, $count, '?')); + if(count($combo_ids)>0){ + $sql = $sql . " and a.combo_id in ($placeholders) "; + $canshu =array_merge($canshu, $combo_ids); + }else{ + $sql = $sql . " and a.combo_id in (?) "; + $canshu =array_merge($canshu, [0]); + } - $sql = $sql . " and a.combo_id in ($placeholders) "; - - $canshu =array_merge($canshu, $combo_ids); } diff --git a/Laravel/app/Http/Controllers/API/H5/OrderController.php b/Laravel/app/Http/Controllers/API/H5/OrderController.php index ca20460..c102d1a 100644 --- a/Laravel/app/Http/Controllers/API/H5/OrderController.php +++ b/Laravel/app/Http/Controllers/API/H5/OrderController.php @@ -401,7 +401,7 @@ class OrderController extends Controller if ($env == 'pro') { //如果是正式环境 - //把状态更新为支付后,然后再开始预约思信 + //开始预约二线 $nowDateTime=date('Y-m-d H:i:s'); if (!empty($plan_nmr_appointment_info)) { // foreach ($erxian_info as $key => $plan_nmr) { diff --git a/h5/pages/main/tj/tjxq.vue b/h5/pages/main/tj/tjxq.vue index 481185f..bf96e0b 100644 --- a/h5/pages/main/tj/tjxq.vue +++ b/h5/pages/main/tj/tjxq.vue @@ -344,7 +344,7 @@ - 套餐项目({{ comboInfo?.items?.length }}项) + 套餐项目({{ comboInfo?.tags[0]?.text }}) 检查项目 检查指标意义