From 49c6a3ec83da74e495f1c8ac17597449d04d14fb Mon Sep 17 00:00:00 2001
From: sa0ChunLuyu <sa0Chun_luyu@aliyun.com>
Date: Fri, 18 Oct 2024 15:49:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20=E5=A5=97=E9=A4=90?=
 =?UTF-8?q?=E5=AF=B9=E6=AF=94=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 h5/pages/buy/contrast/contrast.vue | 77 +++++++++++++++++++++---------
 1 file changed, 54 insertions(+), 23 deletions(-)

diff --git a/h5/pages/buy/contrast/contrast.vue b/h5/pages/buy/contrast/contrast.vue
index aa974c6..bde6617 100644
--- a/h5/pages/buy/contrast/contrast.vue
+++ b/h5/pages/buy/contrast/contrast.vue
@@ -1,5 +1,5 @@
 <script setup>
-import DraggableButton from "@/pages/components/goHome.vue";
+	import DraggableButton from "@/pages/components/goHome.vue";
 	/**
 	 * name：
 	 * user：sa0ChunLuyu
@@ -31,6 +31,7 @@ import DraggableButton from "@/pages/components/goHome.vue";
 					if (!(item_id in item_map)) {
 						item_map[item_id] = {
 							name: combo_info.value[i].items[j].name,
+							group: combo_info.value[i].items[j].keshi_name,
 							value: [false, false, false]
 						}
 					}
@@ -59,21 +60,39 @@ import DraggableButton from "@/pages/components/goHome.vue";
 				}
 			}
 		}
-		return data
+		let group_map = {}
+		for (let i in data) {
+			if (!(data[i].group in group_map)) {
+				group_map[data[i].group] = {
+					group: data[i].group,
+					items: []
+				}
+			}
+			group_map[data[i].group].items.push(data[i])
+		}
+		let ret_list = []
+		for (let i in group_map) {
+			ret_list.push(group_map[i])
+		}
+		return ret_list
 	})
 	const base_info = computed(() => {
 		let data = [{
 			title: '体检类型',
-			value: ['-', '-', '-']
+			value: ['-', '-', '-'],
+			show: true
 		}, {
 			title: '预约人数',
-			value: ['-', '-', '-']
+			value: ['-', '-', '-'],
+			show: false
 		}, {
 			title: '项目数量',
-			value: ['-', '-', '-']
+			value: ['-', '-', '-'],
+			show: true
 		}, {
 			title: '性别婚否',
-			value: ['-', '-', '-']
+			value: ['-', '-', '-'],
+			show: true
 		}]
 		for (let i = 0; i <= 2; i++) {
 			if (!!combo_info.value[i]) {
@@ -200,10 +219,12 @@ import DraggableButton from "@/pages/components/goHome.vue";
 		<view class="item_info_wrapper">
 			<view class="title_wrapper">基本信息</view>
 			<view class="table_wrapper">
-				<view class="table_line_wrapper" v-for="(i,k) in base_info" :key="k">
-					<view class="table_title_wrapper">{{ i.title }}</view>
-					<view class="table_item_wrapper" v-for="(ii,ik) in i.value" :key="ik">{{ ii }}</view>
-				</view>
+				<template v-for="(i,k) in base_info">
+					<view class="table_line_wrapper" v-if="!!i.show" :key="k">
+						<view class="table_title_wrapper">{{ i.title }} </view>
+						<view class="table_item_wrapper" v-for="(ii,ik) in i.value" :key="ik">{{ ii }}</view>
+					</view>
+				</template>
 			</view>
 			<view class="title_line_wrapper">
 				<view class="title_wrapper">项目信息</view>
@@ -223,17 +244,17 @@ import DraggableButton from "@/pages/components/goHome.vue";
 						</view>
 					</view>
 				</view>
-				<view class="table_large_line_wrapper" v-for="(i,k) in item_info" :key="k">
-					<view class="table_large_title_wrapper">
-						<view class="table_large_title_show_wrapper" v-if="k === 0">
-							<view>科</view>
-							<view>室</view>
-							<view>检</view>
-							<view>查</view>
+				<view v-for="(j,jk) in item_info" :key="jk">
+					<view class="table_large_line_wrapper" v-for="(i,k) in j.items" :key="k">
+						<view class="table_large_title_wrapper">
+							<view class="table_large_title_show2_wrapper"
+								v-if="(k + 1) === Math.min(Math.ceil(j.items.length / 2),4)">
+								<view>{{ j.group }}</view>
+							</view>
+						</view>
+						<view class="table_item_wrapper table_large_item_wrapper" v-for="(ii,ik) in i.value" :key="ik">
+							<view class="table_large_text_wrapper">{{ ii ? i.name : '-' }}</view>
 						</view>
-					</view>
-					<view class="table_item_wrapper table_large_item_wrapper" v-for="(ii,ik) in i.value" :key="ik">
-						<view class="table_large_text_wrapper">{{ ii ? i.name : '-' }}</view>
 					</view>
 				</view>
 			</view>
@@ -266,9 +287,9 @@ import DraggableButton from "@/pages/components/goHome.vue";
 		text-align: center;
 		width: 142rpx;
 		text-align: center;
-		background: #F2F2F2;
 		height: 91rpx;
 		position: relative;
+		background: #F2F2F2;
 		border-bottom: 1rpx solid #F2F2F2;
 	}
 
@@ -278,10 +299,20 @@ import DraggableButton from "@/pages/components/goHome.vue";
 		left: 0;
 		right: 0;
 		height: 100%;
-		height: 430rpx;
+		height: 420rpx;
 		padding-top: 170rpx;
-		z-index: 9;
 		background: #F2F2F2;
+		z-index: 9;
+	}
+
+	.table_large_title_show2_wrapper {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		line-height: 30rpx;
+		height: 100%;
+		width: calc(100% - 20rpx);
+		margin: 0 auto;
 	}
 
 	.table_wrapper {