调整样式

h5/pages/main/yytjsj/yytjsj_new.vue

@@ -97,8 +97,8 @@
 	let use_type = ref(0)
 	let checkup_type_id = ref(0)
 	let amount = ref(0)
-	let person_name=ref('')
+	let person_name = ref('')
-	let combo_name=ref('')
+	let combo_name = ref('')
 	//查询体检号源
 	const GetDayPlanListFunc = async () => {
 		uni.showLoading();
@@ -106,7 +106,7 @@
 			hospital: hospital_id.value,
 			person_id: person_id.value,
 			date: selectedDate.value,
-			use_type:use_type.value,
+			use_type: use_type.value,
 			checkup_type_id: checkup_type_id.value,
 			amount: amount.value,
 		}
@@ -158,13 +158,13 @@
 			tj_time.value = orderInfo.value.appointment_time
 			tj_plan_id.value = orderInfo.value.plan_id
 
-			hospital_id.value=orderInfo.value.hospital_id
+			hospital_id.value = orderInfo.value.hospital_id
-			person_id.value=orderInfo.value.person_id
+			person_id.value = orderInfo.value.person_id
-			use_type.value=orderInfo.value.type
+			use_type.value = orderInfo.value.type
-			checkup_type_id.value=orderInfo.value.checkup_type_id
+			checkup_type_id.value = orderInfo.value.checkup_type_id
-			amount.value=orderInfo.value.true_price
+			amount.value = orderInfo.value.true_price
-			person_name.value=orderInfo.value.name
+			person_name.value = orderInfo.value.name
-			combo_name.value=orderInfo.value.title
+			combo_name.value = orderInfo.value.title
 
 			GetDayPlanListFunc()
 		});
@@ -291,7 +291,7 @@
 			hospital: hospital_id.value,
 			person_id: person_id.value,
 			month: ym ? ym : tj_date.value.substring(0, 7),
-			use_type:use_type.value,
+			use_type: use_type.value,
 			checkup_type_id: checkup_type_id.value,
 			amount: amount.value,
 		}
@@ -304,7 +304,9 @@
 					date: item.date,
 					info: "余号" + item.count,
 				};
+				if( item.count>0){
 					rlArr.push(o);
+				}
 			});
 			MonthList.value = rlArr;
 			//MonthCalendar.value.open()
@@ -345,10 +347,10 @@
 	}
 	//点击提交
 	const StartYuYue = () => {
-		if(buyInfo.value.group_id){
+		if (buyInfo.value.group_id) {
 			//如果是团检则创建订单
 			comfrimyy()
-		}else{
+		} else {
 			//先前已经创建订单，单纯进行预约
 			OnlyYuYue()
 		}
@@ -383,18 +385,18 @@
 			type: buyInfo.value.group_id ? 2 : 1,
 			hospital: buyInfo.value.hospital,
 			group_id: buyInfo.value.group_id,
-	    combo_id:buyInfo.value.group_id?"":buyInfo.value?.combo_id,
+			combo_id: buyInfo.value.group_id ? "" : buyInfo.value?.combo_id,
 			item_ids: buyInfo.value.item_ids,
 			plan_id: tj_plan_id.value,
-	    plan_nmr_info:yytjInfo.value?.nmr_list || null,
+			plan_nmr_info: yytjInfo.value?.nmr_list || null,
 			doctor: yytjInfo.value?.doctor_name || "",
 			duo_xuan_yi: $store.getDuoXuanYi(),
-	    jifen: Math.ceil(yytjInfo.value.pointsPrice?yytjInfo.value.pointsPrice:0),
+			jifen: Math.ceil(yytjInfo.value.pointsPrice ? yytjInfo.value.pointsPrice : 0),
-	    yucunkuan: yytjInfo.value.prepaidPrice?yytjInfo.value.prepaidPrice:0,
+			yucunkuan: yytjInfo.value.prepaidPrice ? yytjInfo.value.prepaidPrice : 0,
-		coupon_id:yytjInfo.value?.couponId || null,
+			coupon_id: yytjInfo.value?.couponId || null,
 			wj: buyInfo.value.wj,
-		erxian_info:yytjInfo.value.erxianInfo,
+			erxian_info: yytjInfo.value.erxianInfo,
-		peiou_info:$store.getPeiOuUser()//配偶信息
+			peiou_info: $store.getPeiOuUser() //配偶信息
 		};
 		console.log(obj);
 		const response = await $api("OrderCreate", obj);
@@ -412,7 +414,7 @@
 		});
 	};
 	//先前已经创建订单，单纯进行预约
-	const OnlyYuYue=async()=>{
+	const OnlyYuYue = async () => {
 		if (tj_time.value == null) {
 			uni.$lu.toast("请选择体检日期");
 			return false
@@ -475,8 +477,7 @@
 					info.signature;
 				console.log(p);
 				wx.miniProgram.navigateTo({
-	        url:
+					url: "/pages/other/entry/index?path=/pages/physical-examination/payment/index" +
-	          "/pages/other/entry/index?path=/pages/physical-examination/payment/index" +
 						p,
 				});
 			}
@@ -505,24 +506,24 @@
 
 	let temp = null
 	onMounted(() => {
-		itemSelected.value.type='tj'
+		itemSelected.value.type = 'tj'
 		buyInfo.value = $store.getBuyInfo();
 		//清空一下缓存的医生，防止出问题
 		temp = $store.getYytjInfo()
 		temp.doctor_name = ""
 		$store.setYytjInfo(temp)
 		selectedDate.value = GetToday()
-		tj_date.value=GetToday()
+		tj_date.value = GetToday()
 		if (OrderId.value) {
 			GetOrderInfo()
 		} else {
-			checkup_type_id.value= buyInfo.value.group_id ?
+			checkup_type_id.value = buyInfo.value.group_id ?
 				$store.getGroupInfo()?.checkup_type_id : $store.getCheckupTypeId()?.id,
-			hospital_id.value= buyInfo.value.hospital,
+				hospital_id.value = buyInfo.value.hospital,
-			person_id.value= buyInfo.value.person_id,
+				person_id.value = buyInfo.value.person_id,
-			use_type.value= buyInfo.value.group_id ? 2 : 1,
+				use_type.value = buyInfo.value.group_id ? 2 : 1,
-			person_name.value=buyInfo.value.group_id ?$store.getGroupInfo()?.name : '',
+				person_name.value = buyInfo.value.group_id ? $store.getGroupInfo()?.name : '',
-			combo_name.value=buyInfo.value.group_id ?$store.getGroupInfo()?.group_name : '',
+				combo_name.value = buyInfo.value.group_id ? $store.getGroupInfo()?.group_name : '',
 				GetDayPlanListFunc()
 		}
 
@@ -564,7 +565,7 @@
 	.zhouli {
 		padding: 40rpx;
 		background-color: #fff;
-        height:calc(100vh - 460rpx) ;
+		height: calc(100vh - 460rpx);
 		overflow-y: scroll;
 	}
 
@@ -627,6 +628,15 @@
 
 		.uni-calendar-item__weeks-box-text {
 			font-size: 26rpx;
+			color:#ccc;
+		}
+
+		.uni-calendar-item__weeks-box-text:has(+ .uni-calendar-item--extra) {
+			color: #666;
+		}
+
+		.uni-calendar-item__weeks-box-text:has(+ .uni-calendar-item--disable) {
+			color: #ccc !important;
 		}
 
 		.uni-calendar-item__weeks-lunar-text {