From 375a31fa03281374f9a9da7bc77068d074b715e7 Mon Sep 17 00:00:00 2001
From: yanzai <boy_yan@163.com>
Date: Tue, 30 Jan 2024 20:47:03 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=B5=81=E7=A8=8B=EF=BC=8C?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8A=A5=E5=91=8A=E9=A2=84=E8=A7=88=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD=EF=BC=8C=E4=BC=98=E5=8C=96=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/ComboItemController.php  |   2 +-
 app/Http/Controllers/HospitalController.php   |   2 +-
 大庆普济医院小程序/pages.json                 |  12 +-
 大庆普济医院小程序/pages/buy/info/info.vue    |  59 +++++-----
 大庆普济医院小程序/pages/main/combo/combo.vue |  19 +--
 .../pages/main/combo/combo_image.vue          | 111 ++++++++++++++++++
 大庆普济医院小程序/pages/test/test.vue        | 108 ++++++++++++-----
 .../components/report/type3.vue               |   9 +-
 8 files changed, 249 insertions(+), 73 deletions(-)
 create mode 100644 大庆普济医院小程序/pages/main/combo/combo_image.vue

diff --git a/app/Http/Controllers/ComboItemController.php b/app/Http/Controllers/ComboItemController.php
index 2b1612b..858ca98 100644
--- a/app/Http/Controllers/ComboItemController.php
+++ b/app/Http/Controllers/ComboItemController.php
@@ -307,7 +307,7 @@ class ComboItemController extends Controller
   public function GetComboImageList(Request $request){
     $hospital = $request->post('hospital');
     $combo = $request->post('combo');
-    $info=DB::table('hospital_combo')->where(['hospital'=>$hospital,'combo_id'=>$combo])->first();
+    $info=DB::table('hospital_combo')->where(['hospital'=>$hospital,'combo_id'=>$combo])->where('imgs','<>','')->first();
     return Yo::echo([
       'info' => $info
     ]);
diff --git a/app/Http/Controllers/HospitalController.php b/app/Http/Controllers/HospitalController.php
index 328dd0d..a3bf3f3 100644
--- a/app/Http/Controllers/HospitalController.php
+++ b/app/Http/Controllers/HospitalController.php
@@ -70,7 +70,7 @@ class HospitalController extends Controller
   public function select_list()
   {
     Login::admin();
-    $list = Hospital::where('del', 2)->get();
+    $list = Hospital::where('del', 2)->where('status',1)->get();
     return Yo::echo([
       'list' => $list
     ]);
diff --git a/大庆普济医院小程序/pages.json b/大庆普济医院小程序/pages.json
index 8eaecfc..b656321 100644
--- a/大庆普济医院小程序/pages.json
+++ b/大庆普济医院小程序/pages.json
@@ -9,7 +9,8 @@
 		"path": "pages/main/user/user",
 		"style": {
 			"navigationBarTitleText": "我的",
-			"enablePullDownRefresh": false
+			"enablePullDownRefresh": false,
+			"navigationStyle": "custom"
 		}
 
 	}, {
@@ -52,6 +53,15 @@
             }
             
         }
