From a7020d94efd938b7c31f3480796f62601007ca5e Mon Sep 17 00:00:00 2001
From: yanzai <boy_yan@163.com>
Date: Wed, 2 Jul 2025 17:52:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=20=E9=A1=B5=E9=9D=A2=E7=99=BB=E5=BD=95=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/check_login/check_login.vue    | 11 ++--
 大庆普济医院小程序/lu/axios.js                |  3 +
 大庆普济医院小程序/pages/main/combo/combo.vue |  3 +-
 .../pages/main/combo/combo_image.vue          | 62 ++++++++++++-------
 大庆普济医院小程序/pages/main/home/home.vue   |  2 +-
 5 files changed, 51 insertions(+), 30 deletions(-)

diff --git a/大庆普济医院小程序/components/check_login/check_login.vue b/大庆普济医院小程序/components/check_login/check_login.vue
index 4f8f48e..8b1f1ad 100644
--- a/大庆普济医院小程序/components/check_login/check_login.vue
+++ b/大庆普济医院小程序/components/check_login/check_login.vue
@@ -193,15 +193,18 @@
 
 	.check_login_popup_wrapper {
 		position: relative;
-		z-index: 9999;
+		z-index: 9909;
 	}
 
 	.check_login_cover_wrapper {
-		position: fixed;
+		/* background-color: #0DC5CF; */
+		position: fixed ;
+		
+		
 		top: 0;
-		bottom: 0;
+		bottom: 400rpx;
 		left: 0;
 		right: 0;
-		z-index: 9998;
+		z-index: 9908;
 	}
 </style>
\ No newline at end of file
diff --git a/大庆普济医院小程序/lu/axios.js b/大庆普济医院小程序/lu/axios.js
index be4b69f..c7eac20 100644
--- a/大庆普济医院小程序/lu/axios.js
+++ b/大庆普济医院小程序/lu/axios.js
@@ -8,6 +8,8 @@ const noLogin = [
 	'Carousel/list',
 	'Hospital/info',
 	'Combo/list',
+	'Buy/info',
+	'Combo/GetComboImageList',
 	'YO',
 ]
 
@@ -17,6 +19,7 @@ export const $post = async ({
 }) => {
 	let token = getToken() ? getToken() : '';
 	if (noLogin.indexOf(url) === -1 && token === '') {
+		console.log("请登录,Url:"+url)
 		uni.$lu.toast("请登录")
 		return false
 	}
diff --git a/大庆普济医院小程序/pages/main/combo/combo.vue b/大庆普济医院小程序/pages/main/combo/combo.vue
index c1da561..cd09ab5 100644
--- a/大庆普济医院小程序/pages/main/combo/combo.vue
+++ b/大庆普济医院小程序/pages/main/combo/combo.vue
@@ -222,12 +222,13 @@
 		
 	}
 	const comboClick = (id) => {
+		console.log(uni.$lu.open.combo_item_open)
 		uni.$lu.open.combo_item_open(id, '', '{"id":0,"date":null}')
 	}
 </script>
 <template>
 	<view>
-		<CheckLogin @callback="loginCallback()"></CheckLogin>
+		<!-- <CheckLogin @callback="loginCallback()"></CheckLogin> -->
 		<view class="top_line_wrapper"></view>
 		<view class="hospital_wrapper">
 			<view class="hospital_logo_wrapper">
diff --git a/大庆普济医院小程序/pages/main/combo/combo_image.vue b/大庆普济医院小程序/pages/main/combo/combo_image.vue
index 79a87c3..daed8fa 100644
--- a/大庆普济医院小程序/pages/main/combo/combo_image.vue
+++ b/大庆普济医院小程序/pages/main/combo/combo_image.vue
@@ -6,8 +6,8 @@
 				<image mode="widthFix" :src="$url+item" />
 			</view>
 			<view class="tu_button_main">
-				<view class="tu_button" @click="goto('1')">
-					下一步
+				<view class="tu_button" >
+					<view @click="goto('1')">下一步</view>
 				</view>
 			</view>
 			
@@ -25,7 +25,7 @@
 	 	$image,
 	 	$response
 	 } from '@/api'
-
+import CheckLogin from '@/components/check_login/check_login.vue'
 	 import {
 	 	onShow
 	 } from '@dcloudio/uni-app'
@@ -66,30 +66,44 @@
 	 	})
 	 }
 	 const goto=(type)=>{
-		 if(type=='noimage'){
-			 if ($store.buy_info.person.length === 0) {
-			 	uni.reLaunch({
-			 		url: '/pages/buy/person/person?type=info'
-			 	})
-			 } else {
-			 	uni.reLaunch({
-			 		url: '/pages/buy/info/info'
-			 	})
-			 }
-		 }else{
-			 if ($store.buy_info.person.length === 0) {
-			 	uni.navigateTo({
-			 		url: '/pages/buy/person/person?type=info'
-			 	})
-			 } else {
-			 	uni.navigateTo({
-			 		url: '/pages/buy/info/info'
-			 	})
+		 uni.$lu.user((info) => {
+			 console.log('---------',info)
+			 if(info.id===0){
+				 uni.$lu.toast("请登录")
+				 setTimeout(()=>{
+					 uni.switchTab({
+					 	url: '/pages/main/home/home'
+					 })
+				 },1000)
+				
+				 return false;
+			 }else{
+				 if(type=='noimage'){
+				 			 if ($store.buy_info.person.length === 0) {
+				 			 	uni.reLaunch({
+				 			 		url: '/pages/buy/person/person?type=info'
+				 			 	})
+				 			 } else {
+				 			 	uni.reLaunch({
+				 			 		url: '/pages/buy/info/info'
+				 			 	})
+				 			 }
+				 }else{
+				 			 if ($store.buy_info.person.length === 0) {
+				 			 	uni.navigateTo({
+				 			 		url: '/pages/buy/person/person?type=info'
+				 			 	})
+				 			 } else {
+				 			 	uni.navigateTo({
+				 			 		url: '/pages/buy/info/info'
+				 			 	})
+				 			 }
+				 }
 			 }
-		 }
+		 })
+		
 		
 	 }
-
 	onShow(() => {
 		 
 	 	getComboImage()
diff --git a/大庆普济医院小程序/pages/main/home/home.vue b/大庆普济医院小程序/pages/main/home/home.vue
index a3722e0..be1e7ee 100644
--- a/大庆普济医院小程序/pages/main/home/home.vue
+++ b/大庆普济医院小程序/pages/main/home/home.vue
@@ -195,7 +195,7 @@
 			<view class="user_status_text_wrapper" v-if="!!user_info.id && !user_info.person.id">您还没有添加体检人，<text>点击添加</text>
 			</view>
 		</view>
-		<CheckLogin @callback="loginCallback()"></CheckLogin>
+		<CheckLogin @callback="loginCallback()"  ></CheckLogin>
 		<view class="carousel_wrapper">
 			<swiper v-if="carouse_list.length > 0" class="swiper_wrapper" circular :autoplay="true" :duration="500">
 				<swiper-item v-for="(i,k) in carouse_list" :key="k">