修改选择完体检再选医生二次弹月历问题

h5/pages/main/tjyy/tjyy.vue

@@ -384,7 +384,13 @@ const toRouter = (url, status, index) => {
     console.log(yytjInfo.value);
     uni.setStorageSync("yytjInfoS", yytjInfo.value);
     $store.setYytjInfo(yytjInfo.value);
-    if (yytjInfo.value.doctor_name && i == -1) {
+	//判断是否选择了体检时间
+	yytjInfo.value.nmr_list.forEach((vv,ii)=>{
+		if(vv.item_id=='-1' && vv.time){
+			yytjInfo.value.doctor_date=vv.time.substr(0,10)
+		}
+	})
+    if ((yytjInfo.value.doctor_name || yytjInfo.value.doctor_date) && i == -1) {
       uni.navigateTo({
         url: `/pages/main/selectDoctor/selectDoctor?date=${yytjInfo.value.doctor_date}`,
       });

h5/pages/main/yytjsj/yytjsj.vue

@@ -518,9 +518,23 @@
 		// if (yytjInfo.value.nmr_list[yytjInfo.value.nmr_list.length - 1]?.time == "") {
 		// nmrIndex.value = yytjInfo.value.nmr_list?.length - 1;
 		nmrIndex.value = -1;
-		moreTime(null, 1);
+		//判断是否选择了体检时间
+		
+		    let is_tj_date=false;
+			yytjInfo.value.nmr_list.forEach((vv,ii)=>{
+				if(vv.item_id=='-1' && vv.time){
+					yytjInfo.value.doctor_date=vv.time.substr(0,10)
+					is_tj_date=true;
+				}
+			})
+			console.log("999999999999",is_tj_date);
+	    if(!is_tj_date){
+			moreTime(null, 1);
+			return false;
+		}	
 		// return;
 		// }
+		console.log('00000000000',yytjInfo.value);
 		if (s) {
 			return;
 		}