+        ,{
+            "path" : "pages/main/combo/combo_image",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"subPackages": [{
 		"root": "pages/buy",
diff --git a/大庆普济医院小程序/pages/buy/info/info.vue b/大庆普济医院小程序/pages/buy/info/info.vue
index 3fc2d77..3091643 100644
--- a/大庆普济医院小程序/pages/buy/info/info.vue
+++ b/大庆普济医院小程序/pages/buy/info/info.vue
@@ -109,33 +109,33 @@
 		if (type === 1) nextClick(false)
 		if (type === 0) next_text.value = '下一步'
 	}
-	//获取图片列表
-	let image_list=ref([])
-	let is_show_image=ref(false)
-	const getComboImage=async()=>{
-		const response = await GetComboImageListAction({
-			hospital: $store.buy_info.hospital,
-			combo:$store.buy_info.combo
-		})
-		$response(response, () => {
-			 if(response.data.info){
-				let arr = response.data.info.imgs.split(",")
+	// //获取图片列表
+	// let image_list=ref([])
+	// let is_show_image=ref(false)
+	// const getComboImage=async()=>{
+	// 	const response = await GetComboImageListAction({
+	// 		hospital: $store.buy_info.hospital,
+	// 		combo:$store.buy_info.combo
+	// 	})
+	// 	$response(response, () => {
+	// 		 if(response.data.info){
+	// 			let arr = response.data.info.imgs.split(",")
 				 
-				arr.forEach(function(v,k){
-					if(v != ""){
-						image_list.value.push(v)
-						is_show_image.value=true
-					}
-				})
-				console.log( image_list.value)
-			 }else{
-				image_list.value=[]
-			 }
-			 console.log(image_list.value.length)
-		})
-	}
+	// 			arr.forEach(function(v,k){
+	// 				if(v != ""){
+	// 					image_list.value.push(v)
+	// 					is_show_image.value=true
+	// 				}
+	// 			})
+	// 			console.log( image_list.value)
+	// 		 }else{
+	// 			image_list.value=[]
+	// 		 }
+	// 		 console.log(image_list.value.length)
+	// 	})
+	// }
 	onShow(() => {
-		getComboImage()
+	//	getComboImage()
 		getUserInfo()
 		HospitalExtraInfo('order_type')
 		HospitalExtraInfo('readme')
@@ -145,7 +145,7 @@
 <template>
 	<view>
 		<view class="top_line_wrapper"></view>
-		<view v-if="image_list.length>0 && is_show_image==true" class="tututu">
+		<!-- <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" />
 			</view>
@@ -155,8 +155,8 @@
 				</view>
 			</view>
 			
-		</view>
-		<view v-if="!!buy_info && (image_list.length==0 || is_show_image==false) ">
+		</view> -->
+		<view v-if="!!buy_info">
 			<view v-if="!!buy_info.combo" class="combo_info_wrapper">
 				<view class="combo_info_name_wrapper">{{ buy_info.combo.name }}</view>
 				<view class="combo_info_tag_wrapper">
@@ -606,8 +606,7 @@
 	}
 	.tututu image{
 		 width: 100%;
-	 
-		
+
 	}
 	.tu_button_main{
 		padding: 0rpx 20rpx;
diff --git a/大庆普济医院小程序/pages/main/combo/combo.vue b/大庆普济医院小程序/pages/main/combo/combo.vue
index 9bd12b3..050fd1b 100644
--- a/大庆普济医院小程序/pages/main/combo/combo.vue
+++ b/大庆普济医院小程序/pages/main/combo/combo.vue
@@ -201,15 +201,20 @@
 			$store.buy_info.items = items_ids
 			$store.buy_info.group = ''
 			$store.buy_info.time = time
-			if ($store.buy_info.person.length === 0) {
+			// 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.navigateTo({
-					url: '/pages/buy/person/person?type=info'
+					url: '/pages/main/combo/combo_image'
 				})
-			} else {
-				uni.navigateTo({
-					url: '/pages/buy/info/info'
-				})
-			}
 		}
 	}
 
diff --git a/大庆普济医院小程序/pages/main/combo/combo_image.vue b/大庆普济医院小程序/pages/main/combo/combo_image.vue
new file mode 100644
index 0000000..0e0460b
--- /dev/null
+++ b/大庆普济医院小程序/pages/main/combo/combo_image.vue
@@ -0,0 +1,111 @@
+<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" />
+			</view>
+			<view class="tu_button_main">
+				<view class="tu_button" @click="goto('1')">
+					下一步
+				</view>
+			</view>
+			
+		</view>
+	</view>
+</template>
+
+<script setup>
+	 import {
+	 	ref
+	 } from 'vue'
+	 import {
+	 	GetComboImageListAction,
+	 	$url,
+	 	$image,
+	 	$response
+	 } from '@/api'
+	 import {
+	 	onShow
+	 } from '@dcloudio/uni-app'
+	 import {
+	 	useStore
+	 } from '@/store'
+	 const $store = useStore()
+	 
+	 //获取图片列表
+	 let image_list=ref([])
+	 let is_show_image=ref(false)
+	 const getComboImage=async()=>{
+	 	const response = await GetComboImageListAction({
+	 		hospital: $store.buy_info.hospital,
+	 		combo:$store.buy_info.combo
+	 	})
+	 	$response(response, () => {
+	 		 if(response.data.info){
+	 			let arr = response.data.info.imgs.split(",")
+	 			 
+	 			arr.forEach(function(v,k){
+	 				if(v != ""){
+	 					image_list.value.push(v)
+	 					is_show_image.value=true
+	 				}
+	 			})
+	 			console.log( image_list.value)
+	 		 }else{
+	 			image_list.value=[]
+	 		 }
+	 		 console.log(image_list.value.length)
+			 if(image_list.value.length>0){
+				 
+			 }else{
+				goto('noimage')
+			 }
+	 	})
+	 }
+	 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'
+			 	})
+			 }
+		 }
+		
+	 }
+	onShow(() => {
+	 	getComboImage()
+	})
+</script>
+
+<style scoped>
+	.tututu image{
+		 width: 100%;
+	}
+	.tu_button_main{
+		padding: 0rpx 20rpx;
+	}
+	.tu_button{
+		position: fixed;
+		bottom: 60rpx;
+		border: 1px solid #5FCAEA;
+		padding:10rpx 0rpx;
+		height: 50rpx;
+		border-radius: 25rpx;
+		width:calc(100% - 40rpx) ;
+		text-align: center;
+	}
+</style>
diff --git a/大庆普济医院小程序/pages/test/test.vue b/大庆普济医院小程序/pages/test/test.vue
index b52ff6a..eb31e0e 100644
--- a/大庆普济医院小程序/pages/test/test.vue
+++ b/大庆普济医院小程序/pages/test/test.vue
@@ -1,44 +1,90 @@
 <template>
 	<view>
