diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/ComboController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/ComboController.php index 5cb1a41..e05a87a 100644 --- a/Laravel/app/Http/Controllers/API/Admin/YeWu/ComboController.php +++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/ComboController.php @@ -162,6 +162,7 @@ class ComboController extends Controller $list = $list->where('combos.name', 'like', '%' . $searchInfo['name'] . '%'); } + $list=$list->where(['combos.status'=>1]); $count = $list->count(); $list = $list ->skip(($page - 1) * $pageSize) // 跳过前9999条记录 diff --git a/Laravel/app/Http/Controllers/API/H5/HomeController.php b/Laravel/app/Http/Controllers/API/H5/HomeController.php index 3d4256f..b753edd 100644 --- a/Laravel/app/Http/Controllers/API/H5/HomeController.php +++ b/Laravel/app/Http/Controllers/API/H5/HomeController.php @@ -53,9 +53,9 @@ class HomeController extends Controller 'icon' => '/assets/h5/tuanjianyuyue.png' ]], 'button' => [[[ - 'message' => '暂未开放', + 'message' => '', 'name' => '健康问卷', - 'jump' => '/pages/main/cjwt/cjwt', + 'jump' => '/pages/main/question/choose/choose', 'icon' => '/assets/h5/a_jiankangwenjuan.png' ], // [ @@ -124,9 +124,9 @@ class HomeController extends Controller { $list = [ [ - 'message' => '暂未开放', + 'message' => '', 'name' => '检前健康评估', - 'url' => '', + 'url' => '/pages/main/question/question/question?id=4', 'logo' => '/assets/h5/zhuyishixiang.png' ], [ diff --git a/Laravel/app/Http/Controllers/API/H5/OrderController.php b/Laravel/app/Http/Controllers/API/H5/OrderController.php index 8a08af4..9a9c12a 100644 --- a/Laravel/app/Http/Controllers/API/H5/OrderController.php +++ b/Laravel/app/Http/Controllers/API/H5/OrderController.php @@ -378,7 +378,7 @@ class OrderController extends Controller if ($insert and $up_plan and $jifen_dikou_status and $yucunkuan_dikou_status) { DB::commit(); $action = false; - if ($true_price === 0) { + if ($true_price == 0) { //如果是免费的,直接去预约 $yuyue = self::Finish($order_num); if ($yuyue['status'] === true) { diff --git a/h5/pages/main/index/index.vue b/h5/pages/main/index/index.vue index 3ef5c2b..8e32196 100644 --- a/h5/pages/main/index/index.vue +++ b/h5/pages/main/index/index.vue @@ -281,7 +281,7 @@ - 10152206 + 10171926