From a924491855510c68d9cf02fcdca1eedd78e785e7 Mon Sep 17 00:00:00 2001 From: yanzai Date: Mon, 24 Mar 2025 21:59:46 +0800 Subject: [PATCH] =?UTF-8?q?web=E7=AB=AF=20=E7=9B=B8=E5=85=B3=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/API/Web/ComboController.php | 10 +++++- .../Controllers/API/Web/OrderController.php | 2 ++ Laravel/public/tool/register.html | 33 ++++++++++++++----- 3 files changed, 35 insertions(+), 10 deletions(-) diff --git a/Laravel/app/Http/Controllers/API/Web/ComboController.php b/Laravel/app/Http/Controllers/API/Web/ComboController.php index 0032e9c..80fe21a 100644 --- a/Laravel/app/Http/Controllers/API/Web/ComboController.php +++ b/Laravel/app/Http/Controllers/API/Web/ComboController.php @@ -145,7 +145,14 @@ select combo_id as c_id,count(*) as sale_count from orders where status in(2,4) $combo_info['price'] = $combo->price; $combo_info['original_price'] = $combo->original_price; $all_original_price += $combo_info['original_price']; - $combo_items = json_decode($combo->items, true); + $comboAllItem=DB::table('combo_items')->select('id','name','desc','keshi_name','price') + ->where(['combo_id' => $combo_id, 'status' => 1]) + ->get() + ->map(function ($item) { + return (array) $item; // 将每个对象转换为数组 + }) + ->toArray(); + $combo_items = $comboAllItem; $groupedData = []; foreach ($combo_items as $item) { $keshiName = $item['keshi_name']; @@ -181,6 +188,7 @@ select combo_id as c_id,count(*) as sale_count from orders where status in(2,4) $items = DB::table('items')->whereIn('item_id', $item_ids)->where(['status' => 1])->get(); $groupedData = []; foreach ($items as $item) { + $item->price = $item->price * config('app.globals.ZiXuan_ZheKou');//所有自选项目打8折 //判断套餐项目和自选项目是否冲突 if(isset($combo_items)){ foreach ($combo_items as $comboitem) { diff --git a/Laravel/app/Http/Controllers/API/Web/OrderController.php b/Laravel/app/Http/Controllers/API/Web/OrderController.php index 9ec49b9..e7a946e 100644 --- a/Laravel/app/Http/Controllers/API/Web/OrderController.php +++ b/Laravel/app/Http/Controllers/API/Web/OrderController.php @@ -24,6 +24,7 @@ class OrderController extends Controller $item_ids = request('item_ids');//自选item的ids $plan_id = request('plan_id');//号源id $doctor = request('doctor');//预约的医生名字 + $appdoctor_department = request('appdoctor_department');//预约的医生的科室 $appdoctor = request('appdoctor');//协助预约的医生名字 $person= request('person'); //sex,birthday,married,name,id_number,phone $married_array=["未婚","已婚","丧偶","离婚","其他"]; @@ -220,6 +221,7 @@ class OrderController extends Controller 'hospital_id' => $hospital_id, 'doctor' => $doctor, 'appdoctor'=>$appdoctor, + 'appdoctor_department'=>$appdoctor_department, 'phone' => $person['phone'], 'sex' => $person['sex'], 'birthday' => $person['birthday'], diff --git a/Laravel/public/tool/register.html b/Laravel/public/tool/register.html index d713332..a756a62 100644 --- a/Laravel/public/tool/register.html +++ b/Laravel/public/tool/register.html @@ -42,7 +42,7 @@ .select_input_wrapper { display: flex; - justify-content: space-between; + } .price_wrapper { @@ -133,9 +133,9 @@
- + - + 搜索 @@ -228,19 +228,23 @@ + + +
- - - + + + 搜索
-
+
+ 选择套餐
@@ -248,7 +252,7 @@
- 选择套餐 +
@@ -277,6 +281,7 @@ @row-click="itemRowClick"> + @@ -288,6 +293,7 @@ 合计价格：¥ {{ pay_info.true_price }}
+ 清空 移除项目 预约登记
@@ -511,6 +517,7 @@ married: "未婚", vip: "2", doctor: "", + appdoctor_department: "", birthday: formatDatetime(new Date(), "YYYY-MM-DD"), }; const api_map = { @@ -859,7 +866,9 @@ getBuyInfo('1'); } }; - + const removeAllClick=()=>{ + window.location.reload(); + } const select_table_ref = ref(null) const removeItemClick = () => { const select_items = select_table_ref.value.getSelectionRows(); @@ -1017,6 +1026,7 @@ combo_id: combo_id, item_ids: item_ids, appdoctor: input_data.value.doctor, + appdoctor_department: input_data.value.appdoctor_department, person: { sex: input_data.value.gender, birthday: input_data.value.birthday, @@ -1056,6 +1066,9 @@ } function PlanDateChange() { getPlanList() + } + function handleSubmit(){ + } onMounted(() => { getQueryData(); @@ -1065,6 +1078,7 @@ return { elZh, + handleSubmit, PlanDateChange, isEnglishOnly, itemTableRowClassName, @@ -1075,6 +1089,7 @@ comboRowClick, itemRowClick, removeItemClick, + removeAllClick, itemSelectionChange, searchClick, idNumberUpdate,