签证订单

pages/visa/visa_MyOrder.vue

@@ -137,9 +137,9 @@
 							</button> -->
 							<!-- #endif -->
 							<!-- #ifdef MP-ALIPAY -->
-							<view v-if="item.orderState == 2" class="jz_Zailai" style="width: 110rpx; margin-right: 10rpx" @click.stop="goZhifuAli(item)">付款</view>
+							<!-- <view class="jz_Zailai" style="width: 110rpx; margin-right: 10rpx" @click.stop="goZhifuAli(item)">付款</view> -->
 							<!-- #endif -->
-							<view v-if="item.isApplyForCancel != 1 && item.visaOrderStatus != 3 && item.customerPayMoney==0" class="jz_Zailai"
+							<view v-if="item.visaOrderStatus!=2&&item.income==0" class="jz_Zailai"
 							 style="width: 110rpx" @click.stop="goCancel(item)">取消</view>
 						</view>
 					</view>
@@ -246,9 +246,9 @@
 			//获取订单状态名称
 			getOrderStateName(item) {
 				var str = "待付款";
-				if (item.orderState == 1) {
+				if (item.visaOrderStatus == 1&&item.income>0) {
 					str = "已付款"
-				} else if (item.orderState == 3) {
+				} else if (item.visaOrderStatus == 2) {
 					str = "已取消"
 				}
 				return str;
@@ -335,47 +335,32 @@
 			},
 			//取消订单
 			goCancel(item) {
-				//未付款-调用后台取消
-				if (
-					(item.paymentTime == null || item.paymentTime == "") &&
-					item.orderState == 2
-				) {
-					this.apipost(
-						"sellorder_post_B2BRemoveOrder", {
-							ID: item.orderId,
-						},
-						(res) => {
-							if (res.resultCode == 1) {
-								uni.showToast({
-									title: "操作成功",
-									icon: "success",
-								});
-								this.research();
-							}
-						},
-						(err) => {}
-					);
-				} else {
-					let msg = {
-						OrderId: item.orderId,
-						UserId: uni.getStorageSync("mall_UserInfo").UserId,
-					};
-					//已付款取消申请
-					this.apipost(
-						"sellorder_post_AppletUserCancelOrder",
-						msg,
-						(res) => {
-							if (res.resultCode == 1) {
-								uni.showToast({
-									title: "操作成功",
-									icon: "success",
-								});
-								this.research();
-							} else {}
-						},
-						null
-					);
-				}
+				let that = this
+				wx.showModal({
+					title: '提示',
+					content: '确定取消订单？',
+					success: (tip) => {
+						if (tip.confirm) {
+							that.apipost(
+								"b2c_get_SetB2BOrderCancel", {
+									OrderId: item.id,
+									OrderSource: 5
+								},
+								(res) => {
+									if (res.resultCode == 1) {
+										uni.showToast({
+											title: "操作成功",
+											icon: "success",
+										});
+										that.research();
+									}
+								},
+								(err) => {}
+							);
+						}
+					}
+			})
+				
 			},
 			//付款
 			// #ifdef MP-WEIXIN

pages/visa/visa_Reserve.vue

@@ -474,7 +474,6 @@
 					<view class="visaProductNum visaProductNumR column">
 						<view class="visaProductNum_Title">入境日期</view>
 						<picker class="visaProductTetx" mode="date" 
-						:start-date="startDate"
 						:value="orderMsg.EnterCountryTime" @change="bindDateChange"
 						>
 							<view class="row-sbas-n items-center">
@@ -498,21 +497,19 @@
 					</view>
 				</view>
 				<view class="row visaProductNumBox">
-					<view class="visaProductNum column">
+					<!-- <view class="visaProductNum column">
 						<view class="visaProductNum_Title">请输入名</view>
 						<view class="row-sbas-n items-center">
 							<input class="visaProductTetx" v-model="customer.customerName" />
 						</view>
-					</view>
-					<view class="visaProductNum visaProductNumR column">
-						<view class="visaProductNum_Title">请输入姓氏</view>
+					</view> -->
+					<view class="visaProductNum column">
+						<view class="visaProductNum_Title">请输入姓名</view>
 						<view class="row-sbas-n items-center">
 							<input class="visaProductTetx" v-model="customer.name" />
 						</view>
 					</view>
-				</view>
-				<view class="row visaProductNumBox">
-					<view class="visaProductNum column">
+					<view class="visaProductNum visaProductNumR column">
 						<view class="visaProductNum_Title">国家/地区</view>
 						<view class="row-sbas-n items-center" @click="CountryType=1,showCountry=true">
 							<view class="visaProductCount">{{ optionsTitle[0] }}</view>
@@ -521,7 +518,9 @@
                         	color="black" size="30" />
 						</view>
 					</view>
-					<view class="visaProductNum visaProductNumR column">
+				</view>
+				<view class="row visaProductNumBox">
+					<view class="visaProductNum column">
 						<view class="visaProductNum_Title">电话
 							<text style="font-weight: bold;font-size: 20rpx;color: #B99846;">
 								{{ customer.PhoneCountryStr }}
@@ -531,15 +530,16 @@
 							<input class="visaProductTetx" v-model="customer.contactNumber" />
 						</view>
 					</view>
-				</view>
-				<view class="row visaProductNumBox">
-					<view class="visaProductNum visaProductNumR column col" style="margin-left: 0;">
+					<view class="visaProductNum visaProductNumR column">
 						<view class="visaProductNum_Title">邮箱地址</view>
 						<view class="row-sbas-n items-center">
 							<input class="visaProductTetx" v-model="customer.Mailbox" placeholder="输入邮箱地址"/>
 						</view>
 					</view>
 				</view>
+				<!-- <view class="row visaProductNumBox">
+					
+				</view> -->
 				<view class="row items-center visaProductTextBox">
 					<view class="visaProduct_rColor visaProductTextL"></view>
 					<view class="visaProductTitle">收件信息</view>
@@ -729,6 +729,7 @@
 
 <script>
 	import coupon from '@/components/coupon/index';
+	import { gegerateDates,getBeforeDate,getDateWeek } from "../airTicket/dates.js";
 	export default {
 		components: {
 			coupon
@@ -937,7 +938,15 @@
 				this.customer.PhoneCountryStr = "+" + this.customer.PhoneCountry;
 			},
 			bindDateChange(e) {
-				this.orderMsg.EnterCountryTime = e.detail.value
+				let dates = getBeforeDate(0, new Date())
+				if(e.detail.value<=dates){
+					uni.showToast({
+						title: `请选择大于今天的日期`,
+						icon: "none",
+					});
+					return;
+				}
+				this.orderMsg.EnterCountryTime =  e.detail.value
 			},
 			scroll(e) {
 				this.boxOption = Math.floor((e.detail.scrollTop - 50) / 1.5);
@@ -1095,12 +1104,12 @@
 				    return;
 				}
 				this.tipsText = ''
-				if (this.customer.customerName == "") {
-					this.tipsText = '请输入名'
-				    return;
-				}
+				// if (this.customer.customerName == "") {
+				// 	this.tipsText = '请输入名'
+				//     return;
+				// }
 				if (this.customer.name == "") {
-					this.tipsText = '请输入姓氏'
+					this.tipsText = '请输入姓名'
 				    return;
 				}
 				if (this.customer.PhoneCountryStr == "") {
@@ -1187,7 +1196,7 @@
 					EnterCountryTime: this.orderMsg.EnterCountryTime,//入境时间
 					GuestList: [],//this.guests
 					VisaOrderRelation:{
-						RelationName: this.customer.customerName + this.customer.name,//	联系名称	
+						RelationName: this.customer.name ,//	+this.customer.customerName联系名称	
 						RelationPhone: this.customer.contactNumber,//	电话	
 						RelationEmail: this.customer.Mailbox,//	邮箱		
 						IsNeedInvoice: this.orderMsg.IsNeedInvoice,//	是否需要发票 ，0-默认