-		正在加载请稍后...
+		<view v-if="downLoadOk==false" class="loading">正在加载请稍后...</view>
+		<view v-else class="tishi">
+			<view class="tishi2">
+				<view>文档打开后</view>
+				<view>点击右上角按钮，然后选择“保存到手机”即可下载</view>
+			</view>
+			<view class="ok" @click="openfile()">
+				我知道了,打开文档
+			</view>
+		</view>
 	</view>
 </template>
 
 <script setup>
-    import {
-    	ref
-    } from 'vue'
- 
-    import {
-    	onLoad
-    } from '@dcloudio/uni-app'
-	
-	onLoad((e)=>{
+	import {
+		ref
+	} from 'vue'
+
+	import {
+		onLoad
+	} from '@dcloudio/uni-app'
+
+	let downLoadOk = ref(false);
+	onLoad((e) => {
 		console.log(e)
 		tiao(e)
 	})
-	const tiao=(e)=>{
-		 uni.downloadFile({
-		    url: e.url,
-		    success: function (res) {
-		      var filePath = res.tempFilePath;
-		      uni.openDocument({
-		        filePath: filePath,
-		        success: function (res) {
-		          console.log("打开文档成功");
-				  wx.navigateBack({
-				    delta: 1
-				  })
-		        },
-		      });
-		    },
-		  });
-		// uni.navigateTo({
-		// 	url:'/pages/test/test'
-		// })
+	let filePath = ref('');
+	const tiao = (e) => {
+		console.log("开始下载")
+		uni.downloadFile({
+			url: e.url,
+			success: function(res) {
+				downLoadOk.value = true
+				filePath.value = res.tempFilePath;
+
+			},
+		});
+
+	}
+	const openfile = () => {
+		uni.openDocument({
+			filePath: filePath.value,
+			showMenu: true,
+			success: function(res) {
+				console.log("打开文档成功");
+				wx.navigateBack({
+					delta: 1
+				})
+			},
+		});
 	}
 </script>
 
-<style>
+<style scoped>
+	.loading {
+		margin-top: 200rpx;
+		width: 100%;
+		text-align: center;
+	}
 
-</style>
+	.tishi {
+		width: 100%;
+		height: calc(100vh - 200rpx);
+		background-color: black;
+		opacity: 0.5;
+		color: #fff;
+		padding-top: 200rpx;
+	}
+
+	.tishi2 {
+		width: 50%;
+		margin-left: auto;
+		margin-right: auto;
+		text-align: center;
+	}
+
+	.ok {
+		width: 50%;
+		margin-left: auto;
+		margin-right: auto;
+		text-align: center;
+		border: 1px solid #fff;
+		margin-top: 70%;
+		padding: 20rpx;
+		border-radius: 20rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/大庆普济医院报告对比/components/report/type3.vue b/大庆普济医院报告对比/components/report/type3.vue
index 7dc8d5a..294d370 100644
--- a/大庆普济医院报告对比/components/report/type3.vue
+++ b/大庆普济医院报告对比/components/report/type3.vue
@@ -92,7 +92,12 @@
 	}
 	let Env = ''
 	onMounted(() => {
-		console.log('----------')
+		console.log(props.list)
+		 if(props.list && props.list.list.length>0){
+			 
+		 }else{
+			 uni.$lu.toast("暂无报告可下载")
+		 }
 		Env = uni.getSystemInfoSync().platform
 		console.log(Env)
 	})
@@ -121,7 +126,7 @@
 						</view>
 						<view class="t_title">报告预览</view>
 					</view>
-					<view class="t_row" @click="jianqieban(url)">
+					<view class="t_row" v-if="Env != 'android'" @click="jianqieban(url)">
 						<view class="t_logo"><uni-icons type="download-filled" color="#42b983" size="60rpx"></uni-icons>
 						</view>
 						<view class="t_title">报告下载</view>