diff --git a/Laravel/app/Http/Controllers/API/H5/PlanController.php b/Laravel/app/Http/Controllers/API/H5/PlanController.php index 59476c2..2f8f5d2 100644 --- a/Laravel/app/Http/Controllers/API/H5/PlanController.php +++ b/Laravel/app/Http/Controllers/API/H5/PlanController.php @@ -88,6 +88,7 @@ class PlanController extends Controller $hospital_id =request('hospital'); $openid =request('openid'); $person_id=request('person_id'); + $person_sex=request('person_sex'); $combo_id=request('combo_id'); $date=request('date'); $use_type=request('use_type');//使用类型 1个检 2团检 @@ -116,6 +117,9 @@ class PlanController extends Controller if(!!$personInfo){ $list=$list->whereIn('sex',[0,$personInfo->sex]); } + if(isset($person_sex)){ + $list=$list->whereIn('sex',[0,$person_sex]); + } if ($use_type == 1) { $list = $list->where(function ($query) use ($amount) { $query->where('amount_limit1', 0)->orWhere('amount_limit1', '>=', $amount); diff --git a/Laravel/public/tool/register.html b/Laravel/public/tool/register.html index f981cb0..e36d19a 100644 --- a/Laravel/public/tool/register.html +++ b/Laravel/public/tool/register.html @@ -908,7 +908,7 @@ if (plan.status === 2) { return window.$message().error('号源不可用') } - if (plan.sex === Number(input_data.value.gender) && plan.sex !== 0) { + if (plan.sex !== Number(input_data.value.gender) && plan.sex !== 0) { return window.$message().error('号源性别不符') } if (plan.is_vip === 1 && input_data.value.vip !== '1') { @@ -923,6 +923,7 @@ hospital: input_data.value.hospital, openid: "", person_id: "", + person_sex:input_data.value.gender, date: plan_data.value.date, use_type: 1, checkup_type_id: 1, @@ -931,6 +932,9 @@ window.$response(response.data, () => { plan_list.value = response.data.data.list; plan_dialog_show.value = true + if(plan_list.value.length===0){ + alert("当前日期暂无号源"); + } }); } @@ -1041,4 +1045,4 @@ app.mount("#app"); - \ No newline at end of file + diff --git a/Laravel/routes/web.php b/Laravel/routes/web.php index 9ed3e2b..6cc406e 100644 --- a/Laravel/routes/web.php +++ b/Laravel/routes/web.php @@ -81,7 +81,7 @@ Route::group(['middleware' => ['log'],'prefix' => 'api/H5'], function () { }); -Route::group(['prefix' => 'api/Web'], function () { +Route::group(['middleware' => ['log'],'prefix' => 'api/Web'], function () { Route::post('/ComboGetList', 'App\Http\Controllers\API\Web\ComboController@GetList');//Web套餐列表 Route::post('/BuyInfo', 'App\Http\Controllers\API\Web\ComboController@BuyInfo');//Web购买详情 Route::post('/ItemGetList', 'App\Http\Controllers\API\Web\ItemController@GetList');//Web套餐列表