From 14e77f2b474d387fd150baba83be0b90e969fe5d Mon Sep 17 00:00:00 2001
From: yanzai <boy_yan@163.com>
Date: Tue, 7 Jan 2025 23:11:33 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E9=80=89=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/API/H5/ComboController.php    |    2 +-
 h5/pages/main/tj/tjzx_new.vue                 | 1111 +++++++++--------
 h5/static/assets/buy/xiong.png                |  Bin 0 -> 6298 bytes
 3 files changed, 574 insertions(+), 539 deletions(-)
 create mode 100644 h5/static/assets/buy/xiong.png

diff --git a/Laravel/app/Http/Controllers/API/H5/ComboController.php b/Laravel/app/Http/Controllers/API/H5/ComboController.php
index 78a554a..e606113 100644
--- a/Laravel/app/Http/Controllers/API/H5/ComboController.php
+++ b/Laravel/app/Http/Controllers/API/H5/ComboController.php
@@ -452,7 +452,7 @@ select combo_id as c_id,count(*) as sale_count from orders where status in(2,4)
         if (!isset($groupedData[$keshiName])) {
           $groupedData[$keshiName] = [];
         }
-        $groupedData[$keshiName][] = ['desc' => $item->jianjie, 'name' => $item->name,'price'=>$item->price];
+        $groupedData[$keshiName][] = ['desc' => $item->jianjie, 'name' => $item->name,'price'=>$item->price,'original_price'=>$item->original_price,'id'=>$item->item_id];
 
         //如果有影像科，则存储在nmr_list字段
         if($item->keshi_name=='影像科'){
diff --git a/h5/pages/main/tj/tjzx_new.vue b/h5/pages/main/tj/tjzx_new.vue
index d88f219..cb26f66 100644
--- a/h5/pages/main/tj/tjzx_new.vue
+++ b/h5/pages/main/tj/tjzx_new.vue
@@ -1,384 +1,419 @@
 <script setup>
-import DraggableButton from "@/pages/components/goHome.vue";
-/**
- * name：
- * user：sa0ChunLuyu
- * date：2024年9月11日 19:24:50
- */
-import { ref } from "vue";
-import { $api, $response, $image } from "@/api";
-import { onShow } from "@dcloudio/uni-app";
-import { useStore } from "@/store";
+	import DraggableButton from "@/pages/components/goHome.vue";
+	/**
+	 * name：
+	 * user：sa0ChunLuyu
+	 * date：2024年9月11日 19:24:50
+	 */
+	import {
+		ref
+	} from "vue";
+	import {
+		$api,
+		$response,
+		$image
+	} from "@/api";
+	import {
+		onShow
+	} from "@dcloudio/uni-app";
+	import {
+		useStore
+	} from "@/store";
 
-// comboId 套餐ID 没有套餐ID就是个人自选项目
-// itemIds 自选ID
-const $props = defineProps({
-  comboId: {
-    type: String,
-    default: "",
-  },
-  itemIds: {
-    type: String,
-    default: "",
-  },
-  personId: {
-    type: String,
-    default: "",
-  },
-  groupId: {
-    type: String,
-    default: "",
-  },
-  wj: {
-  	type: String,
-  	default: "",
-  },
-});
+	// comboId 套餐ID 没有套餐ID就是个人自选项目
+	// itemIds 自选ID
+	const $props = defineProps({
+		comboId: {
+			type: String,
+			default: "",
+		},
+		itemIds: {
+			type: String,
+			default: "",
+		},
+		personId: {
+			type: String,
+			default: "",
+		},
+		groupId: {
+			type: String,
+			default: "",
+		},
+		wj: {
+			type: String,
+			default: "",
+		},
+	});
 
-const $store = useStore();
+	const $store = useStore();
 
-let wj = ref(""); //
-let leftList = ref({}); // 左侧列表
-let tabIndex = ref(""); // 默认选中
-let rightLeft = ref([]); // 右侧列表
-let selectIds = ref([]); // 选中id列表
-let headImg = ref(""); // 头部图片
-let packagePrice = ref(0); //套餐折扣价格
-let packageOriginalPrice = ref(0); //套餐原始价格
-let optionalPrice = ref(0); //自选折扣价格
-let optionalOriginalPrice = ref(0); //自选原始价格
-let totalPrice = ref(0); // 总折扣价格
-let totalOriginalPrice = ref(0); // 总原始价格
-let total = ref(0); // 总项目数
-let comboId = ref(""); // 套餐id
-let recommendPackageList = ref([]); // 推荐套餐列表
-let popup = ref(null); // 推荐套餐弹窗
-let popupTip = ref(null); // 剩余额度提示弹窗
-let groupLength = ref(0); // 团检自带的套餐数量
-let status = ref(0); // 1个检套餐 2个检自选 3团检套餐 4团检自选
-let personId = ref(""); // 就诊人ID
-let groupId = ref(""); // 团检id
-let losePrice = ref(0); // 剩余金额
-// let query = ref(""); // 参数
+	let wj = ref(""); //
+	let leftList = ref({}); // 左侧列表
+	let tabIndex = ref(""); // 默认选中
+	let rightLeft = ref([]); // 右侧列表
+	let selectIds = ref([]); // 选中id列表
+	let selectItems = ref([]); // 选中项目列表
+	let BuyInfo = ref(""); //BuyInfo接口返回
+	let headImg = ref(""); // 头部图片
+	let packagePrice = ref(0); //套餐折扣价格
+	let packageOriginalPrice = ref(0); //套餐原始价格
+	let optionalPrice = ref(0); //自选折扣价格
+	let optionalOriginalPrice = ref(0); //自选原始价格
+	let totalPrice = ref(0); // 总折扣价格
+	let totalOriginalPrice = ref(0); // 总原始价格
+	let total = ref(0); // 总项目数
+	let comboId = ref(""); // 套餐id
+	let recommendPackageList = ref([]); // 推荐套餐列表
+	let popup = ref(null); // 推荐套餐弹窗
+	let popupTip = ref(null); // 剩余额度提示弹窗
+	let groupLength = ref(0); // 团检自带的套餐数量
+	let status = ref(0); // 1个检套餐 2个检自选 3团检套餐 4团检自选
+	let personId = ref(""); // 就诊人ID
+	let groupId = ref(""); // 团检id
+	let losePrice = ref(0); // 剩余金额
+	// let query = ref(""); // 参数
+	let popupItemList = ref(null); //已选项目列表弹窗
 
-const getComboRecommend = async () => {
-  // 获取推荐套餐
-  const response = await $api("ComboRecommend", {
-    person_id: personId.value,
-    item_ids: selectIds.value,
-  });
-  $response(response, () => {
-    recommendPackageList.value = response.data.combos;
-    if (recommendPackageList.value.length > 0) {
-      popup.value.open("center");
-    } else {
-      toDetails();
-    }
-    uni.hideLoading();
-  });
-};
+	const getComboRecommend = async () => {
+		// 获取推荐套餐
+		const response = await $api("ComboRecommend", {
+			person_id: personId.value,
+			item_ids: selectIds.value,
+		});
+		$response(response, () => {
+			recommendPackageList.value = response.data.combos;
+			if (recommendPackageList.value.length > 0) {
+				popup.value.open("center");
+			} else {
+				toDetails();
+			}
+			uni.hideLoading();
+		});
+	};
 
-const getAllItems = async (e) => {
-  // 获取全部项目
-  const response = await $api("GetAllItems", {
-    search: e?.value,
-  });
-  $response(response, () => {
-    leftList.value = response.data.list;
-    if (Object.keys(leftList.value).length) {
-      let keys = Object.keys(leftList.value);
-      tabIndex.value = keys[0];
-      rightLeft.value = leftList.value[keys[0]].children;
-      headImg.value = leftList.value[keys[0]].head_img;
-    }
-  });
-};
+	const getAllItems = async (e) => {
+		// 获取全部项目
+		const response = await $api("GetAllItems", {
+			search: e?.value,
+		});
+		$response(response, () => {
+			leftList.value = response.data.list;
+			if (Object.keys(leftList.value).length) {
+				let keys = Object.keys(leftList.value);
+				tabIndex.value = keys[0];
+				rightLeft.value = leftList.value[keys[0]].children;
+				headImg.value = leftList.value[keys[0]].head_img;
+			}
+		});
+	};
 
-const getBuyInfo = async () => {
-  // 获取购买信息
-  uni.showLoading({
-    title: "加载中",
-  });
-  let obj = {
-    item_ids: selectIds.value,
-    hospital: $store.save_info.hospital,
-    person_id: personId.value,
-    group_id: groupId.value,
-    combo_id: comboId.value,
-	wj: wj.value,
-  };
-  if (comboId.value) {
-    obj.combo_id = comboId.value;
-  }
-  const response = await $api("BuyInfo", obj);
-  console.log(response)
-  if(response.status===false){
-	   uni.hideLoading();
-	   uni.$lu.toast(response.msg);
-	  return false;
-  }
-  $response(response, () => {
+	const getBuyInfo = async () => {
+		// 获取购买信息
+		uni.showLoading({
+			title: "加载中",
+		});
+		let obj = {
+			item_ids: selectIds.value,
+			hospital: $store.save_info.hospital,
+			person_id: personId.value,
+			group_id: groupId.value,
+			combo_id: comboId.value,
+			wj: wj.value,
+		};
+		if (comboId.value) {
+			obj.combo_id = comboId.value;
+		}
+		const response = await $api("BuyInfo", obj);
+		console.log(response)
+		if (response.status === false) {
+			uni.hideLoading();
+			uni.$lu.toast(response.msg);
+			return false;
+		}
+		$response(response, () => {
 
-    groupLength.value = response.data.group_info
-      ? response.data.group_info[0]?.items?.length
-      : 0;
-    packagePrice.value = response.data.combo_info.price;
-    packageOriginalPrice.value = response.data.combo_info.original_price;
-    optionalPrice.value = response.data.items_info.price;
-    optionalOriginalPrice.value = response.data.items_info.original_price;
-    totalPrice.value = response.data.true_price;
-    totalOriginalPrice.value = response.data.original_price;
-    total.value = response.data.pay_item_count;
-    losePrice.value = response.data.lose_price;
-    if (status.value == 4 && groupLength.value) {
-      // 团检无套餐ID的情况下需要判断一下 是否有团检自带套餐
-      status.value = 3;
-    }
-    uni.hideLoading();
-  });
-};
+			groupLength.value = response.data.group_info ?
+				response.data.group_info[0]?.items?.length :
+				0;
+			packagePrice.value = response.data.combo_info.price;
+			packageOriginalPrice.value = response.data.combo_info.original_price;
+			optionalPrice.value = response.data.items_info.price;
+			optionalOriginalPrice.value = response.data.items_info.original_price;
+			BuyInfo.value = response.data;
+			totalPrice.value = response.data.true_price;
+			totalOriginalPrice.value = response.data.original_price;
+			//total.value = response.data.pay_item_count;
+			losePrice.value = response.data.lose_price;
+			if (status.value == 4 && groupLength.value) {
+				// 团检无套餐ID的情况下需要判断一下 是否有团检自带套餐
+				status.value = 3;
+			}
+			uni.hideLoading();
+		});
+	};
 
-const confirm = async () => {
-  // 确定
-  // status 1个检套餐 2个检自选 3团检套餐 4团检自选
-  if (status.value == 3) {
-    // 团检套餐
-    // query.value = "?groupId=" +
-    //   groupId.value +
-    //   "&itemIds=" +
-    //   itemIds +
-    //   "&comboId=" +
-    //   comboId.value;
-  }
-  if (status.value == 4) {
-    // 团检自选
-    if (!selectIds.value.length) {
-      uni.$lu.toast("请选择项目");
-      return;
-    }
-    if (!groupLength.value) {
-      // 团检项目为空的话需要弹推荐套餐
-      getComboRecommend();
-      return;
-    }
-  }
+	const confirm = async () => {
+		// 确定
+		// status 1个检套餐 2个检自选 3团检套餐 4团检自选
+		if (status.value == 3) {
+			// 团检套餐
+			// query.value = "?groupId=" +
+			//   groupId.value +
+			//   "&itemIds=" +
+			//   itemIds +
+			//   "&comboId=" +
+			//   comboId.value;
+		}
+		if (status.value == 4) {
+			// 团检自选
+			if (!selectIds.value.length) {
+				uni.$lu.toast("请选择项目");
+				return;
+			}
+			if (!groupLength.value) {
+				// 团检项目为空的话需要弹推荐套餐
+				getComboRecommend();
+				return;
+			}
+		}
 
-  if (status.value == 1) {
-    // 个检套餐
-    // query.value = "?itemIds=" + itemIds + "&comboId=" + comboId.value;
-  }
+		if (status.value == 1) {
+			// 个检套餐
+			// query.value = "?itemIds=" + itemIds + "&comboId=" + comboId.value;
+		}
 
-  if (status.value == 2) {
-    // 个检自选
-    // query.value = "?itemIds=" + itemIds + "&personId=" + personId.value;
-    if (!selectIds.value.length) {
-      uni.$lu.toast("请选择项目");
-      return;
-    }
-    // 自选触发推荐套餐
-    getComboRecommend();
-    return;
-  }
-  toDetails();
-};
+		if (status.value == 2) {
+			// 个检自选
+			// query.value = "?itemIds=" + itemIds + "&personId=" + personId.value;
+			if (!selectIds.value.length) {
+				uni.$lu.toast("请选择项目");
+				return;
+			}
+			// 自选触发推荐套餐
+			getComboRecommend();
+			return;
+		}
+		toDetails();
+	};
 
-const toDetails = (state) => {
-  // 去详情页
-  if (losePrice.value > 0 && !state) {
-  //  popupTip.value.open("center"); // 弹剩余额度提醒
-    //return;
-  }
-  const itemIds = selectIds.value.length > 0 ? selectIds.value.join(",") : "";
-  let query = "?comboId=" + comboId.value + "&itemIds=" + itemIds;
-  if (groupId.value) {
-    query += "&groupId=" + groupId.value;
-  }
-  if($props.wj){
-  	query +="&wj="+$props.wj
-  }
-  console.log($props.comboId || $props.itemIds ? 2 : 1);
-  let delta = 0;
-  if (groupId.value) {
-    if (groupLength.value) {
-      delta = 2;
-    } else {
-      if ($props.comboId || $props.itemIds) {
-        delta = 2;
-      } else {
-        delta = 1;
-      }
-    }
-  } else {
-    if ($props.comboId || $props.itemIds) {
-      delta = 2;
-    } else {
-      delta = 1;
-    }
-  }
-  uni.navigateBack({
-    delta: delta,
-    success: () => {
-      let time = setTimeout(
-        () => {
-          clearTimeout(time);
-          uni.navigateTo({
-            url: "/pages/main/tj/tjxq" + query,
-          });
-        },
-        delta == 2 ? 800 : 500
-      );
-    },
-  });
-};
+	const toDetails = (state) => {
+		// 去详情页
+		if (losePrice.value > 0 && !state) {
+			//  popupTip.value.open("center"); // 弹剩余额度提醒
+			//return;
+		}
+		const itemIds = selectIds.value.length > 0 ? selectIds.value.join(",") : "";
+		let query = "?comboId=" + comboId.value + "&itemIds=" + itemIds;
+		if (groupId.value) {
+			query += "&groupId=" + groupId.value;
+		}
+		if ($props.wj) {
+			query += "&wj=" + $props.wj
+		}
+		console.log($props.comboId || $props.itemIds ? 2 : 1);
+		let delta = 0;
+		if (groupId.value) {
+			if (groupLength.value) {
+				delta = 2;
+			} else {
+				if ($props.comboId || $props.itemIds) {
+					delta = 2;
+				} else {
+					delta = 1;
+				}
+			}
+		} else {
+			if ($props.comboId || $props.itemIds) {
+				delta = 2;
+			} else {
+				delta = 1;
+			}
+		}
+		uni.navigateBack({
+			delta: delta,
+			success: () => {
+				let time = setTimeout(
+					() => {
+						clearTimeout(time);
+						uni.navigateTo({
+							url: "/pages/main/tj/tjxq" + query,
+						});
+					},
+					delta == 2 ? 800 : 500
+				);
+			},
+		});
+	};
 
-const buy = async (item) => {
-  if (item) {
-    comboId.value = item.combo_id;
-	selectIds.value=[];
-    await getBuyInfo();
-  }
-  // 预约套餐
-  popup.value.close(); // 关闭推荐套餐弹窗
-  toDetails();
-};
+	const buy = async (item) => {
+		if (item) {
+			comboId.value = item.combo_id;
+			selectIds.value = [];
+			await getBuyInfo();
+		}
+		// 预约套餐
+		popup.value.close(); // 关闭推荐套餐弹窗
+		toDetails();
+	};
 
-const mountedAction = async () => {
-  selectIds.value = $props.itemIds ? $props.itemIds.split(",") : [];
-  comboId.value = $props.comboId || "";
-  personId.value = $store.getUser().person_id || "";
-  groupId.value = $props.groupId || "";
-  wj.value = $props.wj || "";
-  
-  if (groupId.value) {
-    if (comboId.value) {
-      // 团检套餐
-      status.value = 3;
-    } else {
-      // 团检自选
-      status.value = 4;
-    }
-  } else {
-    if (comboId.value) {
-      // 个检套餐
-      status.value = 1;
-    } else {
-      // 个检自选
-      status.value = 2;
-    }
-  }
+	const mountedAction = async () => {
+		selectIds.value = $props.itemIds ? $props.itemIds.split(",") : [];
+		comboId.value = $props.comboId || "";
+		personId.value = $store.getUser().person_id || "";
+		groupId.value = $props.groupId || "";
+		wj.value = $props.wj || "";
 
-  console.log(status.value, "1个检套餐 2个检自选 3团检套餐 4团检自选");
+		if (groupId.value) {
+			if (comboId.value) {
+				// 团检套餐
+				status.value = 3;
+			} else {
+				// 团检自选
+				status.value = 4;
+			}
+		} else {
+			if (comboId.value) {
+				// 个检套餐
+				status.value = 1;
+			} else {
+				// 个检自选
+				status.value = 2;
+			}
+		}
 
-  await getAllItems(); // 获取全部项目
-  // await getComboRecommend();
-  await getBuyInfo(); // 获取购买信息
-};
+		console.log(status.value, "1个检套餐 2个检自选 3团检套餐 4团检自选");
+
+		await getAllItems(); // 获取全部项目
+		// await getComboRecommend();
+		await getBuyInfo(); // 获取购买信息
+	};
+
+	const config_ref = ref(null);
+	const configRef = (e) => {
+		if (!config_ref.value) {
+			config_ref.value = e;
+			mountedAction();
+		}
+	};
+	const XuanZeItem = async (item) => {
+		let doi = ""
+		if (selectIds.value.includes(item.id)) {
+			selectIds.value.splice(selectIds.value.indexOf(item.id), 1);
+			doi = "del"
+		} else {
+			selectIds.value.push(item.id);
+			doi = "add"
+		}
+		let a = await getBuyInfo()
+		if (a === false) {
+			if (doi == "add") {
+				selectIds.value.splice(selectIds.value.indexOf(item.id), 1);
+			}
+			if (doi == "del") {
+				selectIds.value.push(item.id);
+			}
+
+		}
 
-const config_ref = ref(null);
-const configRef = (e) => {
-  if (!config_ref.value) {
-    config_ref.value = e;
-    mountedAction();
-  }
-};
-const XuanZeItem= async (item)=>{
-    let doi=""
-	if(selectIds.value.includes(item.id)){
-	  selectIds.value.splice(selectIds.value.indexOf(item.id),1);
-	   doi="del"
-	}else{
-	  selectIds.value.push(item.id);
-       doi="add"
 	}
- let a= await getBuyInfo()
- if(a===false){
-	 if(doi=="add"){
-		  selectIds.value.splice(selectIds.value.indexOf(item.id),1);
-	 }
-	 if(doi=="del"){
-	 		selectIds.value.push(item.id);
-	 }
-	
- }
+	const openPopupItemList = () => {
+		selectItems.value = [];
+		if (BuyInfo.value.items_info) {
+			BuyInfo.value.items_info.items.forEach((v, i) => {
+				v.children.forEach((v2, i2) => {
+					selectItems.value.push(v2)
+				})
+			})
+		}
+		if (selectItems.value.length > 0) {
+			popupItemList.value.open()
+		}
 
-}
-onShow(() => {
-  if (!!config_ref.value) {
-    mountedAction();
-  }
-});
+	}
+	const ClearItems=async()=>{
+		selectIds.value=[];
+	    await getBuyInfo()
+		popupItemList.value.close()
+	}
+	onShow(() => {
+		if (!!config_ref.value) {
+			mountedAction();
+		}
+	});
 </script>
 <template>
-  <DraggableButton />
-  <view>
-    <view v-if="!!$store.config">
-      <view :ref="configRef"></view>
-    </view>
-  </view>
-  <uni-popup ref="popupTip">
-    <view
-      class="mb-70rpx bg-#fff text-center box-border pt-80rpx pb-50rpx px-65rpx w-90vw rounded-15rpx"
-    >
-      <view
-        class="w-full text-center text-##090909 text-26rpx line-height-[50rpx]"
-        >您还剩余
-        {{ losePrice }}
-        元体检额度尚未使用，确认提交后剩余体检额度将无法使用!</view
-      >
-      <view class="mt-50rpx between">
-        <button
-          type="primary"
-          @click="toDetails(1)"
-          class="w-196rpx h-68rpx center text-#fff text-24rpx !bg-#239EA3 rounded-8rpx"
-        >
-          我想好了
-        </button>
-        <button
-          @click="popupTip.close()"
-          class="w-196rpx h-68rpx center text-#239EA3 text-24rpx !bg-#D9F3F2 rounded-8rpx"
-        >
-          我再想想
-        </button>
-      </view>
-    </view>
-  </uni-popup>
-  <uni-popup ref="popup">
-    <view class="bg-#fff rounded-15rpx w-95vw px-20rpx box-border">
-      <view class="center relative pt-47rpx pb-32rpx text-36rpx">
-        <text class="line-height-[1]">推荐套餐</text>
-        <uni-icons
-          @click="popup.close()"
-          type="closeempty"
-          color="#A6A6A6"
-          size="26"
-          class="absolute right-40rpx top-30rpx"
-        ></uni-icons>
-      </view>
-      <view
-        v-for="(item, index) in recommendPackageList"
-        :key="index"
-        class="pt-40rpx pb-15rpx box-border b-0 b-t-1 b-solid b-#E1ECEE"
-      >
-        <view class="flex w-full">
-          <image
-            v-if="item.cover"
-            :src="$image(item.cover)"
-            class="w-190rpx h-190rpx mr-37rpx"
-            mode="widthFix"
-          />
-          <view class="flex flex-col grow">
-            <text
-              >{{ item.name }}</text
-            >
-            <view class="mt-13rpx mb-18rpx">
-              <uni-tag
-                v-for="(val, i) in item.tags"
-                :key="i"
-                size="small"
-                :inverted="true"
-                :text="val.text"
-                class="mr-8rpx"
-                :custom-style="
+	<DraggableButton />
+	<view>
+		<view v-if="!!$store.config">
+			<view :ref="configRef"></view>
+		</view>
+	</view>
+	<uni-popup ref="popupItemList" type="bottom">
+		<view class="popupItemList-content">
+			<view style="display: flex;justify-content: space-between;margin-bottom: 34rpx;">
+				<view style="font-size: 30rpx;">已加购项目</view>
+				<view style="color: #9E9E9F;display: flex;align-items: center;" @click="ClearItems()">
+					<uni-icons  type="trash" color="#9E9E9F" size="20"></uni-icons>
+					<view style="font-size: 20rpx;">清空</view>
+				</view>
+			</view> 
+			<view v-for="(item,index) in selectItems">
+				<view class="itemlist_list" @click="XuanZeItem(item)">
+					<view>
+						<view style="display: flex; align-items: center;margin-bottom: 20rpx;">
+							<view class="itemlist_bianhao">{{index+1}}</view>
+							<view class="itemlist_itemname">{{item.name}}</view>
+						</view>
+						<view style="display: flex;align-items: end;">
+							<view class="itemlist_price"><span style="font-size: 20rpx;">￥</span>{{item.price}}</view>
+							<view class="itemlist_org_price line-through">{{item.original_price}}</view>
+						</view>
+					</view>
+					<view :class="{
+					  '!bg-#009fa8 !b-#008e99': selectIds.includes(item.id),
+					}" class="w-24rpx h-24rpx b-1 b-solid b-#009fa8 bg-#fff rounded-24rpx center">
+						<image v-if="selectIds.includes(item.id)" class="w-20rpx" src="@/static/assets/select.png"
+							mode="widthFix" />
+					</view>
+				</view>
+			</view>
+		</view>
+	</uni-popup>
+	<uni-popup ref="popupTip">
+		<view class="mb-70rpx bg-#fff text-center box-border pt-80rpx pb-50rpx px-65rpx w-90vw rounded-15rpx">
+			<view class="w-full text-center text-##090909 text-26rpx line-height-[50rpx]">您还剩余
+				{{ losePrice }}
+				元体检额度尚未使用，确认提交后剩余体检额度将无法使用!
+			</view>
+			<view class="mt-50rpx between">
+				<button type="primary" @click="toDetails(1)"
+					class="w-196rpx h-68rpx center text-#fff text-24rpx !bg-#239EA3 rounded-8rpx">
+					我想好了
+				</button>
+				<button @click="popupTip.close()"
+					class="w-196rpx h-68rpx center text-#239EA3 text-24rpx !bg-#D9F3F2 rounded-8rpx">
+					我再想想
+				</button>
+			</view>
+		</view>
+	</uni-popup>
+	<uni-popup ref="popup">
+		<view class="bg-#fff rounded-15rpx w-95vw px-20rpx box-border">
+			<view class="center relative pt-47rpx pb-32rpx text-36rpx">
+				<text class="line-height-[1]">推荐套餐</text>
+				<uni-icons @click="popup.close()" type="closeempty" color="#A6A6A6" size="26"
+					class="absolute right-40rpx top-30rpx"></uni-icons>
+			</view>
+			<view v-for="(item, index) in recommendPackageList" :key="index"
+				class="pt-40rpx pb-15rpx box-border b-0 b-t-1 b-solid b-#E1ECEE">
+				<view class="flex w-full">
+					<image v-if="item.cover" :src="$image(item.cover)" class="w-190rpx h-190rpx mr-37rpx"
+						mode="widthFix" />
+					<view class="flex flex-col grow">
+						<text>{{ item.name }}</text>
+						<view class="mt-13rpx mb-18rpx">
+							<uni-tag v-for="(val, i) in item.tags" :key="i" size="small" :inverted="true"
+								:text="val.text" class="mr-8rpx" :custom-style="
                   'background-color:' +
                   val.color +
                   ';border-color:' +
@@ -386,205 +421,205 @@ onShow(() => {
                   '; color:' +
                   val.text_color +
                   ';'
-                "
-              />
-            </view>
-            <view>
-              <text
-                v-for="(val, i) in item.tags2"
-                :key="i"
-                class="text-#8B8B8B text-20rpx line-height-[1] px-5rpx b-0 b-r-2 b-solid b-#8B8B8B"
-                >{{ val }}</text
-              >
-            </view>
-            <view class="mt-20rpx w-full flex items-end">
-              <text class="text-18rpx text-#EC3D15">¥</text>
-              <text class="text-38rpx text-#EC3D15 mx-10rpx -mb-8rpx">{{
+                " />
+						</view>
+						<view>
+							<text v-for="(val, i) in item.tags2" :key="i"
+								class="text-#8B8B8B text-20rpx line-height-[1] px-5rpx b-0 b-r-2 b-solid b-#8B8B8B">{{ val }}</text>
+						</view>
+						<view class="mt-20rpx w-full flex items-end">
+							<text class="text-18rpx text-#EC3D15">¥</text>
+							<text class="text-38rpx text-#EC3D15 mx-10rpx -mb-8rpx">{{
                 item.price
               }}</text>
-              <text class="text-18rpx text-#878787 line-through">{{
+							<text class="text-18rpx text-#878787 line-through">{{
                 item.original_price
               }}</text>
-              <text class="text-18rpx text-#878787 ml-auto mr-55rpx"
-                >已售{{ item.count }}</text
-              >
-            </view>
-          </view>
-        </view>
-        <view class="between mt-30rpx">
-          <view class="text-#8B8B8B text-22rpx">
-            相似度
-            <text class="text-#239EA3">{{ item.recommend?.xiangsidu }}</text>
-            ，{{ item.recommend?.count > 0 ? "增加" : "减少" }}了
-            <text class="text-#239EA3">{{
+							<text class="text-18rpx text-#878787 ml-auto mr-55rpx">已售{{ item.count }}</text>
+						</view>
+					</view>
+				</view>
+				<view class="between mt-30rpx">
+					<view class="text-#8B8B8B text-22rpx">
+						相似度
+						<text class="text-#239EA3">{{ item.recommend?.xiangsidu }}</text>
+						，{{ item.recommend?.count > 0 ? "增加" : "减少" }}了
+						<text class="text-#239EA3">{{
               Math.abs(item.recommend?.count)
             }}</text>
-            个项目，{{
+						个项目，{{
               Number(item.recommend?.money.replace(/,/, "")) > 0
                 ? "增加"
                 : "减少"
             }}了
-            <text class="text-#239EA3"
-              >￥{{ item.recommend?.money.replace(/-/, "") }}</text
-            >
-          </view>
-          <button
-            type="primary"
-            @click="buy(item)"
-            class="w-160rpx h-60rpx center text-#fff text-28rpx !bg-#239EA3 rounded-full"
-          >
-            预约
-          </button>
-        </view>
-      </view>
-      <view class="b-0 b-t-1 b-solid b-#E1ECEE pt-80rpx pb-70rpx">
-        <button
-          type="primary"
-          @click="buy()"
-          class="w-300rpx h-78rpx center text-#fff text-30rpx !bg-#239EA3 rounded-10rpx"
-        >
-          跳过
-        </button>
-      </view>
-    </view>
-  </uni-popup>
-  <view class="bg-#d8edf2">
-    <uni-search-bar
-      class="search"
-      radius="100"
-      placeholder="请输入关键字搜索"
-      @clear="getAllItems()"
-      @cancel="getAllItems()"
-      @confirm="getAllItems"
-    />
-  </view>
-  <view class="mt-20rpx flex min-h-100%" style="background-color: #eef7f7;">
-    <view class="min-w-214rpx max-w-214rpx mr-20rpx min-h-100% text-center">
-      <view
-        class="w-100% rounded-r-full text-#0E0E0E text-25rpx px-20rpx w-100% center h-84rpx box-border"
-        v-for="(item, index) in leftList"
-        :key="index"
-        :class="{
+						<text class="text-#239EA3">￥{{ item.recommend?.money.replace(/-/, "") }}</text>
+					</view>
+					<button type="primary" @click="buy(item)"
+						class="w-160rpx h-60rpx center text-#fff text-28rpx !bg-#239EA3 rounded-full">
+						预约
+					</button>
+				</view>
+			</view>
+			<view class="b-0 b-t-1 b-solid b-#E1ECEE pt-80rpx pb-70rpx">
+				<button type="primary" @click="buy()"
+					class="w-300rpx h-78rpx center text-#fff text-30rpx !bg-#239EA3 rounded-10rpx">
+					跳过
+				</button>
+			</view>
+		</view>
+	</uni-popup>
+	<view class="bg-#d8edf2">
+		<uni-search-bar class="search" radius="100" placeholder="请输入关键字搜索" @clear="getAllItems()"
+			@cancel="getAllItems()" @confirm="getAllItems" />
+	</view>
+	<view class="mt-20rpx flex min-h-100%" style="background-color: #eef7f7;">
+		<view class="min-w-214rpx max-w-214rpx mr-20rpx min-h-100% text-center">
+			<view class="w-100% rounded-r-full text-#0E0E0E text-25rpx px-20rpx w-100% center h-84rpx box-border"
+				v-for="(item, index) in leftList" :key="index" :class="{
           'bg-gradient-to-r from-#edf6f5 to-#bbdfe2': tabIndex == index,
-        }"
-        @click="
+        }" @click="
           () => {
             tabIndex = index;
             rightLeft = item.children;
             headImg = item.head_img;
           }
-        "
-      >
-        {{ item.title }}
-      </view>
-	  <view style="height: 150rpx;"></view>
-    </view>
-    <view class="grow min-h-100% bg-#fff pb-200rpx">
-   
-      <view
-        v-for="(item, index) in rightLeft"
-        :key="index"
-        :class="{
+        ">
+				{{ item.title }}
+			</view>
+			<view style="height: 150rpx;"></view>
+		</view>
+		<view class="grow min-h-100% bg-#fff pb-200rpx">
+
+			<view v-for="(item, index) in rightLeft" :key="index" :class="{
           '!b-0': index == rightLeft.length - 1,
-        }"
-        class="flex justify-between center py-30rpx px-20rpx b-b-1px b-b-solid b-b-#e5e5e5"
-      >
-        <view class="w-40% text-#0E0E0E text-24rpx flex items-center">
-          <text>{{ item.title }}</text>
-          <uni-tooltip>
-            <!-- 定义插槽，插槽名为 content -->
-            <template v-slot:content>
-              <!-- 在这里编写自定义的 HTML 或组件 -->
-              <view class="w-30vw">
-                <text>{{ item.desc }}</text>
-              </view>
-            </template>
+        }" class="flex justify-between center py-30rpx px-20rpx b-b-1px b-b-solid b-b-#e5e5e5">
+				<view class="w-40% text-#0E0E0E text-24rpx flex items-center">
+					<text>{{ item.title }}</text>
+					<uni-tooltip>
+						<!-- 定义插槽，插槽名为 content -->
+						<template v-slot:content>
+							<!-- 在这里编写自定义的 HTML 或组件 -->
+							<view class="w-30vw">
+								<text>{{ item.desc }}</text>
+							</view>
+						</template>
 
-            <!-- 触发提示的按钮 -->
-            <uni-icons color="#009fa8" type="help-filled" size="14"></uni-icons>
-          </uni-tooltip>
-        </view>
-        <view
-          class="w-58% items-end flex justify-between"
-          @click="XuanZeItem(item)"
-            
-          
-        >
-          <text class="text-#EC3D15 text-26rpx">¥ {{ item.price }}</text>
-          <text class="text-#9e9d9d text-20rpx line-through"
-            >¥ {{ item.original_price }}</text
-          >
-          <view
-            :class="{
+						<!-- 触发提示的按钮 -->
+						<uni-icons color="#009fa8" type="help-filled" size="14"></uni-icons>
+					</uni-tooltip>
+				</view>
+				<view class="w-58% items-end flex justify-between" @click="XuanZeItem(item)">
+					<text class="text-#EC3D15 text-26rpx">¥ {{ item.price }}</text>
+					<text class="text-#9e9d9d text-20rpx line-through">¥ {{ item.original_price }}</text>
+					<view :class="{
               '!bg-#009fa8 !b-#008e99': selectIds.includes(item.id),
-            }"
-            class="w-24rpx h-24rpx b-1 b-solid b-#c3e9eb bg-#ccecee rounded-8rpx center"
-          >
-            <image
-              v-if="selectIds.includes(item.id)"
-              class="w-20rpx"
-              src="@/static/assets/select.png"
-              mode="widthFix"
-            />
-          </view>
-        </view>
-      </view>
-    </view> 
-  </view>
-  
-  <view
-    class="fixed bottom-0 left-0 w-100% h-135rpx bg-gradient-to-r from-#7fcfd3 to-#aad7d7 px-20rpx py-30rpx box-border items-center flex justify-between"
-  >
-    <text
-      class="text-26rpx text-#121212 b-r-1 b-r-solid b-#8D9698 pr-12rpx mr-12rpx min-w-120rpx max-w-120rpx"
-    >
-      您需付费 \n{{ total }}个项目
-    </text>
-    <view class="grow">
-      <view class="flex items-end" v-if="comboId != 0">
-        <text class="text-18rpx text-#878787">套餐价格</text>
-        <text class="text-21rpx text-#ED6907 mx-20rpx"
-          >¥ {{ packagePrice }}</text
-        >
-        <text class="text-18rpx text-#878787 line-through"
-          >¥ {{ packageOriginalPrice }}</text
-        >
-      </view>
-      <view class="flex items-end">
-        <text class="text-18rpx text-#878787">自选项目价格</text>
-        <text class="text-21rpx text-#ED6907 mx-20rpx"
-          >¥ {{ optionalPrice || 0 }}</text
-        >
-        <text
-          v-if="optionalOriginalPrice"
-          class="text-18rpx text-#878787 line-through"
-          >¥ {{ optionalOriginalPrice }}</text
-        >
-      </view>
-      <view class="flex items-end">
-        <text class="text-18rpx text-#ED6907">合计费用</text>
-        <text class="text-24rpx text-#ED6907 ml-20rpx mr-5rpx">¥</text>
-        <text class="text-36rpx text-#ED6907 mr-20rpx font-bold">{{
+            }" class="w-24rpx h-24rpx b-1 b-solid b-#c3e9eb bg-#ccecee rounded-8rpx center">
+						<image v-if="selectIds.includes(item.id)" class="w-20rpx" src="@/static/assets/select.png"
+							mode="widthFix" />
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+
+	<view style="z-index: 999;"
+		class="fixed bottom-0 left-0 w-100% h-150rpx bg-gradient-to-r from-#7fcfd3 to-#aad7d7 px-20rpx py-30rpx box-border items-center flex justify-between">
+		<view style="position: relative;" class="w-110rpx h-129rpx ml-60rpx mt-5rpx" @click="openPopupItemList()">
+			<image class="w-110rpx h-129rpx" src="@/static/assets/buy/xiong.png" mode="widthFix" />
+			<view class="yuandian">
+				{{ selectIds.length }}
+			</view>
+		</view>
+		<view class="grow" style="margin-left: 10rpx;">
+			<view class="flex items-end">
+				<text class="text-46rpx text-#e95513 ml-20rpx mr-5rpx">¥</text>
+				<text class="text-46rpx text-#e95513 mr-10rpx font-bold">{{
           totalPrice || 0
         }}</text>
-        <text
-          v-if="totalOriginalPrice"
-          class="text-18rpx text-#878787 line-through"
-          >¥ {{ totalOriginalPrice }}</text
-        >
-      </view>
-    </view>
-    <button
-      type="primary"
-      @click="confirm()"
-      class="text-#F8F8F8 w-240rpx h-hull rounded-full !bg-#239EA3 !mx-0 text-30rpx"
-    >
-      确定
-    </button>
-  </view>
+				<text v-if="totalOriginalPrice" class="text-26rpx text-#3e3a39 line-through">¥
+					{{ totalOriginalPrice }}</text>
+			</view>
+		</view>
+		<view @click="confirm()" class="button">
+			确认项目
+		</view>
+	</view>
 </template>
 <style>
-.uni-tooltip-popup {
-  background-color: #fff;
-}
+	.uni-tooltip-popup {
+		background-color: #fff;
+	}
 </style>
+<style>
+	.button {
+		color: #00828e;
+		background-color: #fff;
+		height: 58rpx;
+		line-height: 58rpx;
+		text-align: center;
+		width: 174rpx;
+		border-radius: 24rpx;
+		margin-right: 20rpx;
+	}
+
+	.popupItemList-content {
+		padding: 40rpx 40rpx 180rpx 40rpx;
+		border-radius: 40rpx;
+		background-color: #fff;
+	}
+
+	.yuandian {
+		position: absolute;
+		top: 55rpx;
+		right: -10rpx;
+		background-color: #E95513;
+		height: 26rpx;
+		width: 26rpx;
+		border-radius: 13rpx;
+		color: #fff;
+		font-size: 20rpx;
+		text-align: center;
+		font-weight: 900;
+	}
+
+	.itemlist_org_price {
+		color: #9E9E9F;
+		font-weight: bolder;
+		font-size: 18rpx;
+		margin-left: 10rpx;
+		padding-bottom: 5rpx;
+	}
+
+	.itemlist_price {
+		color: #E95513;
+		font-weight: bolder;
+		font-size: 32rpx;
+	}
+
+	.itemlist_itemname {
+		font-size: 30rpx;
+		font-weight: bolder; 
+	}
+
+	.itemlist_list {
+		display: flex;
+		width: 100%;
+		justify-content: space-between;
+		border-bottom: 1px solid #00828e;
+		padding-bottom: 20rpx;
+		margin-bottom: 20rpx;
+		align-items: center; 
+	}
+	.itemlist_bianhao{
+		height: 26rpx;
+		width: 26rpx;
+		margin-right: 10rpx;
+		border-radius: 26rpx;
+		line-height: 26rpx;
+		color: #fff;
+		font-size: 20rpx;
+		font-weight: bolder;
+		text-align: center;
+		background: linear-gradient(to right, #67a8aa, #8ce7e7);
+	}
+</style>
\ No newline at end of file
diff --git a/h5/static/assets/buy/xiong.png b/h5/static/assets/buy/xiong.png
new file mode 100644
index 0000000000000000000000000000000000000000..667ae975383e0e3675a3c88b28a4a86ebde6a395
GIT binary patch
literal 6298
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

literal 0
HcmV?d00001