diff --git a/compoents/addressAdd.vue b/compoents/addressAdd.vue
index c8a527a..998d7f2 100644
--- a/compoents/addressAdd.vue
+++ b/compoents/addressAdd.vue
@@ -70,7 +70,22 @@
 		},
 		methods: {
 			init(option) {
+				this.id = null
+				this.username = ''
+				this.mobile = ''
+				this.citySeld = ''
+				this.detailAddr = ''
+				this.idDefault = false
+				this.province = null
+				this.city = null
+				this.area = ''
+				this.provinceId = null
+				this.cityId = null
+				this.areaId = null
+				this.multiIndex = [0, 0, 0]
 				this.id = option.id
+				
+				
 				if (option.id > 0) {
 				  this.title = '编辑收货地址'
 				  this.getDetail()
diff --git a/compoents/contactAdd.vue b/compoents/contactAdd.vue
new file mode 100644
index 0000000..c96cfa0
--- /dev/null
+++ b/compoents/contactAdd.vue
@@ -0,0 +1,265 @@
+<template>
+	<view class="bg">
+		<view class="list-forms">
+			<view class="list-item">
+				<view class="list-item-title">姓名</view>
+				<view class="list-item-input"><input type="text" v-model="username" placeholder="请输入姓名" /></view>
+			</view>
+			<view class="list-item">
+				<view class="list-item-title">证件类型</view>
+				<view class="list-item-input">
+					<picker mode="selector" :range="idcardTypeList" range-key="title" @change="changeIdType">
+						<input type="text" readonly style="font-size: 35rpx;position: relative;"
+								v-model="idcardTypeValue" disabled="true" placeholder="请选择"/>
+					</picker>
+				</view>
+			</view>
+			<view class="list-item">
+				<view class="list-item-title">证件号</view>
+				<view class="list-item-input"><input type="text" v-model="idNumber" placeholder="请输入正确的证件号" /></view>
+			</view>
+			
+			<view class="list-item">
+				<view class="list-item-title">联系电话</view>
+				<view class="list-item-input"><input type="number" v-model="mobile" placeholder="请输入手机号" maxlength="11" /></view>
+			</view>
+			<view class="list-item">
+				<view class="list-item-title">设为默认</view>
+				<view class="list-item-switch">
+					<switch :checked="idDefault" @change="switchChange" color="#FEB419"/>
+				</view>
+			</view>
+		</view>
+
+		<!-- <view class="btn" @click="submit">保存</view> -->
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				username: '',
+				mobile: '',
+				idNumber: '',
+				idcardTypeValue: '身份证',
+				show: false,
+				idcardTypeList: [],
+				document_type: 'DAM01001',
+				id: '',
+				type: '',
+				idDefault: false,
+			}
+		},
+		methods: {
+			
+			init (data) {
+				
+				this.username = ''
+				this.mobile= ''
+				this.idNumber= ''
+				this.idcardTypeValue= '身份证'
+				this.show= false
+				this.idcardTypeList= []
+				this.document_type= 'DAM01001'
+				this.id= ''
+				this.type=''
+				this.idDefault= false
+				
+				this.type = 'add'
+				this.getIdcardTypeList()
+				if (data && data.id) {
+					this.id = data.id
+					this.type = 'edit'
+					this.getDetail()
+				}
+			},
+			switchChange(e){
+				this.idDefault = e.detail.value
+			},
+			
+			getDetail() {
+				this.Post({
+					id: this.id
+				}, '/api/user/contactDetail').then(res => {
+					if (res.code === 1) {
+						res = res.data
+						if (res && res.id > 0) {
+							this.username = res.name
+							this.mobile = res.tel
+							this.idNumber = res.id_number
+							this.idDefault = res.is_default == 1 ? true : false
+							this.document_type = res.document_type
+							this.idcardTypeValue = res.document_type_text
+						}
+					}
+				})
+			},
+			//获取证件类型
+			getIdcardTypeList() {
+				this.Post({}, '/api/user/getIdcardTypeList').then(res => {
+					this.idcardTypeList = res.data
+				})
+			},
+			// 选择证件类型
+			changeIdType(e) {
+				this.idcardTypeValue = this.idcardTypeList[e.detail.value].title
+				this.document_type = this.idcardTypeList[e.detail.value].document_type
+			},
+			// 提交
+			async submit() {
+				this.username = this.username.trim()
+				this.mobile = this.mobile.trim()
+				this.idNumber = this.idNumber.trim()
+				if (this.username.length < 1) {
+					uni.showToast({
+						title: '请输入姓名',
+						icon: 'none'
+					})
+					return
+				}
+				if (!this.IsTel(this.mobile)) {
+					uni.showToast({
+						title: '请输入正确的手机号',
+						icon: 'none'
+					})
+					return
+				}
+				if (this.idcardTypeValue == '身份证') {
+					if (!this.idCardNumber(this.idNumber)) {
+						uni.showToast({
+							title: '请输入正确的身份证',
+							icon: 'none'
+						})
+						return
+					}
+				} else if (this.idcardTypeValue == '护照') {
+					if (!this.passportValid(this.idNumber)) {
+						uni.showToast({
+							title: '请输入正确的护照',
+							icon: 'none'
+						})
+						return
+					}
+				} else if (this.idcardTypeValue == '台胞证') {
+					if (!this.taiwanValid(this.idNumber)) {
+						uni.showToast({
+							title: '请输入正确的台胞证',
+							icon: 'none'
+						})
+						return
+					}
+				} else if (this.idcardTypeValue == '港澳通行证') {
+					if (!this.gangaoValid(this.idNumber)) {
+						uni.showToast({
+							title: '请输入正确的港澳通行证',
+							icon: 'none'
+						})
+						return
+					}
+				} else if (this.idcardTypeValue == '外国人永久居留证') {
+					if (!this.foreignerValid(this.idNumber)) {
+						uni.showToast({
+							title: '请输入正确的外国人永久居留证',
+							icon: 'none'
+						})
+						return
+					}
+				} else if (this.idcardTypeValue == '军官证') {
+					if (!this.officerValid(this.idNumber)) {
+						uni.showToast({
+							title: '请输入正确的军官证',
+							icon: 'none'
+						})
+						return
+					}
+				}
+				let res = await this.Post({
+					id: this.type == 'edit'?this.id:'',
+					id_number: this.idNumber,
+					name: this.username,
+					tel: this.mobile,
+					document_type: this.document_type,
+					is_default: this.idDefault ? '1' : '0',
+				}, this.type=='edit'?'/api/user/editContact':'/api/user/addContact')
+				if (res.code == 1) {
+					uni.showModal({
+						title: '提示',
+						content: '操作成功',
+						showCancel: false,
+					})
+				}else{
+					uni.showModal({
+						title: '提示',
+						content: res.msg,
+						showCancel: false,
+					})
+				}
+				return {...res,data: {id: this.id}}
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.bg {
+		width: 100%;
+		height: 100%;
+		position: relative;
+	}
+
+	.list-forms {
+		padding: 0 33rpx;
+
+		.list-item {
+			display: flex;
+			border-bottom: 1rpx solid #D8D8D8;
+			padding: 30rpx 0;
+			height: 60rpx;
+			box-sizing: content-box;
+			align-items: center;
+
+			.list-item-title {
+				font-size: 34rpx;
+				margin-right: 20rpx;
+				width: 200rpx;
+			}
+
+			.list-item-input {
+				flex: 1;
+
+				input {
+					width: 100%;
+					height: 100%;
+					padding: 0;
+					margin: 0;
+					border: 0;
+					background-color: transparent;
+					line-height: 34rpx;
+					font-size: 34rpx;
+					text-align: left;
+				}
+
+				input::placeholder {
+					font-size: 26rpx;
+				}
+			}
+		}
+	}
+
+	.btn {
+		width: 697rpx;
+		height: 80rpx;
+		background: linear-gradient(90deg, #9EE4FE, #7FD491);
+		border-radius: 40rpx;
+		text-align: center;
+		line-height: 80rpx;
+		font-size: 36rpx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: #FFFFFF;
+		position: absolute;
+		bottom: 53rpx;
+		left: 27rpx;
+	}
+</style>
diff --git a/subPackages/techan/order.vue b/subPackages/techan/order.vue
index 2dcf995..6c21c36 100644
--- a/subPackages/techan/order.vue
+++ b/subPackages/techan/order.vue
@@ -184,7 +184,7 @@
 				<view class="top-box">
 					<view class="top flex-between" style="height: fit-content;">
 						<text class="text-overflow" @click="changeAddressAddPopup('close')">取消</text>
-						<text style="font-size: 35rpx;font-weight: 600;">添加收货地址</text>
+						<text style="font-size: 35rpx;font-weight: 600;">{{addressTitle}}</text>
 						<text style="color: #71B580;" class="confirm" @click="saveAddress">保存</text>
 					</view>
 				</view>
diff --git a/subPackages/ticketBooking/detail.vue b/subPackages/ticketBooking/detail.vue
index 585ed3e..e000f38 100644
--- a/subPackages/ticketBooking/detail.vue
+++ b/subPackages/ticketBooking/detail.vue
@@ -58,7 +58,7 @@
 									</view>
 								</view>
 											
-								<view class="notice" @click="showSkuInfo(item, itemSku)">
+								<view class="notice" @click="showSkuInfo(itemSku, item)">
 									预订须知 >
 								</view>
 							</view>
@@ -78,7 +78,7 @@
 			</view>
 		
 			<view class="box-title">介绍</view>
-			<view class="common-container">
+			<view class="common-container" style="padding: 30rpx;">
 				<view class="" id="cpts" v-html="formateRichText(info.feature_content)"></view>
 			</view>
 		</view>
@@ -86,12 +86,12 @@
 		<!-- 预订须知的弹窗 -->
 		<uni-popup ref="popupRule" type="bottom" :safe-area="false">
 			<view class="popup-content-date flex-column flex" >
-				<view class="popup-content-title flex flex-shrink-0">
+				<view class="popup-content-title flex">
 					<view class="flex-1 w-1rpx text-overflow">
 						{{skuInfo.title}}
 					</view>
 					<img src="https://static.ticket.sz-trip.com/taizhou/images/cha.png" @click="closePopupRule"
-						style="width: 31rpx;height: 31rpx;" class="flex-shrink-0">
+						style="width: 20rpx;height: 20rpx;" class="flex-shrink-0">
 				</view>	
 				<view class="content flex-1 h-1rpx no-scrollbar">
 					<view class="detail-content" v-html="formateRichText(skuInfo.reserve_content)"></view>
@@ -109,7 +109,7 @@
 					<img src="https://static.ticket.sz-trip.com/taizhou/images/cha.png" @click="closePopup"
 						style="width: 31rpx;height: 31rpx;" class="flex-shrink-0">
 				</view>				
-				<view>
+				<view class="order-popup-detail">
 					<view class="relative">
 						<view class="sku-title">使用日期</view>
 						<view class="date-content">
@@ -123,13 +123,12 @@
 							</view>
 						</view>
 						<view class="dateMore" @click="openCalendar">
-							<view>更多日期</view>
-							<view>></view>
+							<view style="width: 55rpx;">更多日期</view>
 						</view>
 					</view>
 					
 					<view v-if="timesArr.length > 0 && skuInfo.is_time_stock">
-						<view class="sku-title">选择时段</view>
+						<view class="sku-title">选择场次</view>
 						<view class="time-box">
 							<view v-for="(item,index) in timesArr" :key="index" 
 							:class="['time-item',{'time-disable': item.stock_number < 1, 'time-active': item.stock_number > 0 && index == seldTimeIndex}]" 
@@ -243,6 +242,7 @@
 			showSkuInfo (itemSku,goods) {
 				this.skuInfo = itemSku
 				this.selectGoods = goods
+				console.log(itemSku,goods)
 				this.openPopRule()
 			},
 			
@@ -302,20 +302,23 @@
 			
 			// 选择日期
 			clickTab(item, index) {
-				this.seldDateIndex = index
-				this.getTimeStock(item.date)
+				if (item.store>0) {
+					this.seldDateIndex = index
+					this.getTimeStock(item.date)
+				}
+				
 			},
 			// 选择时段
 			changeTime(item, index) {
-				if(item.store > 0) {
+				if(item.stock_number > 0) {
 					this.seldTimeIndex = index
 				}
 			},
 			
 			confirmCalendar (val) {
-				let index = this.allSeldDate.find(v=>v.date == val.fulldate)
-				if (index) {
-					this.clickTab({date:val.fulldate},index)
+				let index = this.allSeldDate.findIndex(v=>v.date == val.fulldate)
+				if (index>=0) {
+					this.clickTab(this.allSeldDate[index],index)
 				}
 			},
 
@@ -327,20 +330,6 @@
 					return;
 				}
 				
-					
-				this.selectGoods.specifications.forEach(v=>{v.buyNum = 0;v.selPeople = []})
-				
-				let orderSkuIndex = this.selectGoods.specifications.findIndex(v=>v.id == that.skuInfo.id)
-				let item = this.selectGoods.specifications.splice(orderSkuIndex, 1)[0]; // 将购买的数据放在第一位
-				item.buyNum = 1
-				item.selPeople = [
-					{
-						id:null,id_number:null,name:null,
-						tel:null,user_id:null,age:null,
-					},
-				]
-				this.selectGoods.specifications.unshift(item);
-				
 				let param = {
 					sInfo: this.skuInfo,
 					pInfo: this.selectGoods,
@@ -624,31 +613,54 @@
 	
 	.popup-content-date {
 		background-color: white;
-		padding: 0rpx 39rpx 51rpx 39rpx;
+		padding: 0rpx 28rpx 166rpx;
 		height: 70vh;
 		border-radius: 20rpx 20rpx 0 0 ;
 		.popup-content-title{
-			padding: 20rpx 0;
+			font-family: PingFang SC;
+			font-weight: bold;
+			font-size: 37rpx;
+			color: #000000;
+			padding: 39rpx 0;
+			display: flex;
+			align-items: center;
+			border-bottom: 1px solid #CCCCCC;
 		}
 		// 预定须知
 		.content{
+			padding-top: 48rpx;
 			overflow-y: auto;
 		}
 		
+		.order-popup-detail{
+			.sku-title{
+				padding: 48rpx 0 26rpx;
+				font-family: PingFangSC;
+				font-weight: 500;
+				font-size: 31rpx;
+				color: #000000;
+			}
+		}
+		
 		.dateMore{
 			width: 120rpx;
-			height: 180rpx;
-			background: #fff;
-			font-weight: 400;
-			font-size: 32rpx;
-			padding-left: 15rpx;
-			color: #0b898e;
+			height: 133rpx;
+			background: white;
+			border-radius: 10rpx;
+			border: 1px solid #000000;
+			font-family: PingFang SC;
+			font-weight: 500;
+			font-size: 27rpx;
+			color: #000000;
 			display: flex;
-			justify-content: center;
+			flex-direction: column;
 			align-items: center;
+			justify-content: space-around;
+			flex-shrink: 0;
+			padding: 6rpx 0;
 			position: absolute;
-			right: 0;
 			bottom: 0;
+			right: 0;
 		}
 		
 		.date-content{
@@ -659,25 +671,34 @@
 			padding-right: 140rpx;
 			
 			.item{
-				min-width: 160rpx;
-				height: 180rpx;
-				background: #f5f5f5;
+				width: 120rpx;
+				height: 133rpx;
 				border-radius: 10rpx;
-				margin-right: 20rpx;
+				border: 1px solid #000000;
+				margin-right: 24rpx;
+				font-family: PingFang SC;
 				font-weight: 500;
-				font-size: 32rpx;
-				color: #000;
+				font-size: 27rpx;
+				color: #000000;
 				display: flex;
 				flex-direction: column;
 				align-items: center;
 				justify-content: space-around;
+				flex-shrink: 0;
+				padding: 6rpx 0;
 			}
 			.item.active{
-				background: #0b898e;
-				color: #fff;
+				background: linear-gradient(-56deg, #9EE4FE, #7FD491);
+				color: #000000;
+				border: none;
 			}
 			.item.disabled{
-				color: #999;
+				color: #666;
+				border-color: #CCC;
+			}
+			
+			.price{
+				color: #EE3E3B;
 			}
 			
 		}
@@ -690,58 +711,71 @@
 		display: flex;
 		justify-content: space-between;
 		flex-wrap: wrap;
+		max-height: 340rpx;
+		overflow-y: auto;
 
 		.time-item {
 			width: 48%;
-			background: #F5F5F5;
+			height: 60rpx;
 			border-radius: 10rpx;
 			text-align: center;
-			font-weight: 400;
 			font-size: 34rpx;
-			color: #000000;
-			margin-bottom: 20rpx;
-			padding: 5rpx;
+			margin-bottom: 23rpx;
+			font-family: PingFangSC;
+			font-weight: 400;
+			font-size: 25rpx;
+			border: 1px solid #333333;
+			line-height: 58rpx;
+			color: #000;
 		}
 		.time-active {
-			background: #0B898E;
-			color: #fff;
+			background: linear-gradient(270deg, #9EE4FE, #7FD491);
+			border: none;
 		}
 		.time-disable {
-			color: #999999;
+			color: #666666;
+			border-color: #CCC;
 		}
 	}
 	.sku-bottom {
 		width: 100%;
-		height: 120rpx;
+		height: 166rpx;
 		background: #FFFFFF;
-		padding: 20rpx;
+		box-shadow: 0rpx -3rpx 8rpx 0rpx rgba(71,71,71,0.1);
 		display: flex;
 		justify-content: space-between;
 		align-items: center;
 		box-sizing: border-box;
-		font-weight: 400;
-		font-size: 36rpx;
+		padding: 50rpx 50rpx 85rpx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		font-size: 28rpx;
 		color: #393B3E;
-		line-height: 80rpx;
+		position: absolute;
+		bottom: 0;
+		left: 0;
+		right: 0;
 
 		.bottom-price {
+			font-size: 48rpx;
 			font-weight: 500;
-			font-size: 50rpx;
-			color: #D62828;
+			color: #EE3E3B;
 		}
 		.bottom-price::before {
-			font-size: 27rpx;
+			font-size: 24rpx;
 			content: '￥';
 		}
 
 		.bottom-btn {
-			width: 360rpx;
-			background: #D62828;
+			width: 250rpx;
+			height: 80rpx;
+			background: #F74A57;
 			border-radius: 40rpx;
+			font-size: 32rpx;
 			text-align: center;
 			font-weight: bold;
-			font-size: 42rpx;
 			color: #FFFFFF;
+			line-height: 78rpx;
 		}
 	}
 </style>
diff --git a/subPackages/ticketBooking/order.vue b/subPackages/ticketBooking/order.vue
index be8d58f..8fb96ed 100644
--- a/subPackages/ticketBooking/order.vue
+++ b/subPackages/ticketBooking/order.vue
@@ -1,97 +1,325 @@
 <template>
 	<view class="bg">
-		<view class="top-box" >
+		<view class="top-box1" >
 			<view class="top-left">
-				<view class="text-overflow">{{ pInfo.title }}</view>
-				<view style="margin-top: 20rpx;">
-					<view class="left-subtitle" v-if="allSeldDate.length > 0">{{allSeldDate[seldDateIndex].date}} {{ShowDateDay(new Date(allSeldDate[seldDateIndex].date).getDay())}}</view>
-					<view class="left-subtitle"  v-if="timesArr.length > 0">{{ timesArr[seldTimeIndex].start_time }}-{{ timesArr[seldTimeIndex].end_time }} 入园</view>
+				<view class="title text-overflow">{{ pInfo.title }}</view>
+				<view>
+					<view style="padding: 20rpx 0 10rpx;" v-if="allSeldDate.length > 0">{{showDate.date}} {{ShowDateDay(new Date(showDate.date).getDay())}}</view>
+					<view v-if="timesArr.length > 0">{{ showDate.startTime }}-{{ showDate.endTime }} 入园</view>
 				</view>
 			</view>
-			<view @click="showSkuPopup = true" v-if="this.sInfo.ticket_type != 2">修改 ></view>
+			<view class="top-edit" @click="changeSku">修改 ></view>
 		</view>
 		
-		 <view class="num-box" v-for="(skuItem,skuIndex) in pInfo.specifications" :key="skuIndex">
-			<view style="display: flex;justify-content: space-between;align-items: center;">
-				<view class="left-title text-overflow">{{skuItem.title}}</view>
-				<view class="left-price">{{skuItem.price / 100}}</view>
-				<view class="num-right">
-					<view class="btn-num" v-if="!skuItem.originate_order_id && !skuItem.gp_id" :class="{no:skuItem.originate_order_id}" @click="delNumber(skuItem)" :style="{color: skuItem.buyNum > 1 ? '#fff': '', backgroundColor: skuItem.buyNum > 1 ? '#0B898E' : ''}">-</view>
-					<view class="num-span">{{ skuItem.buyNum }}</view>
-					<view class="btn-num" v-if="!skuItem.originate_order_id && !skuItem.gp_id" :class="{no:skuItem.originate_order_id}" @click="addNumber(skuItem)" style="color: #fff;background: #0B898E;">+</view>
+		<view class="tickets-box">
+			<view class="w-full" v-for="(skuItem,skuIndex) in pInfo.specifications" :key="skuIndex">
+				<view class="num-box" v-if="showMore||skuIndex==0">
+				<view class="flex-between num-left">
+					<view class="left-title text-overflow">{{skuItem.title}}</view>
+					<view class="left-price">{{skuItem.price / 100}}</view>
+					<view class="num-right">
+						<view :class="['btn-num',skuItem.buyNum<=0||(skuItem.id==sInfo.id&&skuItem.buyNum<=1)?'disabled':'']" 
+						v-if="!skuItem.originate_order_id && !skuItem.gp_id"  @click="delNumber(skuItem)" >-</view>
+						<view class="num-span">{{ skuItem.buyNum }}</view>
+						<view class="btn-num" v-if="!skuItem.originate_order_id && !skuItem.gp_id"  @click="addNumber(skuItem)" >+</view>
+					</view>
+				</view>
+				<view style="padding: 30rpx 0 20rpx;" class="num-subtitle text-overflow" @click="showpopRule(true, skuItem)">
+					<view class="flex" v-if="skuItem.specifications_new_tag">
+						<view v-for="(tag,tagIndex) in skuItem.specifications_new_tag.split(',').slice(0, 2)"
+						:key="tagIndex">{{ tag }}<text style="padding: 0 5rpx;">|</text></view>
+					</view>
+					<view>预订须知 ></view>
+				</view>
+				<!-- <view style="color: #71B580;" class="num-subtitle text-overflow">购票限制没有绑定字段</view> -->
 				</view>
 			</view>
-			<view class="num-subtitle text-overflow" v-if="skuItem.display_tags" @click="showNoticePopup = true">
-				<view class="num-span" v-for="(tagSku,tagSkuIndex) in skuItem.display_tags.split(',').slice(0, 2)" :key="tagSkuIndex">{{ tagSku }} |</view>
-				<view class="num-span">预订须知 ></view>
+			<view class="buyMore" @click="showMore=!showMore">
+				<template v-if="!showMore">
+					<view>一起订</view>
+					<view class="buyMore-btn">展开购买</view>
+				</template>
+				<template v-else>
+					<view></view>
+					<view class="buyMore-btn">收起</view>
+					<view></view>
+				</template>
 			</view>
 		</view>
 		
 		<view class="people-box" >
-			<!-- 按地址引用 不能用filter -->
-			<!-- <view class="people-box-sku" v-for="(skuItem,skuIndex) in pInfo.specifications.filter(v=>v.buyNum>=1)" :key="skuIndex"> -->
+			<view class="people-box-title">
+				<view v-if="!skuBuyMultiple">仅需填写{{pInfo.specifications[0].buyNum}}位出行人</view>
+				<view v-else>出行人信息</view>
+			</view>
+			
+			<view style="padding: 42rpx 0 10rpx;">
 			<view v-for="(skuItem,skuIndex) in pInfo.specifications" :key="skuIndex">
 				<view class="people-box-sku" v-if="skuItem.buyNum>=1">
-					<view>{{skuItem.title}}</view>
-					<view v-for="(person,personIndex) in skuItem.selPeople" :key="personIndex" @click="showAddressPopUp(person,skuItem.selPeople)">
-						<view v-if="person.id" class="flex">
-							<view>出行人1</view>
-							<view>{{person.name}}</view>
+					<view class="flex relative" style="max-width: 100%;width: fit-content;" 
+					v-if="!skuBuyMultiple&&skuItem.is_card">
+						<view class="person-scroll no-scrollbar" style="overflow-y: auto;">
+						<view :class="['person-item-container',skuItem.selPeople.some(v=>v.id==item.id)?'active':'']" 
+							v-for="(item,addI) in addressList" :key="addI"
+							@click.stop="personClick(item,skuItem)">
+							<view class="person-item">
+								<view>{{item.name}}</view>
+								<!-- <view class="disabled">信息不符</view> -->
+							</view>
+							<view class="selected" v-if="skuItem.selPeople.some(v=>v.id==item.id)">
+								<uni-icons color="#fff" type="checkmarkempty" size="10" ></uni-icons>
+							</view>
+						</view>
+						</view>
+						<view class="h-1rpx flex-shrink-0" style="width: 110rpx;"></view>
+						<view class="person-item-more" @click.stop="changeAddressPopup('open')">
+							<view>更多></view>
+						</view>
+					</view>
+					<view class="sku-title" v-if="skuBuyMultiple">{{skuItem.title}}</view>
+					<!-- 一票一证 -->
+					<view class="w-full" v-if="skuItem.is_card&&skuItem.is_real_name">
+						<view v-for="(person,personIndex) in skuItem.selPeople" :key="personIndex" @click.stop="showAddressPopUp(person,skuItem.selPeople)">
+							<view class="person-info flex" v-if="person.id">
+								<view @click.stop="removePerson(person)">
+									<uni-icons color="#F84A56" type="minus" size="30" ></uni-icons>
+								</view>
+								<text style="padding:0 30rpx 0 20rpx;">出行人{{personIndex+1}}</text>
+								<view class="person-info-detail">
+									<view style="font-size: 31rpx;color: #000000;" class="flex flex-items-center">
+										<text style="padding-right: 30rpx;">{{person.name}}</text>
+										<img @click.stop="changeAddressAddPopup('open',person)" v-if="skuBuyMultiple" style="width: 32rpx;height: 32rpx;" :src="showImg('/uploads/20240827/337cf610ce5924c2a65b7a28b6a4891e.png')" alt="" />
+									</view>
+		
+									<view style="padding: 20rpx 0 14rpx;">手机号 {{person.tel}}</view>
+									<view>身份证 {{person.id_number}}</view>
+								</view>
+								
+								<img @click.stop="changeAddressAddPopup('open',person)" v-if="!skuBuyMultiple" style="width: 32rpx;height: 32rpx;" 
+								:src="showImg('/uploads/20240827/337cf610ce5924c2a65b7a28b6a4891e.png')" alt="" />
+								<uni-icons v-else type="right" size="16"></uni-icons>
+								
+							</view>
+							<view class="w-full" style="padding-bottom: 33rpx;" v-else>
+								<view class="person-need" >
+									<view class="flex flex-items-center">
+										<uni-icons color="#71B580" type="plus" size="30"></uni-icons>
+										<text style="padding:0 30rpx;">出行人{{personIndex+1}}</text>
+										<text >点击填写1位出行人信息</text>
+									</view>
+									<uni-icons  color="#71B580" type="right" size="16"></uni-icons>
+								</view>
+							</view>
+						</view>
+					</view>
+					
+					<!-- 多票一证 -->
+					<view class="w-full" v-if="skuItem.is_card&&(!skuItem.is_real_name)">
+						<view  @click.stop="showAddressPopUp(skuItem.selPerson,[])">
+							<view class="person-info flex" v-if="skuItem.selPerson.id">
+								<view @click.stop="removePerson(skuItem.selPerson)">
+									<uni-icons color="#F84A56" type="minus" size="30" ></uni-icons>
+								</view>
+								<text style="padding:0 30rpx 0 20rpx;">出行人1</text>
+								<view class="person-info-detail">
+									<view style="font-size: 31rpx;color: #000000;" class="flex flex-items-center">
+										<text style="padding-right: 30rpx;">{{skuItem.selPerson.name}}</text>
+										<img @click.stop="changeAddressAddPopup('open',person)" v-if="skuBuyMultiple" style="width: 32rpx;height: 32rpx;" :src="showImg('/uploads/20240827/337cf610ce5924c2a65b7a28b6a4891e.png')" alt="" />
+									</view>
+									<view style="padding: 20rpx 0 14rpx;">手机号 {{skuItem.selPerson.tel}}</view>
+									<view>身份证 {{skuItem.selPerson.id_number}}</view>
+								</view>
+								
+								<img @click.stop="changeAddressAddPopup('open',person)" v-if="!skuBuyMultiple" style="width: 32rpx;height: 32rpx;" 
+								:src="showImg('/uploads/20240827/337cf610ce5924c2a65b7a28b6a4891e.png')" alt="" />
+								<uni-icons v-else type="right" size="16"></uni-icons>
+							</view>
+							<view class="w-full" style="padding-bottom: 33rpx;" v-else>
+								<view class="person-need" >
+									<view class="flex flex-items-center">
+										<uni-icons color="#71B580" type="plus" size="30"></uni-icons>
+										<text style="padding:0 30rpx;">出行人1</text>
+										<text >点击填写1位出行人信息</text>
+									</view>
+									<uni-icons  color="#71B580" type="right" size="16"></uni-icons>
+								</view>
+							</view>
 						</view>
-						<view v-else>点击添加出行人信息</view>
 					</view>
+					
+					<!-- 不实名 -->
+					<view class="w-full flex flex-items-center" v-if="!skuItem.is_card" style="padding-bottom: 33rpx;font-size: 29rpx;">
+						<view style="width: 170rpx;" class="flex-shrink-0">联系电话</view>
+						<view class="flex flex-between flex-1 w-1rpx" >
+							<input class="input" type="text" placeholder="请输入手机号" v-model="skuItem.selPerson.tel" />
+							<uni-icons v-if="skuItem.selPerson.tel&&skuItem.selPerson.tel.length>0"
+								type="closeempty" size="14" @click="clearTel(skuItem.selPerson)"></uni-icons>
+						</view>
+					</view>
+					
+					
 				</view>
 			</view>
+			</view>
 		</view>
 		
+		<!-- 优惠券 -->
+		<navigator :url="'/subPackages/order/orderCoupon?allprice='+ 1 + '&sku_ids='+ 1" class="tickets-container flex-between top-line">
+		    <view class="order-title">优惠券</view>
+		    <view class="coupon-btn" v-if="coupon==''">
+				<view class="select">请选择</view>
+				<uni-icons style="height: 42rpx;" color="#999999" type="right" size="18"></uni-icons>
+			</view>
+		    <div class="coupon-price" v-else>
+				<span v-if="coupon.percent == 0">-￥{{coupon.discounts/100}}</span>
+				<span v-else>-{{coupon.percent}}%</span>
+				<span style="margin:0 31rpx 0 8rpx;color: #6C7A94;">></span>
+			</div>
+		 </navigator>
+		
 		<view class="btn-list">
 			<view class="price-box">
 				<view class="text">合计:</view>
-				<view class="price">{{ 10 }}</view>
+				<view class="price">{{ total() }}</view>
 				<!-- <view class="post-text" v-if="sendType==1&&post">含邮费:¥{{ post / 100 }}</view> -->
 			</view>
-			<view class="btn" @click="order()">立即购买</view>
+			<view class="btn" @click="order()">去支付</view>
 		</view>
 		<!-- 选择出行人 -->
 		<uni-popup ref="addressPopup" type="bottom" backgroundColor="#F4F4F4" >
 			<view class="people-popup">
 				<view class="top flex-between" style="padding-bottom: 14rpx;">
-					<text></text>
-					<!-- <text class="text-overflow" @click="changeAddressAddPopup('close')">取消</text> -->
-					<!-- <text style="font-size: 35rpx;font-weight: 600;">添加收货地址</text> -->
-					<text style="color: #71B580;" class="confirm" @click="changeAddressPopup('close',true)">保存</text>
+					<text class="text-overflow" @click="changeAddressPopup('close')">取消</text>
+					<text style="color: #71B580;" class="confirm" @click="changeAddressPopup('close',true)">确定</text>
 				</view>
-				<view class="button">添加出行人</view>
+				<view class="button" @click="changeAddressAddPopup('open',{})">添加出行人</view>
 				<view class="popup-list" v-if="addressList.length > 0">
 					<view :class="['popup-item',addressSelect.id==item.id?'active':'',currentPerson.id!=item.id&&currentPersonIds.includes(item.id)?'disabled':'']" 
 						v-for="(item, index) in addressList" :key="index" @click="seldThisAddress(item)">
-						<view class="item-top flex-between">
-							<view style="padding-right: 71rpx;">
-								<view class="name flex-start">
-									{{ item.name }}
-									<text>{{ item.tel }}</text>
-									<!-- <text class="tag" v-if="item.is_default == 1">默认</text> -->
+						<view class="item-top flex flex-items-center">
+							<img @click.stop="changeAddressAddPopup('open',item)" class="flex-shrink-0" :src="showImg('/uploads/20240827/337cf610ce5924c2a65b7a28b6a4891e.png')" alt="" />
+							<view class="name flex-shrink-0" style="padding-left: 32rpx;width: 180rpx;">{{item.name}}</view>
+							<view class="flex-1 w-1rpx" style="padding-left: 20rpx;">
+								<view class="name">
+									<text>手机号 {{ item.tel }}</text>
+									<text class="tag" v-if="item.is_default == 1">默认</text>
 								</view>
 								<view class="subtitle text-overflowRows">身份证 {{ item.id_number}}</view>
 							</view>
-							<view>
-								<img :src="showImg('/uploads/20240827/337cf610ce5924c2a65b7a28b6a4891e.png')" alt="" />
+							
+						</view>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+		
+		<!-- 新增编辑出行人弹窗 -->
+		<uni-popup ref="addressAddPopup" type="bottom" backgroundColor="#F4F4F4" style="border-radius: 13rpx 13rpx 0 0;">
+			<view class="people-popup">
+				<view class="top-box">
+					<view class="top flex-between" style="height: fit-content;">
+						<text class="text-overflow" @click="changeAddressAddPopup('close')">取消</text>
+						<text style="font-size: 35rpx;font-weight: 600;">{{addressTitle}}</text>
+						<text style="color: #71B580;" class="confirm" @click="saveAddress">保存</text>
+					</view>
+				</view>
+				
+				<view class="add-edit-content">
+					<contactAddVue ref="addressAddVueRef"></contactAddVue>
+				</view>
+				
+				
+			</view>
+		</uni-popup>
+		
+		<!-- 预订须知的弹窗 -->
+		<uni-popup ref="popupRule" type="bottom" :safe-area="false">
+			<view class="popup-content-date flex-column flex" >
+				<view class="popup-content-title flex">
+					<view class="flex-1 w-1rpx text-overflow">
+						{{skuInfo.title}}
+					</view>
+					<img src="https://static.ticket.sz-trip.com/taizhou/images/cha.png" @click="showpopRule(null)"
+						style="width: 20rpx;height: 20rpx;" class="flex-shrink-0">
+				</view>	
+				<view class="content flex-1 h-1rpx no-scrollbar">
+					<view class="detail-content" v-html="formateRichText(skuInfo.reserve_content)"></view>
+				</view>
+			</view>
+		</uni-popup>
+	
+		<!-- 预定弹窗 -->
+		<uni-popup ref="popup" type="bottom" :safe-area="false">
+			<view class="popup-content-date calendar-edit" >
+				<view class="popup-content-title flex">
+					<view class="flex-1 w-1rpx text-overflow">
+						{{sInfo.title}}
+					</view>
+					<img src="https://static.ticket.sz-trip.com/taizhou/images/cha.png" @click="closePopup"
+						style="width: 31rpx;height: 31rpx;" class="flex-shrink-0">
+				</view>				
+				<view class="order-popup-detail">
+					<view class="relative">
+						<view class="sku-title">使用日期</view>
+						<view class="date-content">
+							<view :class="['item', item.store>0?'':'disabled',seldDateIndex===index?'active':'']" 
+							v-for="(item,index) in allSeldDate" :key="index"
+							@click="clickTab(item,index)">
+								<view>{{ShowDateDay(new Date(item.date).getDay())}}</view>
+								<view>{{item.date.slice(-5)}}</view>
+								<view class="price" v-if="item.store > 0">￥{{item.money/100}}</view>
+								<view v-else>不可定</view>
+							</view>
+						</view>
+						<view class="dateMore" @click="openCalendar">
+							<view style="width: 55rpx;">更多日期</view>
+						</view>
+					</view>
+					
+					<view v-if="timesArr.length > 0 && sInfo.is_time_stock">
+						<view class="sku-title">选择场次</view>
+						<view class="time-box">
+							<view v-for="(item,index) in timesArr" :key="index" 
+							:class="['time-item',{'time-disable': item.stock_number < 1, 'time-active': item.stock_number > 0 && index == seldTimeIndex}]" 
+							@click="changeTime(item,index)">
+								{{ item.start_time }}-{{ item.end_time }}
+								{{item.stock_number < 10 ? (item.stock_number === -1 ? '不可定' : item.stock_number === 0 ? '无票' : '(余票' + item.stock_number + ')') : '有票'}}
 							</view>
 						</view>
 					</view>
 				</view>
+				<view class="sku-bottom">
+					<view class="flex" style="align-items: baseline;">
+					    合计：<view class="bottom-price">{{allSeldDate[seldDateIndex].money / 100 || 0}}</view>
+					</view>
+					<view class="bottom-btn" @click="addBuyCard">
+							确定
+					</view>
+				</view>
 			</view>
+			
 		</uni-popup>
 		
+		<uni-calendar ref="calendar" class="uni-calendar--hook" :clear-date="true" 
+		:date="allSeldDate[seldDateIndex].date" :insert="false"  :startDate="calendarParam.startDate"
+		:endDate="calendarParam.endDate"  @confirm="confirmCalendar" :selected="calendarParam.selected"/>
 	</view>
 </template>
 
 <script>
+	import contactAddVue from '../../compoents/contactAdd.vue';
 	export default {
+		components: {contactAddVue},
 		data() {
 			return {
 				pInfo: {specifications: []}, // 当前商品
 				sInfo: {sku_model: {}}, // 当前门票
+				
+				showDate: {
+					date: '',
+					startTime: '',
+					endTime: ''
+				},
 
 				minSeldDate: new Date().Format('yyyy-MM-dd'),
 				maxSeldDate: new Date((new Date()).getFullYear(), (new Date()).getMonth() + 3, 0).Format('yyyy-MM-dd'),
@@ -110,6 +338,13 @@
 				currentPersonIds: [], // 当前门票的所有出行人
 				addressSelect: {}, // 出行人弹窗选择的人
 				
+				showMore: false,
+				skuBuyMultiple: false,
+				coupon:'',
+				
+				skuInfo: {}, // 当前点击的sku
+				addressTitle: '添加出行人',
+				setDefault: false
 			}
 		},
 		onLoad(options) {
@@ -118,31 +353,81 @@
 		},
 		
 		onShow() {
-			this.getAddressList()
+			
 		},
 		
 		onUnload () {
 		},
 		methods: {
+			
+			// 获取最大优惠券
+			async getMaxCouponData () {
+				let allPrice = 0
+				this.pInfo.specifications.forEach(v=>{
+					allPrice+= v.price*v.buyNum
+				})
+				let param = {money:allPrice,sku_ids:this.sInfo.id}
+				let res = await this.getMaxCoupon(param)
+				if (res.id) {
+					this.coupon = res
+				}
+			},
+			
 			initPageData () {
+				this.setDefault = false
+				this.showMore = false
+				this.skuBuyMultiple = false
 				let data = uni.getStorageSync('ticketOrder');
 				try{
 					data = JSON.parse(data)
+					// selPeople 一证多票 selPerson 一证一票
+					data.pInfo.specifications.forEach(v=>{
+						v.buyNum = 0;v.selPeople = [];v.selPerson = {}
+						v.is_card = Number(v.is_card);
+						v.is_real_name = Number(v.is_real_name)
+					})
+					
+					let orderSkuIndex = data.pInfo.specifications.findIndex(v=>v.id == data.sInfo.id)
+					let item = data.pInfo.specifications.splice(orderSkuIndex, 1)[0]; // 将购买的数据放在第一位
+					item.buyNum = 1
+					item.selPeople = [
+						{
+							id:null,id_number:null,name:null,
+							tel:null,user_id:null,age:null,
+						},
+					]
+					item.selPerson = {
+						id:null,id_number:null,name:null,tel:null,user_id:null,age:null,
+					}
+					data.pInfo.specifications.unshift(item);
+					
 					this.pInfo = data.pInfo
 					this.sInfo = data.sInfo
 					this.minSeldDate=data.minSeldDate
 					this.maxSeldDate = data.maxSeldDate
 					this.calendarParam = data.calendarParam
-					this.allSeldDate = data.allSeldDate
+					this.allSeldDate = data.allSeldDate || []
 					this.seldDateIndex = data.seldDateIndex
-					this.timesArr = data.timesArr
-					this.seldTimeIndex = data.seldTimeIndex 
+					this.timesArr = data.timesArr || []
+					this.seldTimeIndex = data.seldTimeIndex
+					
+					this.showDate = {
+						date: ((this.allSeldDate[this.seldDateIndex])||{}).date,
+						startTime: (this.timesArr[this.seldTimeIndex]||{}).start_time,
+						endTime: (this.timesArr[this.seldTimeIndex]||{}).end_time
+					}
+					
 					
 				} catch(e){
 					console.log(e)
 				}
+				
+				this.getAddressList()
+				this.getMaxCouponData()
 			},
 			
+			
+			/*---------------出行人------------------------------*/
 			// 选择出行人
 			showAddressPopUp (person,personList) {
 				this.currentPerson = person
@@ -158,13 +443,79 @@
 				} else {
 					this.addressSelect = {}
 				}
+				
+				// 如果没有出行人 打开新增弹窗
+				if (this.addressList.length<=0) {
+					this.changeAddressAddPopup('open')
+					return
+				}
+				
 				this.changeAddressPopup('open')
 			},
-			
 			// 获取出行人信息
 			getAddressList () {
 				this.Post({},'/api/user/contactList').then((res)=> {
 					this.addressList = res.data || []
+					// 对比所有出行人信息进行变更
+					this.pInfo.specifications.forEach(s=>{
+						s.selPeople.forEach(person=>{
+							let currentPerson = this.addressList.find(v=>v.id == person.id)
+							if (currentPerson) {
+								person.id = currentPerson.id
+								person.id_number = currentPerson.id_number
+								person.name = currentPerson.name
+								person.user_id = currentPerson.user_id
+								person.tel = currentPerson.tel
+								person.age = currentPerson.age
+							}
+						})
+						
+						let currentPerson = this.addressList.find(v=>v.id == s.selPerson.id)
+						if (currentPerson) {
+							s.selPerson.id = currentPerson.id
+							s.selPerson.id_number = currentPerson.id_number
+							s.selPerson.name = currentPerson.name
+							s.selPerson.user_id = currentPerson.user_id
+							s.selPerson.tel = currentPerson.tel
+							s.selPerson.age = currentPerson.age
+						}
+						
+					})
+					
+					
+					// 如果只有一张票给默认值
+					if (!this.setDefault && this.addressList.length>0) {
+						// 找符合条件的
+						let currentData = this.pInfo.specifications[0]
+						let person0 = currentData.selPeople[0]
+						let person = currentData.selPerson
+						let currentPerson = {}
+						if (this.addressList.some(v=>v.is_default=='1')) {
+							currentPerson = this.addressList.find(v=>v.is_default=='1')
+						} else {
+							currentPerson = this.addressList[0]
+						}
+						
+						if (!currentData.is_card) {
+							person.tel = JSON.parse(uni.getStorageSync('userInfo')).mobile
+						} else {
+							person.id = currentPerson.id
+							person.id_number = currentPerson.id_number
+							person.name = currentPerson.name
+							person.user_id = currentPerson.user_id
+							person.tel = currentPerson.tel
+							person.age = currentPerson.age
+							
+							person0.id = currentPerson.id
+							person0.id_number = currentPerson.id_number
+							person0.name = currentPerson.name
+							person0.user_id = currentPerson.user_id
+							person0.tel = currentPerson.tel
+							person0.age = currentPerson.age
+						}
+						
+						this.setDefault = true
+					}
 				})
 			},
 			// 出行人弹窗
@@ -185,6 +536,7 @@
 				else this.$refs.addressPopup.close();
 				this.$forceUpdate();
 			},
+			// 选中出行人
 			seldThisAddress(item){
 				if (this.addressSelect.id == item.id) {
 					this.addressSelect = {}
@@ -195,30 +547,86 @@
 						this.addressSelect = item
 					}
 				}
-				
 			},
 			
+			// 表单上选择点击出行人
+			personClick (person, sku) {
+				let personHave = sku.selPeople.find(v=>v.id == person.id)
+				if (personHave) {
+					for(let key in personHave) {
+						personHave[key] = null
+					}
+				} else {
+					for(let p of sku.selPeople) {
+						if (!p.id) {
+							p.id = person.id
+							p.id_number = person.id_number
+							p.name = person.name
+							p.user_id = person.user_id
+							p.tel = person.tel
+							p.age = person.age
+							break
+						}
+					}
+				}
+				
+			},
+			removePerson (person) {
+				for(let key in person) {
+					person[key] = null
+				}
+			},
+			clearTel (data) {data.tel = ''},
 			
+			// 出行人新增弹窗
+			changeAddressAddPopup(type, item) {
+				if (type == 'open') {
+					this.addressTitle = '新增出行人'
+					if (item.id) { this.addressTitle = '编辑出行人' }
+					this.$refs.addressAddPopup.open('bottom');
+					this.$nextTick(()=>{
+						this.$refs.addressAddVueRef.init(item)
+					})
+				}
+				else {this.$refs.addressAddPopup.close();}
+				this.$forceUpdate();
+			},
 			
+			// 保存地址
+			async saveAddress () {
+				let res = await this.$refs.addressAddVueRef.submit()
+				if (res && res.code == 1) {
+					this.getAddressList();
+					this.changeAddressAddPopup('close')
+				}
+			},
 			
+			/*---------------------------出行人结束-----------------------------------*/
 			
 			// 减少数量
 			delNumber(skuItem) {
 				if (skuItem.buyNum <= 0) {
 					return
 				}
-				// if(this.buyNum == this.seldPeople.length) {
-				// 	this.allSeldPeople.forEach(item => {
-				// 		if(item.id == this.seldPeople[this.seldPeople.length -1].id) {
-				// 			item.is_seld = false
-				// 			item.selected = false
-				// 		}
-				// 	})
-				// 	this.seldPeople.pop()
-				// }
+				if (skuItem.id == this.sInfo.id && skuItem.buyNum<=1) {
+					return
+				}
+
 				skuItem.buyNum -= 1
 				skuItem.selPeople.pop()
-				// this.removeSeldCoupon()
+				this.$store.commit("choseCoupon","");
+				this.coupon = ''
+				
+				if (skuItem.buyNum == 0) {
+					skuItem.selPerson.id = null
+					skuItem.selPerson.id_number=null
+					skuItem.selPerson.name=null
+					skuItem.selPerson.tel=null
+					skuItem.selPerson.user_id=null
+					skuItem.selPerson.age=null
+				}
+				
+				this.calBuyMultiple()
 			},
 			// 增加数量
 			addNumber(skuItem) {
@@ -238,79 +646,140 @@
 						tel:null,user_id:null,age:null,
 					}]
 				}
+				this.$store.commit("choseCoupon","");
+				this.coupon = ''
+				this.calBuyMultiple()
+			},
+			// 计算总价
+			total() {
+				let price = 0
+				let allPrice = 0
+				this.pInfo.specifications.forEach(v=>{
+					allPrice+= v.price*v.buyNum
+				})
+				this.allprice = allPrice
+				if (this.coupon) {
+					if (this.coupon.percent == 0) {
+						if (this.coupon.discounts>allPrice) {
+							price =0
+						}else{
+							price = allPrice  - (this.coupon.discounts)
+						}
+						
+					} else{
+						price = allPrice - allPrice * (this.coupon.percent/100)
+					}
+				} else {
+					price = allPrice
+				}
+				return price < 0 ? 0 : price/100
 			},
 			
+			// 判断是否买多个sku
+			calBuyMultiple () {
+				this.skuBuyMultiple = this.pInfo.specifications.slice(1).some(v=>v.buyNum>0)
+			},
+			
+			// 预定须知
+			showpopRule(flag, item) {
+				if (item) {
+					this.skuInfo = item
+				} 
+				if (flag) {
+					this.$refs.popupRule.open('bottom');
+				} else {
+					this.$refs.popupRule.close();
+				}
+			},
+			
+			/*---------------------------价格日历-----------------------------------*/
+			// 选择列表规格
+			changeSku() {
+				// this.getPriceCal(this.sInfo.id,this.pInfo.id)
+				this.openPop()
+			},
+			openCalendar () {
+				this.calendarParam = {
+					startDate: (this.allSeldDate.find(v=>v.store>0) || {}).date,
+					endDate: (this.allSeldDate[this.allSeldDate.findLastIndex(v=>v.store>0)]||{}).date,
+					selected: this.allSeldDate.filter(v=>v.store>0).map(v=>{
+						return {
+							date: v.date,
+							info: '￥'+v.money/100,
+							notNeedDot:true,
+						}
+					})
+				}
+				this.$refs.calendar.open();
+			},
+			// 获取价格日历列表
+			getPriceCal(skuId, goodsId) {
+				this.Post({
+					specifications_id: skuId,
+					goods_id: goodsId,
+					limit: 60
+				}, '/api/goods/getPriceCalendarListBySpecifications').then(res => {
+					this.allSeldDate = res.data || []
+					this.seldDateIndex = this.allSeldDate.findIndex(item => item.store != 0)
+					this.getTimeStock(this.allSeldDate[this.seldDateIndex].date)
+					this.openPop()
+				})
+			},
+			// 获取规格分时库存
+			getTimeStock(date) {
+				this.Post({
+					specifications_id: this.sInfo.id,
+					date: date,
+				}, '/api/goods/getTimeStock').then(res => {
+					if (res.data.length > 0) {
+						this.timesArr = res.data || []
+						this.seldTimeIndex = this.timesArr.findIndex(item => item.stock_number > 0)
+					}
+				})
+			},
+			// 选择日期
+			clickTab(item, index) {
+				if (item.store>0) {
+					this.seldDateIndex = index
+					this.getTimeStock(item.date)
+				}
+				
+			},
 			// 选择时段
 			changeTime(item, index) {
 				if(item.stock_number > 0) {
 					this.seldTimeIndex = index
 				}
 			},
-			// 选择日期
-			clickTab(item, index) {
-				this.seldDateIndex = index
-				this.getTimes()
-			},
 			confirmCalendar (val) {
-				let index = this.allSeldDate.find(v=>v.date == val.fulldate)
-				if (index) {
-					this.clickTab({},index)
+				let index = this.allSeldDate.findIndex(v=>v.date == val.fulldate)
+				if (index>=0) {
+					this.clickTab(this.allSeldDate[index],index)
 				}
 			},
-			// 获取价格日历
-			getDays() {
-				let that = this
-				that.Post({
-					url: '',
-					start_date: that.minSeldDate,
-					end_date: that.maxSeldDate,
-					sku_id: that.skuInfo.id
-				},'https://api.cloud.sz-trip.com/api/product/product_date_price').then(function (result) {
-					let res = result.data
-					if (res) {
-						that.allSeldDate = res
-						// 初始化选择项目
-						for (let i = 0; i < that.allSeldDate.length; i++) {
-							if (that.allSeldDate[i].stock > 0) {
-								that.seldDateIndex = i
-								break;
-							}
-							// that.allSeldDate[i].price = that.sInfo.price
-						}
-						that.openPop()
-						that.getTimes()
-					}
-				})
+			closePopup() {
+				this.$refs.popup.close()
 			},
-			getTimes() {
-				let that = this
-				// 判断是否是分时的，不是就不需要去请求了的
-				if (!that.skuInfo.sku_model.is_time_stock) {
-					return
-				}
-				if (that.seldDateIndex < 0) {
+			openPop(){
+				this.$refs.popup.open()
+			},
+			addBuyCard () {
+				// 如果是分时，未选择分时
+				if(this.sInfo.is_time_stock && this.seldTimeIndex < 0) {
+					uni.showToast({title:'请选择分时',icon:'none'})
 					return;
 				}
-				that.seldTimeIndex = -1
-				that.Post({
-					url: '',
-					date: that.allSeldDate[that.seldDateIndex].date,
-					sku_id: that.allSeldDate[that.seldDateIndex].sku_id ? that.allSeldDate[that.seldDateIndex].sku_id : that.skuInfo.id
-				},'https://api.cloud.sz-trip.com/api/product/product_timestock_price').then(function (result) {
-					let res = result.data
-					if (res) {
-						that.timesArr = res
-						for (let i = 0; i < that.timesArr.length; i++) {
-							if (that.timesArr[i].stock_number > 0) {
-								that.seldTimeIndex = i
-								break;
-							}
-						}
-					}
-				})
+				this.showDate = {
+					date: ((this.allSeldDate[this.seldDateIndex])||{}).date,
+					startTime: (this.timesArr[this.seldTimeIndex]||{}).start_time,
+					endTime: (this.timesArr[this.seldTimeIndex]||{}).end_time
+				}
+				this.closePopup()
+				
+				//todo 请求接口重新获取 将页面数据全部重置
+				
 			},
-			
-			
+			/*---------------------------价格日历-----------------------------------*/
 			order() {
 				let use_date = this.allSeldDate[this.seldDateIndex].date
 				let start_time =this.timesArr[this.seldTimeIndex].start_time
@@ -321,23 +790,63 @@
 				// 设置参数
 				console.log(this.pInfo)
 				this.pInfo.specifications.forEach(sku=>{
-					if (sku.buyNum != sku.selPeople.length) {
-						uni.showToast({
-							title:'请选择出行人',
-							icon:'none'
-						})
-					}
-					if (sku.buyNum>=1) {
+					if (!sku.is_card) {
+						if (this.isTel(sku.selPerson.tel)) {
+							uni.showToast({
+								title:'请输入正确的手机号',
+								icon:'none'
+							})
+							return
+						}
 						let param = {
 							specifications_id: sku.id,
 							num: sku.buyNum,
-							contact_id: sku.selPeople.filter(v=>v.id).map(v=>v.id),
+							// contact_id: sku.selPeople.filter(v=>v.id).map(v=>v.id),
 							date: use_date,
 							start_time: start_time,
 							end_time: end_time,
+							reserve_phone: sku.selPerson.tel,
 						}
 						goods.push(param)
+						
+					} else {
+						if (sku.is_real_name) {
+							if ( sku.selPeople.some(v=>!v.id)) {
+								uni.showToast({
+									title:'请选择出行人',
+									icon:'none'
+								})
+								return
+							}
+							let param = {
+								specifications_id: sku.id,
+								num: sku.buyNum,
+								contact_id: sku.selPeople.filter(v=>v.id).map(v=>v.id),
+								date: use_date,
+								start_time: start_time,
+								end_time: end_time,
+							}
+							goods.push(param)
+						} else {
+							if (sku.selPerson.id) {
+								uni.showToast({
+									title:'请选择出行人',
+									icon:'none'
+								})
+								return
+							}
+							let param = {
+								specifications_id: sku.id,
+								num: sku.buyNum,
+								contact_id: [sku.selPerson.id],
+								date: use_date,
+								start_time: start_time,
+								end_time: end_time,
+							}
+							goods.push(param)
+						}
 					}
+
 				})
 				console.log(goods)
 
@@ -394,126 +903,271 @@
 	.bg{
 		min-height: 100vh;
 		padding: 20rpx;
+		padding-bottom: 200rpx;
 		background-color: rgb(247, 247, 247);
 	}
 	
-	.top-box {
+	.top-box1 {
 	    width: 100%;
 	    background: #FFFFFF;
-	    border-radius: 18rpx;
-	    padding: 20rpx;
+	    border-radius: 13rpx;
+	    padding: 32rpx 20rpx;
 	    display: flex;
 	    justify-content: space-between;
 	    align-items: center;
 	    font-weight: 500;
-	    font-size: 36rpx;
-	    color: #0B898E;
+	    font-size: 25rpx;
+	    color: #999999;
 	
 	    .top-left {
 	        display: flex;
 	        flex-direction: column;
 	        justify-content: space-between;
-	        font-weight: bold;
-	        font-size: 45rpx;
-	        color: #000000;
 	        flex: 1;
 			width: 1rpx;
+			.title{
+				font-weight: bold;
+				font-size: 36rpx;
+				color: #000000;
+			}
+	    }
+		.top-edit{
+			font-family: PingFang SC;
+			font-weight: bold;
+			font-size: 27rpx;
+			color: #71B580;
+		}
+	}
+
+.tickets-box{
+	background: #FFFFFF;
+	border-radius: 13rpx;
+	width: 100%;
+	margin: 20rpx 0;
 	
-	        .left-subtitle {
-	            font-weight: 400;
+	.num-box {
+	    display: flex;
+	    justify-content: space-between;
+		flex-direction: column;
+		padding: 40rpx 20rpx;
+		border-bottom: 1px solid #CCCCCC;
+	
+	    .num-left {
+	        width: 100%;
+	        box-sizing: border-box;
+	        display: flex;
+	        justify-content: space-between;
+	        .left-title {
+				font-family: PingFang SC;
+				font-weight: bold;
+				font-size: 31rpx;
+				color: #000000;
+				width: 450rpx;
+	        }
+	        .left-price {
+	            font-weight: bold;
 	            font-size: 36rpx;
-	            color: #666666;
+	            color: #EE3E3B;
+				padding-right: 27rpx;
+	        }
+	        .left-price::before {
+	            font-size: 24rpx;
+	            content: '￥';
+	        }
+	
+	
+	    }
+		.num-subtitle {
+			display: flex;
+			align-items: center;
+			width: 100%;
+			font-family: PingFang SC;
+			font-weight: 500;
+			font-size: 23rpx;
+			color: #666666;
+		}
+	    .num-right {
+			display: flex;
+			align-items: center;
+			font-weight: bold;
+			font-size: 29rpx;
+			color: #000000;
+			text-align: center;
+	        .num-span {
+	            width: 67rpx;
+	            line-height: 63rpx;
 	        }
+	
+	        .btn-num {
+	            width: 46rpx;
+	            height: 46rpx;
+	            line-height: 40rpx;
+	            background: #71B580;
+	            border-radius: 50%;
+	            font-weight: 500;
+	            font-size: 45rpx;
+	            font-size: 34rpx;
+	            color: #FFFFFF;
+	        }
+			.btn-num.disabled{
+				color: #999999;
+				background: #E8E8E8;
+			}
 	    }
 	}
-
-.num-box {
-    width: 100%;
-    // height: 3.22rem;
-    background: #FFFFFF;
-    border-radius: 18rpx;
-    display: flex;
-    justify-content: space-between;
-	flex-direction: column;
-	margin: 20rpx 0;
-	padding: 20rpx;
-
-    .num-left {
-        width: 100%;
-        // padding: .5rem 0 .6rem .32rem;
-        box-sizing: border-box;
-        display: flex;
-        flex-direction: column;
-        justify-content: space-between;
-        font-weight: 400;
-        font-size: 27rpx;
-        color: #666666;
-
-        .left-title {
-            font-weight: bold;
-            font-size: 45rpx;
-            color: #000000;
-            width: 450rpx;
-        }
-
-        .left-price {
-            font-weight: 500;
-            font-size: 45rpx;
-            color: #D62828;
-        }
-        .left-price::before {
-            font-size: 27rpx;
-            content: '￥';
-        }
-
-
-    }
-	.num-subtitle {
-	    font-weight: 400;
-	    font-size: 27rpx;
-	    color: #0B898E;
-	    width: 100%;
+	
+	
+	.buyMore{
+		height: 118rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		font-size: 31rpx;
+		color: #000000;
 		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding:0 20rpx;
+		
+		.buyMore-btn{
+			height: 47rpx;
+			width: 148rpx;
+			text-align: center;
+			border-radius: 23rpx;
+			border: 1px solid #71B580;
+			font-family: PingFang SC;
+			font-weight: bold;
+			font-size: 25rpx;
+			color: #71B580;
+			line-height: 45rpx;
+		}
 	}
-    .num-right {
-        font-weight: 500;
-        font-size: 36rpx;
-        color: #000000;
-        display: flex;
-        text-align: center;
-
-        .num-span {
-            width: 90rpx;
-            line-height: 63rpx;
-        }
-
-        .btn-num {
-            width: 63rpx;
-            height: 63rpx;
-            line-height: 63rpx;
-            background: rgba(135,205,147,0);
-            border-radius: 50%;
-            border: 1px solid #999999;
-            font-weight: 500;
-            font-size: 45rpx;
-            color: #999999;
-        }
-    }
 }
 
 .people-box{
 	width: 100%;
-	// height: 3.22rem;
+	background: #FFFFFF;
+	border-radius: 13rpx;
+	.people-box-title{
+		font-family: PingFangSC;
+		font-weight: 600;
+		font-size: 31rpx;
+		color: #000000;
+		padding: 42rpx 18rpx;
+		border-bottom: 1px solid #CCCCCC;
+	}
 	
+	.person-scroll{
+		display: flex;
+		flex-wrap: nowrap;
+		position: relative;
+		padding-bottom: 50rpx;
+		overflow-y: auto;
+		.person-item-container{
+			width: 167rpx;
+			height: 73rpx;
+			background: #F1F1F1;
+			border-radius: 11rpx;
+			font-family: PingFangSC;
+			font-weight: 400;
+			font-size: 27rpx;
+			color: #000000;
+			padding: 2rpx;
+			margin-right: 14rpx;
+			position: relative;
+			&.active{
+				background: linear-gradient(135deg, #9EE4FE, #7FD491);
+			}
+			.disabled{
+				font-weight: 400;
+				font-size: 23rpx;
+				color: #999999;
+			}
+			.selected{
+				width: 28rpx;
+				height: 28rpx;
+				background: #87CD93;
+				border-radius: 10rpx 0rpx 10rpx 0rpx;
+				position: absolute;
+				bottom: 0;
+				right: 0;
+				display: flex;
+				justify-content: center;
+				line-height: 28rpx;
+			}
+		}
+		.person-item{
+			width: 163rpx;
+			height: 69rpx;
+			border-radius: 11rpx;
+			background: #F1F1F1;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: center;
+		}
+		
+		
+	}
 	
 	.people-box-sku{
 		width: 100%;
 		background: #FFFFFF;
 		border-radius: 18rpx;
-		// display: flex;
-		// justify-content: space-between;
-		margin: 20rpx 0;
-		padding: 20rpx;
+		padding: 0rpx 20rpx;
+		
+		.sku-title{
+			font-weight: 400;
+			font-size: 29rpx;
+			color: #060001;
+			padding-bottom: 25rpx;
+		}
+		
+		.person-info{
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			font-weight: 400;
+			font-size: 27rpx;
+			color: #000000;
+			margin-bottom: 33rpx;
+			.person-info-detail{
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #666666;
+				width: 400rpx;
+			}
+		}
+		
+		.person-need{
+			width: 100%;
+			height: 80rpx;
+			background: #EFF9F1;
+			border-radius: 13rpx;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			font-family: PingFang SC;
+			font-weight: 500;
+			font-size: 27rpx;
+			color: #71B580;
+			padding: 0 20rpx;
+		}
+		.person-item-more{
+			width: 110rpx;
+			height: 73rpx;
+			background: #EFF9F1;
+			border-radius: 11rpx;
+			text-align: center;
+			font-family: PingFang SC;
+			font-weight: 500;
+			font-size: 29rpx;
+			color: #71B580;
+			line-height: 73rpx;
+			position: absolute;
+			right: 0;
+			top: 0;
+		}
+		
 	}
 }
 
@@ -536,7 +1190,7 @@
 
 			text {
 				text-align: left;
-				font-size: 31rpx;
+				font-size: 35rpx;
 				font-weight: 400;
 				color: #000000;
 			}
@@ -577,13 +1231,10 @@
 					font-family: PingFang SC;
 					font-weight: 400;
 					font-size: 32rpx;
-					display: flex;
-					align-items: baseline;
 
 					text {
 						color: #666;
 						font-size: 25rpx;
-						padding: 0 24rpx;
 					}
 
 					.tag {
@@ -597,7 +1248,7 @@
 						font-weight: 500;
 						color: #ffffff;
 						background: #71B580;
-
+						margin-left: 10rpx;
 					}
 				}
 
@@ -669,7 +1320,7 @@
 		}
 		.popup-item.disabled{
 			.item-top {
-				background-color: #999;
+				background-color: #CCC;
 			}
 		}
 	}
@@ -688,37 +1339,63 @@
 		color: #000000;
 
 	}
+	
+	.add-edit-content{
+		background: #FFFFFF;
+		border-radius: 13rpx;
+		min-height: 800rpx;
+	}
 }
 
+	.tickets-container {
+		width: 100%;
+		background: #fff;
+		height: 120rpx;
+		margin-top: 22rpx;
+		.order-title {
+			margin: 31rpx 0 31rpx 30rpx;
+			font-size: 31rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #000000;
+		}
+
+		.coupon-price {
+			color:#DD0000;
+			font-size: 30rpx;
+			font-weight: 500;
+		}
+	}
 
 .btn-list {
-	width: 750rpx;
+	width: 100%;
 	height: 166rpx;
 	background: #ffffff;
 	box-shadow: 0rpx -3rpx 9rpx 1rpx rgba(227, 229, 232, 0.5);
 	display: flex;
 	position: fixed;
 	bottom: 0;
+	left: 0;
+	right:0;
 	padding: 20rpx 50rpx;
 	align-items: center;
 	justify-content: space-between;
 	.btn {
-			width: 294rpx;
-			height: 88rpx;
-			background: linear-gradient(90deg, #F84A56, #FF9834);
-			border-radius: 43rpx;
-			text-align: center;
-			line-height: 88rpx;
+		width: 250rpx;
+		height: 80rpx;
+		background: #F74A57;
+		border-radius: 43rpx;
+		text-align: center;
+		line-height: 80rpx;
 
-			font-size: 36rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #FFFFFF;
-	
+		font-size: 32rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #FFFFFF;
 	}
 	.price-box {
 		display: flex;
-		align-items: center;
+		align-items: baseline;
 		.text {
 			font-size: 28rpx;
 			font-family: PingFangSC-Regular, PingFang SC;
@@ -746,4 +1423,192 @@
 	}
 }
 
+	.popup-content-date {
+		background-color: white;
+		padding: 0rpx 28rpx 166rpx;
+		height: 70vh;
+		border-radius: 20rpx 20rpx 0 0 ;
+		.popup-content-title{
+			font-family: PingFang SC;
+			font-weight: bold;
+			font-size: 37rpx;
+			color: #000000;
+			padding: 39rpx 0;
+			display: flex;
+			align-items: center;
+			border-bottom: 1px solid #CCCCCC;
+		}
+		// 预定须知
+		.content{
+			padding-top: 48rpx;
+			overflow-y: auto;
+		}
+		
+		.order-popup-detail{
+			.sku-title{
+				padding: 48rpx 0 26rpx;
+				font-family: PingFangSC;
+				font-weight: 500;
+				font-size: 31rpx;
+				color: #000000;
+			}
+		}
+		
+		.dateMore{
+			width: 120rpx;
+			height: 133rpx;
+			background: white;
+			border-radius: 10rpx;
+			border: 1px solid #000000;
+			font-family: PingFang SC;
+			font-weight: 500;
+			font-size: 27rpx;
+			color: #000000;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: space-around;
+			flex-shrink: 0;
+			padding: 6rpx 0;
+			position: absolute;
+			bottom: 0;
+			right: 0;
+		}
+		
+		.date-content{
+			width: 100%;
+			display: flex;
+			overflow-y: auto;
+			position: relative;
+			padding-right: 140rpx;
+			
+			.item{
+				width: 120rpx;
+				height: 133rpx;
+				border-radius: 10rpx;
+				border: 1px solid #000000;
+				margin-right: 24rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				font-size: 27rpx;
+				color: #000000;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				justify-content: space-around;
+				flex-shrink: 0;
+				padding: 6rpx 0;
+			}
+			.item.active{
+				background: linear-gradient(-56deg, #9EE4FE, #7FD491);
+				color: #000000;
+				border: none;
+			}
+			.item.disabled{
+				color: #666;
+				border-color: #CCC;
+			}
+			
+			.price{
+				color: #EE3E3B;
+			}
+			
+		}
+		.date-content::-webkit-scrollbar{
+			display: none;
+		}
+	}
+	
+	.calendar-edit{
+	.time-box {
+		display: flex;
+		justify-content: space-between;
+		flex-wrap: wrap;
+		max-height: 340rpx;
+		overflow-y: auto;
+	
+		.time-item {
+			width: 48%;
+			height: 60rpx;
+			border-radius: 10rpx;
+			text-align: center;
+			font-size: 34rpx;
+			margin-bottom: 23rpx;
+			font-family: PingFangSC;
+			font-weight: 400;
+			font-size: 25rpx;
+			border: 1px solid #333333;
+			line-height: 58rpx;
+			color: #000;
+		}
+		.time-active {
+			background: linear-gradient(270deg, #9EE4FE, #7FD491);
+			border: none;
+		}
+		.time-disable {
+			color: #666666;
+			border-color: #CCC;
+		}
+	}
+	.sku-bottom {
+		width: 100%;
+		height: 166rpx;
+		background: #FFFFFF;
+		box-shadow: 0rpx -3rpx 8rpx 0rpx rgba(71,71,71,0.1);
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		box-sizing: border-box;
+		padding: 50rpx 50rpx 85rpx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		font-size: 28rpx;
+		color: #393B3E;
+		position: absolute;
+		bottom: 0;
+		left: 0;
+		right: 0;
+	
+		.bottom-price {
+			font-size: 48rpx;
+			font-weight: 500;
+			color: #EE3E3B;
+		}
+		.bottom-price::before {
+			font-size: 24rpx;
+			content: '￥';
+		}
+	
+		.bottom-btn {
+			width: 250rpx;
+			height: 80rpx;
+			background: #F74A57;
+			border-radius: 40rpx;
+			font-size: 32rpx;
+			text-align: center;
+			font-weight: bold;
+			color: #FFFFFF;
+			line-height: 78rpx;
+		}
+	}
+	}
+	
+	.coupon-btn {
+		color: #999999;;
+		display: flex;
+		align-items: center;
+		.select {
+			display: block;
+			width: 140rpx;
+			height: 58rpx;
+			text-align: right;
+			line-height: 58rpx;
+			font-size: 31rpx;
+			font-family: PingFang SC;
+			font-weight: 400;
+			margin-right: 20rpx;
+	
+		}
+	}
+	
 </style>