From 63e643ea704eb156b87f65f098c90a7fd5453445 Mon Sep 17 00:00:00 2001
From: yanzai <boy_yan@163.com>
Date: Fri, 13 Dec 2024 23:03:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A6=96=E9=A1=B5=E6=96=87?=
 =?UTF-8?q?=E5=AD=97=EF=BC=8C=E9=97=AE=E5=8D=B7=E8=87=AA=E5=8A=A8=E5=A1=AB?=
 =?UTF-8?q?=E5=85=A5=E7=94=9F=E6=97=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Laravel/app/Http/Controllers/API/H5/HomeController.php        | 2 +-
 .../app/Http/Controllers/API/H5/QuestionnaireController.php   | 2 +-
 h5/config.js                                                  | 2 +-
 h5/pages/main/question/question/question.vue                  | 4 ++--
 h5/pages/main/tj/tjxq.vue                                     | 3 ++-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Laravel/app/Http/Controllers/API/H5/HomeController.php b/Laravel/app/Http/Controllers/API/H5/HomeController.php
index e9bab84..5eea537 100644
--- a/Laravel/app/Http/Controllers/API/H5/HomeController.php
+++ b/Laravel/app/Http/Controllers/API/H5/HomeController.php
@@ -76,7 +76,7 @@ class HomeController extends Controller
         'icon' => '/assets/h5/a_tijianyindao.png'
       ]], [[
         'message' => '',
-        'name' => '解读报告',
+        'name' => '报告解读预约',
         'jump' => 'XCX/pages/other/entry/index?path=/pages/outpatient/doctor-appointment/index&scene=1035&hospitalAreaId=6&departmentCode=A0030077&subDepartmentCode=4773794195699464904',
         'icon' => '/assets/h5/a_jiedubaogao.png'
       ], [
diff --git a/Laravel/app/Http/Controllers/API/H5/QuestionnaireController.php b/Laravel/app/Http/Controllers/API/H5/QuestionnaireController.php
index 9b32f39..8f8ef95 100644
--- a/Laravel/app/Http/Controllers/API/H5/QuestionnaireController.php
+++ b/Laravel/app/Http/Controllers/API/H5/QuestionnaireController.php
@@ -98,7 +98,7 @@ class QuestionnaireController extends Controller
           }
           $v = str_replace('${体重}', '', $v);
           $v = str_replace('${身高}', '', $v);
-          $v = str_replace('${今日日期}', date('Y-m-d'), $v);
+          $v = str_replace('${今日日期}',$person->birthday , $v);
           if ($v == '${省市县}') {
             $v = [[
               'value' => '11',
diff --git a/h5/config.js b/h5/config.js
index 3b2c143..0afd50b 100644
--- a/h5/config.js
+++ b/h5/config.js
@@ -1,5 +1,5 @@
 const app_type = 'gzh'
-// const base_url = "https://api.hainan2024.sa0.online" //开发环境
+//const base_url = "https://api.hainan2024.sa0.online" //开发环境
 const base_url="https://tj-h5.hnxdfe.com"  //正式环境
 const config = {
 	api_map_url: base_url + '/api/ApiMap/h5',
diff --git a/h5/pages/main/question/question/question.vue b/h5/pages/main/question/question/question.vue
index 5901be1..4e2c239 100644
--- a/h5/pages/main/question/question/question.vue
+++ b/h5/pages/main/question/question/question.vue
@@ -659,7 +659,7 @@
 	.push_log_wrapper {
 		position: absolute;
 		z-index: 9;
-		width: 210rpx;
+		width: 250rpx;
 		height: 50rpx;
 		background: #38C6BC;
 		right: 30rpx;
@@ -667,7 +667,7 @@
 		border-radius: 6rpx;
 		margin: 40rpx auto 0;
 		font-weight: 500;
-		font-size: 16rpx;
+		font-size: 22rpx;
 		color: #FFFFFF;
 		line-height: 50rpx;
 		text-align: center;
diff --git a/h5/pages/main/tj/tjxq.vue b/h5/pages/main/tj/tjxq.vue
index 39763e3..15202ab 100644
--- a/h5/pages/main/tj/tjxq.vue
+++ b/h5/pages/main/tj/tjxq.vue
@@ -173,6 +173,7 @@
 		};
 		const response = await $api("BuyInfo", obj);
 		$response(response, () => {
+			uni.hideLoading();
 			if (groupId.value && response.data.group_info.length) {
 				// 团检
 				groupInfo.value = response.data.group_info[0];
@@ -203,7 +204,7 @@
 			}
 			totalPrice.value = response.data.true_price;
 			tabIndex.value = 0;
-			uni.hideLoading();
+			
 		});
 	};