From 684726c7bd628f1aeafcf52ee1a75c0af5023d20 Mon Sep 17 00:00:00 2001 From: yanzai Date: Tue, 11 Mar 2025 18:06:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=85=E8=B4=AD=E4=B9=B0=E6=97=B6=20?= =?UTF-8?q?=E4=B8=8D=E5=88=A4=E6=96=AD=E6=80=A7=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Laravel/app/Http/Controllers/API/H5/OrderNewController.php | 6 +++--- h5/config.js | 4 ++-- h5/pages/main/tj/tjzx.vue | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Laravel/app/Http/Controllers/API/H5/OrderNewController.php b/Laravel/app/Http/Controllers/API/H5/OrderNewController.php index 953f73c..2ffb39e 100644 --- a/Laravel/app/Http/Controllers/API/H5/OrderNewController.php +++ b/Laravel/app/Http/Controllers/API/H5/OrderNewController.php @@ -99,9 +99,9 @@ class OrderNewController extends Controller $combo_info = DB::table('combos')->where(['combo_id' => $combo_id, 'status' => 1])->first(); if (!$combo_info) return \Yz::echoError1("套餐不存在"); if (!isset($combo_info->checkup_type_id)) return \Yz::echoError1("套餐未关联体检类型"); - if($combo_info->sex<>0 and $combo_info->sex<>$person->sex) { - return \Yz::echoError1("套餐性别与体检人性别不匹配"); - } +// if($combo_info->sex<>0 and $combo_info->sex<>$person->sex) { //医院要求购买套餐时，不限制性别，预约和转赠时再限制，所以这段注释掉了 +// return \Yz::echoError1("套餐性别与体检人性别不匹配"); +// } $checkup_type_id = $combo_info->checkup_type_id; //构建多选一数据 diff --git a/h5/config.js b/h5/config.js index ac2205a..8d29e36 100644 --- a/h5/config.js +++ b/h5/config.js @@ -1,7 +1,7 @@ const app_type = 'gzh' //const base_url = "https://api.hainan2024.sa0.online" //开发环境 -//const base_url="https://tj-h5.hnxdfe.com" //正式环境 -const base_url="http://124.225.137.54:39081" //测试环境 +const base_url="https://tj-h5.hnxdfe.com" //正式环境 +//const base_url="http://124.225.137.54:39081" //测试环境 const config = { api_map_url: base_url + '/api/ApiMap/h5', base_assets_url: base_url, diff --git a/h5/pages/main/tj/tjzx.vue b/h5/pages/main/tj/tjzx.vue index a7abf0f..55fb9ae 100644 --- a/h5/pages/main/tj/tjzx.vue +++ b/h5/pages/main/tj/tjzx.vue @@ -124,6 +124,7 @@ group_id: groupId.value, combo_id: comboId.value, wj: wj.value, + duo_xuan_yi: $store.getDuoXuanYi(), }; if (comboId.value) { obj.combo_id = comboId.value;