diff --git a/Laravel/app/Http/Controllers/API/H5/HomeController.php b/Laravel/app/Http/Controllers/API/H5/HomeController.php index ffbdb70..b17aea2 100644 --- a/Laravel/app/Http/Controllers/API/H5/HomeController.php +++ b/Laravel/app/Http/Controllers/API/H5/HomeController.php @@ -124,7 +124,7 @@ class HomeController extends Controller [ 'message' => '暂未开放', 'name' => '套餐预约', - 'url' => '/pages/main/packageDetails/packageDetails', + 'url' => '/pages/main/combo/combo', 'logo' => '/assets/h5/zhuyishixiang.png' ], [ diff --git a/Laravel/app/Http/Controllers/API/H5/ReportController.php b/Laravel/app/Http/Controllers/API/H5/ReportController.php index c67ed47..f7d3f6c 100644 --- a/Laravel/app/Http/Controllers/API/H5/ReportController.php +++ b/Laravel/app/Http/Controllers/API/H5/ReportController.php @@ -141,7 +141,7 @@ class ReportController extends Controller } $error_items[] = $item->基础项目名称 . $m; } - if($item->结果类型=='数值'){ + if($item->结果类型=='数值' and $item->结果值!='' and $item->结果值!=null){ $range = $this->convertToArray($item->结果值范围); $item->结果值范围=$range; $item->最大范围=[]; diff --git a/Laravel/app/Http/Controllers/API/H5/UserController.php b/Laravel/app/Http/Controllers/API/H5/UserController.php index d6e8ad0..5ea4349 100644 --- a/Laravel/app/Http/Controllers/API/H5/UserController.php +++ b/Laravel/app/Http/Controllers/API/H5/UserController.php @@ -40,6 +40,7 @@ class UserController extends Controller 'id_number'=>$default_person->id_number, 'count' => $count, 'openid' => $openid, + 'person_id' => $default_person->id, ]; return \Yz::Return(true, '获取成功', [ 'info' => $info diff --git a/Laravel/app/Http/Controllers/API/XCXApiController.php b/Laravel/app/Http/Controllers/API/XCXApiController.php index 46d1dbc..c7f016d 100644 --- a/Laravel/app/Http/Controllers/API/XCXApiController.php +++ b/Laravel/app/Http/Controllers/API/XCXApiController.php @@ -124,10 +124,10 @@ class XCXApiController extends Controller $method = 'POST'; // $method = 'POST'; - // $url = '/jeecg-boot/hospital/openapi/archive/list'; - // $timestamp = "1726880312"; - // $nonce = '88e5928d0c34aa0e9cb0bade72f83a67'; - // $body = 'wxid=oosgJj-SVIxTrm_g1p213tsSHK5g'; + // $url = '/jeecg-boot/hospital/openapi/order/create'; + // $timestamp = "1727226133"; + // $nonce = 'V50f38fJzFuCAxWG'; + // $body = 'amount=1&appid=13a159e438a742dd932c9bddbfaa41e5&ghzid=c5ce8410ba854d879a0abf689923ca0d&order_desc=单位团检&orderid=20240915183440999WMp2yu&sub_org_code=6'; $private_key = Storage::get('keys/private_key.pem'); $SignStr = $method . "\n" . @@ -143,9 +143,11 @@ class XCXApiController extends Controller // 对签名结果进行 Base64 编码 $base64Signature = base64_encode($signature); + // dd($base64Signature); if ($is_urlencode) { $base64Signature = urlencode($base64Signature); } + // dd($SignStr,$base64Signature); return $base64Signature; }