From 1582e79af8cf96905c545328e7d4d60c74310bc9 Mon Sep 17 00:00:00 2001
From: yanzai <boy_yan@163.com>
Date: Wed, 5 Mar 2025 18:23:49 +0800
Subject: [PATCH] =?UTF-8?q?bug=E3=80=81=E4=B8=93=E5=AE=B6=E5=AE=9A?=
 =?UTF-8?q?=E5=88=B6=E5=A5=97=E9=A4=90=E9=97=AE=E5=8F=B7=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../API/Admin/YeWu/PlanController.php         |  2 +-
 h5/pages/main/combo/combo.vue                 | 27 ++++++++++++++++++-
 h5/pages/main/tj/tjxq.vue                     |  9 ++++++-
 3 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/PlanController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/PlanController.php
index 9c37ba2..fd5fb74 100644
--- a/Laravel/app/Http/Controllers/API/Admin/YeWu/PlanController.php
+++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/PlanController.php
@@ -147,7 +147,7 @@ class PlanController extends Controller
     foreach ($list as $k => $v) {
       $list[$k]->plan_type_name = '';
       foreach ($plan_model as $k1 => $v1) {
-        if ($v1->model_id == $v->model_id) {
+        if ($v1->model_id == $v->model_id and $v1->time == $v->time) {
           $list[$k]->plan_type_name = $v1->plan_type_name;
           break;
         }
diff --git a/h5/pages/main/combo/combo.vue b/h5/pages/main/combo/combo.vue
index 78f2da2..e32a0b5 100644
--- a/h5/pages/main/combo/combo.vue
+++ b/h5/pages/main/combo/combo.vue
@@ -498,6 +498,7 @@
 		 }
 		  getComboList();
 	}
+ 
 </script>
 <template>
 	<DraggableButton />
@@ -577,8 +578,21 @@
 					<view class="combo_info_wrapper">
 						<view class="combo_content_wrapper">
 							<view style="display: flex;">
-								<view class="combo_name_wrapper">{{ i.name }} 
+								<view class="combo_name_wrapper">{{ i.name }}
 								</view>
+								 
+								 <uni-tooltip>
+								 	<!-- 定义插槽，插槽名为 content -->
+								 	<template v-slot:content>
+								 		<!-- 在这里编写自定义的 HTML 或组件 -->
+								 		<view class="w-50vw">
+								 			<text>该套餐仅预约专家咨询，现场个性化定制套餐</text>
+								 		</view>
+								 	</template>
+								 		
+								 	<!-- 触发提示的按钮 -->
+								 	<view v-if="i.type_id==zhuangjianType"   class="wenhao">?</view>
+								 </uni-tooltip>
 								<view v-if="i.is_hot">
 									<image style="height: 32rpx;width: 24rpx;" src="@/static/assets/buy/huomiao.jpg"></image>
 								</view>
@@ -1236,5 +1250,16 @@
 		background-color: #009da5;
 		color: #fff;
 	}
+	.wenhao{
+		height: 26rpx;
+		width: 26rpx;
+		background-color: #009FA8;
+		line-height: 26rpx;
+		border-radius: 26rpx;
+		color: #fff;
+		text-align: center;
+		font-size: 20rpx;
+		margin-left: 10rpx;margin-top: 4rpx;
+	}
 	
 </style>
\ No newline at end of file
diff --git a/h5/pages/main/tj/tjxq.vue b/h5/pages/main/tj/tjxq.vue
index 1b7c870..2b4fda4 100644
--- a/h5/pages/main/tj/tjxq.vue
+++ b/h5/pages/main/tj/tjxq.vue
@@ -157,6 +157,13 @@
 			await GetReadmeDetails();
 			popupXuZhi.value.open();
 		}
+		if (step ==3) {
+			await GetReadmeDetails();
+			 popupTip.value.close()
+			popupXuZhi.value.open();
+			 
+		}
+		
 		if (step == 2) {
 			$store.setBuyInfo({
 				combo_id: comboId.value,
@@ -295,7 +302,7 @@
 	    <view class="mt-50rpx between">
 	      <button
 	        type="primary"
-	        @click="toreadme()"
+	        @click="buy(3)"
 	        class="w-196rpx h-68rpx center text-#fff text-24rpx !bg-#239EA3 rounded-8rpx"
 	      >
 	        我想好了