From 72d9d1dc6f3c3a05b0f9913b50ec85b2f009a487 Mon Sep 17 00:00:00 2001
From: yanzai <boy_yan@163.com>
Date: Mon, 10 Nov 2025 17:06:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E5=BE=AE=E4=BF=A1=E8=A6=81=E6=B1=82?=
 =?UTF-8?q?=EF=BC=8C=E6=9C=AA=E7=99=BB=E5=BD=95=E8=83=BD=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E5=A5=97=E9=A4=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/ComboItemController.php      |  2 +-
 菏泽颐圣体检中心小程序/lu/axios.js                |  1 +
 菏泽颐圣体检中心小程序/pages/buy/info/info.vue    | 15 ++++++++++++---
 .../pages/buy/person/person.vue                   |  5 +++++
 菏泽颐圣体检中心小程序/pages/main/combo/combo.vue |  9 +++++++--
 5 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/ComboItemController.php b/app/Http/Controllers/ComboItemController.php
index f7df40e..6bd7c58 100644
--- a/app/Http/Controllers/ComboItemController.php
+++ b/app/Http/Controllers/ComboItemController.php
@@ -218,7 +218,7 @@ class ComboItemController extends Controller
 
   public function mp_buy_info(Request $request)
   {
-    Login::user();
+   // Login::user();
     $hospital = $request->post('hospital');
     $combo = $request->post('combo');
     $count = 0;
diff --git a/菏泽颐圣体检中心小程序/lu/axios.js b/菏泽颐圣体检中心小程序/lu/axios.js
index 591d908..03635ae 100644
--- a/菏泽颐圣体检中心小程序/lu/axios.js
+++ b/菏泽颐圣体检中心小程序/lu/axios.js
@@ -7,6 +7,7 @@ const noLogin = [
 	'Config/get',
 	'Carousel/list',
 	'Hospital/info',
+	'Combo/list',
 	'YO',
 ]
 
diff --git a/菏泽颐圣体检中心小程序/pages/buy/info/info.vue b/菏泽颐圣体检中心小程序/pages/buy/info/info.vue
index 13b4dc0..387019b 100644
--- a/菏泽颐圣体检中心小程序/pages/buy/info/info.vue
+++ b/菏泽颐圣体检中心小程序/pages/buy/info/info.vue
@@ -118,9 +118,18 @@
 		}
 	}
 	const toNext = () => {
-		uni.navigateTo({
-			url: '/pages/buy/check/check'
-		})
+ 
+		if ($store.buy_info.person.length === 0) {
+			uni.navigateTo({
+				url: '/pages/buy/person/person?type=combo_after'
+				 
+			})
+		}else{
+			uni.navigateTo({
+				url: '/pages/buy/check/check'
+			})
+		}
+		
 	}
 
 	const user_info = ref(false)
diff --git a/菏泽颐圣体检中心小程序/pages/buy/person/person.vue b/菏泽颐圣体检中心小程序/pages/buy/person/person.vue
index 8348fec..a2e1d1d 100644
--- a/菏泽颐圣体检中心小程序/pages/buy/person/person.vue
+++ b/菏泽颐圣体检中心小程序/pages/buy/person/person.vue
@@ -73,6 +73,11 @@
 	const toPersonClick = (info) => {
 		$store.buy_info.person = [info]
 		switch ($props.type) {
+			case 'combo_after'://已经选完套餐
+				uni.navigateTo({
+					url: '/pages/buy/check/check'
+				})
+				break;
 			case 'choose':
 				if (order_type_config.value.item === 1) {
 					choose_type_show.value = true
diff --git a/菏泽颐圣体检中心小程序/pages/main/combo/combo.vue b/菏泽颐圣体检中心小程序/pages/main/combo/combo.vue
index 8d336b9..6e80e2e 100644
--- a/菏泽颐圣体检中心小程序/pages/main/combo/combo.vue
+++ b/菏泽颐圣体检中心小程序/pages/main/combo/combo.vue
@@ -22,6 +22,7 @@
 		useStore
 	} from '@/store'
 	const $store = useStore()
+	import CheckLogin from '@/components/check_login/check_login.vue'
 	onShow(() => {
 		setComboItemOpenFunc()
 		getHospitalInfo()
@@ -202,7 +203,8 @@
 			$store.buy_info.time = time
 			if ($store.buy_info.person.length === 0) {
 				uni.navigateTo({
-					url: '/pages/buy/person/person?type=info'
+					//url: '/pages/buy/person/person?type=info'
+					url: '/pages/buy/info/info'
 				})
 			} else {
 				uni.navigateTo({
@@ -211,13 +213,16 @@
 			}
 		}
 	}
-
+const loginCallback=()=>{
+		
+	}
 	const comboClick = (id) => {
 		uni.$lu.open.combo_item_open(id, '', '{"id":0,"date":null}')
 	}
 </script>
 <template>
 	<view>
+		<CheckLogin @callback="loginCallback()"></CheckLogin>
 		<view class="top_line_wrapper"></view>
 		<view class="hospital_wrapper">
 			<view class="hospital_logo_wrapper">