From 9ee991c90dfb2df674fa321c13edfa86369e8c82 Mon Sep 17 00:00:00 2001
From: yanzai <boy_yan@163.com>
Date: Sun, 31 Mar 2024 21:26:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E7=99=BB=E5=BD=95=E8=83=BD=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=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/main/combo/combo.vue       | 6 +++++-
 大庆普济医院小程序/pages/main/combo/combo_image.vue | 5 +++++
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/ComboItemController.php b/app/Http/Controllers/ComboItemController.php
index 858ca98..3ff1a3f 100644
--- a/app/Http/Controllers/ComboItemController.php
+++ b/app/Http/Controllers/ComboItemController.php
@@ -243,7 +243,7 @@ class ComboItemController extends Controller
 
   public function mp_combo_list(Request $request)
   {
-    Login::user();
+   // Login::user();
     $hospital = $request->post('hospital');
     $list = self::combo($hospital, [
       '价格下限' => "0",
diff --git a/大庆普济医院小程序/lu/axios.js b/大庆普济医院小程序/lu/axios.js
index 22078b3..be4b69f 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/main/combo/combo.vue b/大庆普济医院小程序/pages/main/combo/combo.vue
index 050fd1b..c1da561 100644
--- a/大庆普济医院小程序/pages/main/combo/combo.vue
+++ b/大庆普济医院小程序/pages/main/combo/combo.vue
@@ -22,6 +22,7 @@
 	import {
 		useStore
 	} from '@/store'
+		 import CheckLogin from '@/components/check_login/check_login.vue'
 	const $store = useStore()
 	onShow(() => {
 		setComboItemOpenFunc()
@@ -217,13 +218,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">
diff --git a/大庆普济医院小程序/pages/main/combo/combo_image.vue b/大庆普济医院小程序/pages/main/combo/combo_image.vue
index 0e0460b..79a87c3 100644
--- a/大庆普济医院小程序/pages/main/combo/combo_image.vue
+++ b/大庆普济医院小程序/pages/main/combo/combo_image.vue
@@ -1,5 +1,6 @@
 <template>
 	<view>
+		
 		<view v-if="image_list.length>0 && is_show_image==true" class="tututu">
 			<view v-for="(item,index) in image_list" :key="index">
 				<image mode="widthFix" :src="$url+item" />
@@ -24,6 +25,7 @@
 	 	$image,
 	 	$response
 	 } from '@/api'
+
 	 import {
 	 	onShow
 	 } from '@dcloudio/uni-app'
@@ -41,6 +43,7 @@
 	 		combo:$store.buy_info.combo
 	 	})
 	 	$response(response, () => {
+
 	 		 if(response.data.info){
 	 			let arr = response.data.info.imgs.split(",")
 	 			 
@@ -86,7 +89,9 @@
 		 }
 		
 	 }
+
 	onShow(() => {
+		 
 	 	getComboImage()
 	})
 </script>