机票

pages/airTicket/flightDetail.vue

@@ -488,9 +488,13 @@
 				} else if(this.contactPhone=='' || this.contactPhone.length!=11){
 					msg = '请输入11位联系电话'
 				}else if(this.Mailbox==''){
-					msg = '请输入邮箱地址'
+					// #ifdef MP-DI
+						msg = '请输入邮箱地址'
+					// #endif
 				}else if (!email.test(this.Mailbox)) {
-					msg = '请输入正确的邮箱地址'
+					// #ifdef MP-DI
+						msg = '请输入正确的邮箱地址'
+					// #endif
 				} else if(this.createBy.CreateBy==0){
 					// #ifdef MP-AG
 						msg = '请选择与你对接的服务人员'

pages/visa/visa_SureOrder.vue

@@ -584,6 +584,8 @@
 				showPayBtn: true,
 				Refund: 0,
 				orderInfo:null,
+				orderId: 0,
+				goodsType: 0,
 				OrderNo: '',
 			};
 		},
@@ -591,11 +593,19 @@
 		onLoad(option) {
 			if (option.orderData) {
 				this.orderData = JSON.parse(decodeURIComponent(option.orderData));
-			} else if (option.orderId) {
+			} else if (option.orderId&&!option.goodsType) {
 				this.initOrderInfo(option.orderId);
-			} else if(option.OrderNo){
-				this.OrderNo = option.OrderNo
-				this.getOrderInfoHandler(this.OrderNo)
+			} else if(option.OrderNo||(option.orderId&&option.goodsType)){
+				if(option.goodsType){
+					this.goodsType = option.goodsType
+				}
+				if(option.orderId){
+					this.orderId = option.orderId
+				}
+				if(option.orderId){
+					this.OrderNo = option.OrderNo
+				}
+				this.getOrderInfoHandler()
 			}
 		},
 		methods: {
@@ -652,13 +662,16 @@
 					},
 				});
 			}, 
-			getOrderInfoHandler(OrderNo){
-				this.apipost("GetDetailsByOrderNo_post",{OrderNo},res=>{
+			getOrderInfoHandler(){
+				this.apipost("GetDetailsByOrderNo_post",{
+					OrderNo: this.OrderNo, 
+					orderId: this.orderId,
+					goodsType: this.goodsType,
+				},res=>{
 					if(res.resultCode==1){
 						this.orderData = {
 							...res.data
 						}
-						console.log(this.orderData,'---111111')
 						this.initOrderInfo(res.data.ErpOrderId);
 						this.formatStatus(
 							res.data.OrderStatus,