diff --git a/pages.json b/pages.json
index ef0a99f..df505d0 100644
--- a/pages.json
+++ b/pages.json
@@ -50,7 +50,7 @@
 			{
 				"path": "ticket/index",
 				"style": {
-					"navigationBarTitleText": "采摘"
+					"navigationBarTitleText": "田园采摘"
 				}
 			},
 			{
@@ -59,6 +59,12 @@
 					"navigationBarTitleText": "详情"
 				}
 			},
+			{
+				"path": "ticket/order",
+				"style": {
+					"navigationBarTitleText": "提交订单"
+				}
+			},
 			
 			
             {
diff --git a/static/js/CommonFunction.js b/static/js/CommonFunction.js
index bd6ce8d..f02e1d5 100644
--- a/static/js/CommonFunction.js
+++ b/static/js/CommonFunction.js
@@ -90,7 +90,8 @@ Vue.prototype.showImg = img => {
 	if (img.indexOf('https://') != -1 || img.indexOf('http://') != -1) {
 		return img;
 	} else {
-		return Vue.prototype.NEWAPIURL + img;
+		// return Vue.prototype.NEWAPIURL + img;
+		return 'https://swsz.api.js-dyyj.com'+img;
 	}
 }
 
diff --git a/subPackages/ticket/detail.vue b/subPackages/ticket/detail.vue
index d6cd77e..4b5b963 100644
--- a/subPackages/ticket/detail.vue
+++ b/subPackages/ticket/detail.vue
@@ -16,6 +16,7 @@
 		</view>
 		
 		<view class="detail-container">
+			<!-- 景点信息 -->
 			<view class="common-container info-container">
 				<view class="flex-between">
 					<view class="info-title text-overflowRows">{{info.title}}</view>
@@ -43,9 +44,8 @@
 					</view>
 				</view>
 			</view>
-			
-
-			<view class="w-full flex" v-if="sku.length>0">
+			<!-- sku -->
+			<view class="w-full flex" style="margin-bottom: 20rpx;" v-if="sku.length>0">
 				<scroll-view class="left-container no-scrollbar" scroll-y scroll-with-animation>
 					<view :class="['type-item',current ==i?'active':'']" 
 						v-for="(item,i) in sku" :key="i" @click="changeType(item,i)">
@@ -53,9 +53,10 @@
 					</view>
 				</scroll-view>
 				
-				<scroll-view class="right-container no-scrollbar" scroll-y scroll-with-animation>
-					<view style="height: 20rpx;"></view>
-					<view class="scenic-list" v-for="(item, index) in sku" :key="index">
+				<scroll-view :scroll-top="scrollHeight" @scroll="skuScroll" @scrolltoupper="scrollSpecial('up')" @scrolltolower="scrollSpecial('low')"
+					class="right-container no-scrollbar" scroll-y scroll-with-animation>
+					<view style="height: 20rpx;" ></view>
+					<view class="scenic-list scenic-query-item" v-for="(item, index) in sku" :key="index">
 						<view class="scenic-title">{{item.title}}</view>
 						<view class="scenic-item " v-for="(itemSku, indexSku) in item.sku" :key="indexSku">
 							<view class="title text-overflow">{{ itemSku.sku_name }}</view>
@@ -83,52 +84,72 @@
 				</scroll-view>
 			
 			</view>
-		
+			<!-- 优待政策 | 景点介绍 -->
 			<view class="common-container" style="padding: 30rpx 20rpx;background: white;">
-				<view class="box-title">景点简介</view>
-				<view class="" id="cpts" v-html="formateRichText(info.feature_content)"></view>
+				<view class="box-title">优待政策<text class="box-title-line"></text>景点介绍</view>
+				<view class="box-content">
+					<view class="sm-box-title" style="padding-top: 0;">优待政策</view>
+					<view class=""  v-html="formateRichText(info.extra_info)"></view>
+					<view class="sm-box-title">景点介绍</view>
+					<view class=""  v-html="formateRichText(info.content)"></view>
+				</view>
 			</view>
-			
-
-			
 		</view>
-		
+		<!-- 底部按钮 -->
+		<view class="btn-box flex-center">
+			<view class="icon-container">
+				<view class="icon-item">
+					<image src="https://static.ticket.sz-trip.com/uploads/20250611/627d67e48ac41903c40c31f1613f2444.png"></image>
+					<text>客服</text>
+				</view>
+			</view>
+			<view class="btn" @click="order">加入购物车</view>
+		</view>
+		<!-- 购物车图标 -->
+		<view class="add-cart-icon">
+			<uni-badge class="uni-badge-left-margin" :text="1" absolute="rightTop" :offset="[-3, -3]" size="small"
+			:custom-style="{background:'#DC2525',color:'#ffffff'}">
+			<image src="https://static.ticket.sz-trip.com/uploads/20250611/f8c2078ad76754a0b0251f9b65784dc2.png"></image>
+			</uni-badge>
+		</view>
+
 		<!-- 预订须知的弹窗 -->
 		<uni-popup ref="popupRule" type="bottom" :safe-area="false">
-			<view class="popup-content-date flex-column flex" >
+			<view class="popup-content-date flex-column flex" v-if="skuInfo">
 				<view class="popup-content-title flex">
 					<view class="flex-1 w-1rpx text-overflow">
-						{{skuInfo.title}}
+						{{skuInfo.sku_name}}
 					</view>
-					<img src="https://static.ticket.sz-trip.com/taizhou/images/cha.png" @click="closePopupRule"
+					<img src="https://static.ticket.sz-trip.com/taizhou/images/cha.png" 
+						@click="closePopupRule"
 						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 class="content flex-1 h-1rpx no-scrollbar" >
+					<view v-if="skuInfo.sku_model" class="detail-content" v-html="formateRichText(skuInfo.sku_model.bookinfo)"></view>
 				</view>
 			</view>
 		</uni-popup>
 		
 		<!-- 预定弹窗 -->
 		<uni-popup ref="popup" type="bottom" :safe-area="false">
-			<view class="popup-content-date" >
+			<view class="popup-content-date" v-if="skuInfo">
 				<view class="popup-content-title flex">
 					<view class="flex-1 w-1rpx text-overflow">
-						{{skuInfo.title}}
+						{{skuInfo.sku_name}}
 					</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  style="position: relative;">
 						<view class="sku-title">使用日期</view>
 						<view class="date-content">
-							<view :class="['item', item.store>0?'':'disabled',seldDateIndex===index?'active':'']" 
+							<view :class="['item', item.stock>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">￥{{showNoPriceNew(item.money)}}</view>
+								<view class="price" v-if="item.stock > 0">￥{{showNoPriceNew(item.price)}}</view>
 								<view v-else>不可定</view>
 							</view>
 						</view>
@@ -138,7 +159,7 @@
 						</view>
 					</view>
 					
-					<view v-if="timesArr.length > 0 && skuInfo.is_time_stock">
+					<view v-if="timesArr.length > 0 && skuInfo.sku_model&& skuInfo.sku_model.is_time_stock">
 						<view class="sku-title">选择场次</view>
 						<view class="time-box">
 							<view v-for="(item,index) in timesArr" :key="index" 
@@ -152,7 +173,7 @@
 				</view>
 				<view class="sku-bottom">
 					<view class="flex" style="align-items: baseline;">
-					    合计：<view class="bottom-price">{{allSeldDate[seldDateIndex].money / 100 || 0}}</view>
+					    合计：<view class="bottom-price">{{allSeldDate[seldDateIndex].price / 100 || 0}}</view>
 					</view>
 					<view class="bottom-btn" @click="addBuyCard">
 							下一步
@@ -177,14 +198,15 @@
 				
 				id: null,
 				info: null,
-				
-				current: 0,
-				
 				sku: [],
+				current: 0, // sku 选中的index
+				scrollHeight: 0, // sku滚动高度
+				skuDoms: [], // 节点Dom 做缓存
+				
 				skuInfo: {}, // 预定门票
 				selectGoods: {}, // 预定的商品
 				minSeldDate: new Date().Format('yyyy-MM-dd'),
-				maxSeldDate: new Date((new Date()).getFullYear(), (new Date()).getMonth() + 3, 0).Format('yyyy-MM-dd'),
+				maxSeldDate: new Date((new Date()).getFullYear(), (new Date()).getMonth() + 1, 0).Format('yyyy-MM-dd'),
 				allSeldDate: [],
 				seldDateIndex: 0,
 				timesArr: [],
@@ -199,6 +221,7 @@
 			
 		},
 		onLoad(options) {
+			this.skuDoms = []
 			this.id = options.id;
 			this.getInfo();
 			// this.getGoodsList()
@@ -212,6 +235,11 @@
 				this.Post({id: this.id},'/api/scene/detail').then(res => {
 					this.info = res.data
 					this.sku = this.info.product || []
+					if (this.info.title) {
+						uni.setNavigationBarTitle({
+							title: this.info.title
+						})
+					}
 				});
 			},
 
@@ -235,10 +263,113 @@
 				});
 			},
 			
-			changeType (item,i) {
+			// ----------滚动联动-------------------
+			changeType (item,index) {
+				let that = this
+				if (Array.isArray(this.skuDoms) && this.skuDoms.length>0) {
+					console.log('进入暂存数据')
+					try {
+						let res = this.skuDoms
+						let target0 = res[0][0]
+						let targetDom = res[0][index]
+						let scrollTop = that.scrollHeight
+						console.log(targetDom)
+						if (target0&&targetDom) {
+							scrollTop = targetDom.top - target0.top  // title高度87
+						}
+						console.log(scrollTop)
+						that.current = index
+						that.scrollHeight = scrollTop
+					} catch(e) {
+						console.log(e)
+					}
+				} else {
+					const query = uni.createSelectorQuery(); //创建节点查询器
+						query.selectAll(".scenic-query-item").boundingClientRect(); //选择toViewid获取位置信息
+						query.exec(function (res) {
+						    try {
+								let target0 = res[0][0]
+								let targetDom = res[0][index]
+								let scrollTop = that.scrollHeight
+								console.log(targetDom)
+							
+								if (target0&&targetDom) {
+									scrollTop = targetDom.top - target0.top  // title高度87
+								}
+								that.current = index
+								that.scrollHeight = scrollTop
+								that.skuDoms = res
+							} catch(e) {
+								console.log(e)
+							}
+						});
+					
+				}
 				
 			},
+			skuScroll (e) {
+				let that = this
+				let domSctollTop = e.detail.scrollTop
+				if (Array.isArray(this.skuDoms) && this.skuDoms.length>0) {
+					console.log('进入暂存数据')
+					try {
+						let res = this.skuDoms
+						let target0 = res[0][0]
+						let topHeightArr = []
+						res[0].forEach(v=>{
+							topHeightArr.push(v.top - target0.top)
+						})
 			
+						// 找到第一个大于domSctollTop的下标再-1  如果返回-1 就是最后一个
+						// 预留50px
+						let findIndex = topHeightArr.findIndex(v=>v-50>=domSctollTop)
+						if (findIndex<0) {
+							findIndex = topHeightArr.length-1
+						} else if(findIndex>=1) {
+							findIndex--
+						}
+						that.current = findIndex
+					} catch(e) {
+						console.log(e)
+					}
+				} else {
+					const query = wx.createSelectorQuery(); //创建节点查询器
+						query.selectAll(".scenic-query-item").boundingClientRect() //选择toViewid获取位置信息
+						query.exec(function (res) {
+							try {
+								let target0 = res[0][0]
+								let topHeightArr = []
+								res[0].forEach(v=>{
+									topHeightArr.push(v.top - target0.top)
+								})
+								// 找到第一个大于domSctollTop的下标再-1  如果返回-1 就是最后一个
+								// 预留50px
+								let findIndex = topHeightArr.findIndex(v=>v-50>=domSctollTop)
+								if (findIndex<0) {
+									findIndex = topHeightArr.length-1
+								} else if(findIndex>=1) {
+									findIndex--
+								}
+								that.current = findIndex
+								that.skuDoms = res
+							} catch(e) {
+								console.log(e)
+							}
+						})
+				}
+			},
+			scrollSpecial (type) {
+				if (type == 'up') {
+					this.current = 0
+				} else {
+					let length = this.sku.length-1
+					length = length>0?length:0
+					this.current = length
+				}
+			},
+			//-----------------------------------------
+			
+			// 预定须知
 			showSkuInfo (itemSku,goods) {
 				this.skuInfo = itemSku
 				this.selectGoods = goods
@@ -246,26 +377,33 @@
 				this.openPopRule()
 			},
 			
-			// 选择列表规格
+			// 预定选择日期分时
 			changeSku(itemSku,goods) {
 				this.skuInfo = itemSku
 				this.selectGoods = goods
-				// 期票类型
-				// if(this.skuInfo.ticket_type == 2) {
-				// 	this.addBuyCard()
-				// }else {
-				// 	this.getDays(itemSku,goods)
-				// }
 				this.getPriceCal(itemSku,goods)
 			},
+			// 获取价格日历列表
+			getPriceCal(itemSku,goods) {
+				this.Post({
+					start_date: this.minSeldDate,
+					end_date: this.maxSeldDate,
+					sku_id: itemSku.id
+				}, '/api/product/product_date_price').then(res => {
+					this.allSeldDate = res.data || []
+					this.seldDateIndex = this.allSeldDate.findIndex(item => item.stock > 0)
+					this.getTimeStock(this.allSeldDate[this.seldDateIndex].date)
+					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=>{
+					startDate: (this.allSeldDate.find(v=>v.stock>0) || {}).date,
+					endDate: (this.allSeldDate[this.allSeldDate.findLastIndex(v=>v.stock>0)]||{}).date,
+					selected: this.allSeldDate.filter(v=>v.stock>0).map(v=>{
 						return {
 							date: v.date,
-							info: '￥'+this.showNoPriceNew(v.money),
+							info: '￥'+this.showNoPriceNew(v.price),
 							notNeedDot:true,
 						}
 					})
@@ -273,25 +411,16 @@
 				this.$refs.calendar.open();
 			},
 			
-			// 获取价格日历列表
-			getPriceCal(itemSku,goods) {
-				this.Post({
-					specifications_id: itemSku.id,
-					goods_id: goods.id,
-					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) {
+				if (!this.skuInfo.sku_model.is_time_stock || this.seldDateIndex<0) {
+					return
+				}
 				this.Post({
-					specifications_id: this.skuInfo.id,
+					sku_id: this.skuInfo.id,
 					date: date,
-				}, '/api/goods/getTimeStock').then(res => {
+				}, '/api/product/product_timestock_price').then(res => {
 					if (Array.isArray(res.data)) {
 						this.timesArr = res.data || []
 						this.seldTimeIndex = -1
@@ -305,7 +434,7 @@
 			
 			// 选择日期
 			clickTab(item, index) {
-				if (item.store>0) {
+				if (item.stock>0) {
 					this.seldDateIndex = index
 					this.getTimeStock(item.date)
 				}
@@ -334,66 +463,23 @@
 					return;
 				}
 				
-				let param = {
-					sInfo: this.skuInfo,
-					pInfo: this.selectGoods,
-					minSeldDate: this.minSeldDate,
-					maxSeldDate: this.maxSeldDate,
-					calendarParam: this.calendarParam,
+				let param = [{
+					sInfo: {...this.skuInfo, buyNum: 1},
+					pInfo: {id:this.selectGoods.id, type:this.selectGoods.type,title:this.selectGoods.title},
 					allSeldDate: this.allSeldDate,
 					seldDateIndex: this.seldDateIndex,
 					timesArr: this.timesArr,
 					seldTimeIndex: this.seldTimeIndex,
-				};
+				}];
+				
+				console.log(param)
+				
 				uni.setStorageSync('ticketOrder', JSON.stringify(param));
-				// that.gotoBuy(pInfo, sInfo);
 				uni.navigateTo({
-					url:'/subPackages/ticketBooking/order',
+					url:'/subPackages/ticket/order',
 				})
 			},
-					
-
-			gotoBuy(pInfo, sInfo) {
-				console.log(pInfo, sInfo);
-				let that = this;
-				if (
-					(pInfo.flag != 1 || sInfo.flag !== "on" || sInfo.stock <= 0) &&
-					sInfo.is_third_stock == 0
-				)
-				return;
-
-						let params = {
-							pInfo: pInfo,
-							sInfo: sInfo,
-							minSeldDate: this.minSeldDate,
-							maxSeldDate: this.maxSeldDate,
-							calendarParam: this.calendarParam,
-							allSeldDate: this.allSeldDate,
-							seldDateIndex: this.seldDateIndex,
-							timesArr: this.timesArr,
-							seldTimeIndex: this.seldTimeIndex,
-						};
-						if (that.detail.allowance) {
-							sInfo.allowance_data = that.detail.allowance;
-							let spread_price = Number(
-								sInfo.allowance_data.discount_limit_price -
-								sInfo.allowance_data.user_used_price
-							);
-							if (spread_price > 0) {
-								if (
-									spread_price <
-									(sInfo.allowance_data.discount_rate / 100) *
-									sInfo.price
-								)
-									sInfo.allowance_price = spread_price;
-								else
-									sInfo.allowance_price =
-									(sInfo.allowance_data.discount_rate / 100) *
-									sInfo.price;
-							}
-						}
-			},
-
+		
 			closePopup() {
 				this.$refs.popup.close()
 			},
@@ -497,7 +583,7 @@
 	.common-container{
 		background: white;
 		border-radius: 20rpx;
-		margin-bottom: 30rpx;
+		margin-bottom: 20rpx;
 		padding: 22rpx 26rpx;
 	}
 	
@@ -568,18 +654,29 @@
 	
 	
 	.box-title {
-		font-weight: normal;
+		font-weight: bold;
 		font-size: 35rpx;
-		color: #6A8A27;
+		padding-bottom: 20rpx;
+		border-bottom: 1px solid #D9D9D9;
+		display: flex;
+		align-items: center;
+		.box-title-line{
+			width: 2rpx;
+			height: 23rpx;
+			background: #000;
+			margin: 0 20rpx;
+		}
 	}
-	
-	.address-icon{
-		margin-right: 9rpx;
-		width: 26rpx;
-		height: 26rpx;
+	.box-content{
+		padding-top: 22rpx;
+		.sm-box-title{
+			font-weight: bold;
+			font-size: 29rpx;
+			color: #000000;
+			padding: 58rpx 0 25rpx;
+		}
 	}
-	
-	
+
 	.scenic-list{
 		padding: 10rpx 10rpx 0;
 		.scenic-title{
@@ -652,11 +749,68 @@
 			}
 		}
 	}
-
-    .bottom {
-		.notice {
+	
+	.btn-box {
+		width: 750rpx;
+		height: 133rpx;
+		background: #FFFFFF;
+		box-shadow: 0rpx 0rpx 16rpx 0rpx rgba(6,0,1,0.1);
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		z-index: 10;
+		padding: 0 46rpx;
+		.icon-container{
 			font-weight: 400;
-			color: #0B898E;
+			font-size: 23rpx;
+			color: #666666;
+			text-align: center;
+			.icon-item{
+				display: flex;
+				align-items: center;
+				flex-direction: column;
+				width: 44rpx;
+				image{
+					width: 44rpx;
+					height: 42rpx;
+					margin-bottom: 8rpx;
+				}
+			}
+		}
+		
+		.btn{
+			width: 200rpx;
+			height: 60rpx;
+			background: #6A8A27;
+			border-radius: 11rpx;
+			font-weight: 500;
+			font-size: 31rpx;
+			color: #FFFFFF;
+			line-height: 60rpx;
+			text-align: center;
+		}
+		
+	}
+	
+	.add-cart-icon{
+		width: 80rpx;
+		height: 80rpx;
+		background: #FFFFFF;
+		box-shadow: 0rpx 0rpx 20rpx 0rpx rgba(0,0,0,0.2);
+		border-radius: 50%;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		position: fixed;
+		bottom: 140rpx;
+		right: 20rpx;
+		z-index: 10;
+		image{
+			width: 43.33rpx;
+			height: 42rpx;
 		}
 	}
 	
@@ -696,11 +850,11 @@
 			height: 133rpx;
 			background: white;
 			border-radius: 10rpx;
-			border: 1px solid #000000;
+			background: #FFFFFF;
 			font-family: PingFang SC;
 			font-weight: 500;
 			font-size: 27rpx;
-			color: #111;
+			color: #6A8A27;
 			display: flex;
 			flex-direction: row;
 			align-items: center;
@@ -723,7 +877,6 @@
 				width: 120rpx;
 				height: 133rpx;
 				border-radius: 10rpx;
-				border: 1px solid #000000;
 				margin-right: 24rpx;
 				font-family: PingFang SC;
 				font-weight: 500;
@@ -735,20 +888,20 @@
 				justify-content: space-around;
 				flex-shrink: 0;
 				padding: 6rpx 0;
+				background: #F5F5F5;
 			}
 			.item.active{
-				background: #515150;
+				background: #6A8A27;
 				color: white;
-				border: 1px solid #12293C;
 				.price{color: white;}
 			}
 			.item.disabled{
-				color: #666;
-				border-color: #CCC;
+				background: #F5F5F5;
+				color: #999999;
 			}
 			
 			.price{
-				color: #C3282E;
+				color: #EE3E3B;
 			}
 			
 		}
@@ -774,20 +927,20 @@
 			font-family: PingFangSC;
 			font-weight: 400;
 			font-size: 25rpx;
-			border: 1px solid #333333;
 			line-height: 58rpx;
 			color: #000;
+			background: #F5F5F5;
 		}
 		.time-active {
-			background: #515150;
+			background: #6A8A27;
 			color: white;
-			border: 1px solid #12293C;
 		}
 		.time-disable {
-			color: #666666;
-			border-color: #CCC;
+			background: #F5F5F5;
+			color: #999999;
 		}
 	}
+	
 	.sku-bottom {
 		width: 100%;
 		height: 166rpx;
@@ -810,7 +963,7 @@
 		.bottom-price {
 			font-size: 48rpx;
 			font-weight: bold;
-			color: #C3282E;
+			color: #D62828;
 		}
 		.bottom-price::before {
 			font-size: 24rpx;
@@ -820,31 +973,21 @@
 		.bottom-btn {
 			width: 250rpx;
 			height: 80rpx;
-			background: #C3282E;
-			border-radius: 40rpx;
+			background: #6A8A27;
+			border-radius: 11rpx;
+			font-weight: bold;
 			font-size: 32rpx;
 			text-align: center;
-			font-weight: bold;
 			color: #FFFFFF;
-			line-height: 78rpx;
-		}
-	}
-	
-	.address-title{
-		display: flex;
-		align-items: flex-start;
-		.address-detail{
-			font-size: 27rpx;
-			color: #666666;
-			padding-right: 40rpx;
+			line-height: 80rpx;
 		}
 	}
 
 	/deep/ .uni-calendar-item--extra{
-		color: #333 !important;
+		color: #EE3E3B !important;
 	}
 	/deep/ .uni-calendar-item--isDay{
-		background: #525251 !important;
+		background: #6A8A27 !important;
 		border-radius: 50%;
 		
 		.uni-calendar-item--extra{
@@ -853,7 +996,7 @@
 	}
 	
 	/deep/ .uni-calendar-item--checked{
-		background: #525251 !important;
+		background: #6A8A27 !important;
 		border-radius: 50%;
 		
 		.uni-calendar-item--extra{
diff --git a/subPackages/ticket/index.vue b/subPackages/ticket/index.vue
index db46ced..2db6f28 100644
--- a/subPackages/ticket/index.vue
+++ b/subPackages/ticket/index.vue
@@ -10,14 +10,15 @@
 				<image class="left-image" :src="showImg(item.headimg||'')" mode="aspectFill"></image>
 				<view class="contentBox flex-column flex-1 w-1rpx">
 					<view class="title text-overflowRows">{{item.title}}</view>
-					<view class="subtitle flex">
-						<view class="text-overflow">{{item.address}}</view>
+					<view class="subtitle text-overflow" v-if="item.display_tags" style="font-size: 24rpx;color: #6A8A27;">
+						{{item.display_tags.split(',').join(" | ")}}
 					</view>
-					<view class="priceBox">
-						<view class="price price-money">
-							{{item.price/100}}
-						</view>
+					<view class="subtitle text-overflowRows">{{item.address}}</view>
+					
+					<view class="price price-money">
+						{{item.price/100}}
 					</view>
+
 				</view>
 			</view>
 		</view>
@@ -102,22 +103,11 @@
 	}
 	.bg{
 		min-height: 100vh;
-		background: #FFFFFF;
+		background: #F9FCF3;
 	}
 	.topImg{
 		width: 100%;
 		height: 440rpx;
-		.icon-back{
-			position: fixed;
-			display: flex;
-			align-items: center;
-			z-index: 50;
-			background: rgba(0,0,0,0.5);
-			border-radius: 50%;
-			width: 60rpx;
-			height: 60rpx;
-			padding-left: 5rpx;
-		}
 	}
 	
 	
@@ -128,54 +118,44 @@
 		
 		.goodItem{
 			width: 100%;
-			height: 226rpx;
-			background: #FFFFFF;
-			box-shadow: 0rpx 0rpx 9rpx 0rpx rgba(153,153,153,0.38);
-			margin-bottom: 26rpx;
+			height: 240rpx;
+			margin-bottom: 30rpx;
 			display: flex;
-			border-radius: 13rpx;
 			.left-image{
-				width: 280rpx;
-				height: 226rpx;
-				border-radius: 13rpx;
+				width: 240rpx;
+				height: 100%;
+				border-radius: 20rpx;
 				flex-shrink: 0;
 			}
 			
 			.contentBox{
-				padding: 20rpx;
+				padding: 10rpx 20rpx 0;
+				height: 100%;
 				justify-content: space-between;
 				
 				.title{
 					width: 100%;
 					font-weight: bold;
 					font-size: 31rpx;
-					color: #000000;
+					color: #333333;
 				}
 				
 				.subtitle{
-					font-weight: 500;
-					font-size: 27rpx;
-					color: #666666;
-					align-items: center;
-					
-					.address-icon{
-						width: 21rpx;
-						height: 25rpx;
-						margin-right: 9rpx;
-					}
+					font-weight: 400;
+					font-size: 23rpx;
+					color: #999999;
 				}
 				
-				.priceBox{
+			
 					.price{
 						font-family: PingFang SC;
 						font-weight: bold;
 						font-size: 33rpx;
-						color: #C3282E;
+						color: #DC2525;
 						text-align: right;
 					}
 					.price-money::before{
 						content: '￥';
-						color: #C3282E;
 						font-size: 24rpx;
 					}
 					.price-money::after{
@@ -184,7 +164,7 @@
 						font-size: 24rpx;
 						font-weight: normal;
 					}
-				}
+				
 			}
 		}
 	}
diff --git a/subPackages/ticket/order.vue b/subPackages/ticket/order.vue
index 8d25512..2e88866 100644
--- a/subPackages/ticket/order.vue
+++ b/subPackages/ticket/order.vue
@@ -1,187 +1,63 @@
 <template>
 	<view class="bg">
-		<view class="top-box1" >
-			<view class="top-left">
-				<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="showDate.startTime">{{ showDate.startTime }}-{{ showDate.endTime }} 入园</view>
+		<view class="order-goods-container" v-for="(item,i) in orderList" :key="i">
+			<view class="top-box1" >
+				<view class="top-left">
+					<view class="title text-overflow">{{ item.pInfo.title }}</view>
+					<view>
+						<view style="padding: 20rpx 0 10rpx;" v-if="item.allSeldDate.length > 0">
+						{{item.showDate.date}} {{ShowDateDay(new Date(item.showDate.date).getDay())}}</view>
+						<view v-if="item.showDate.startTime">{{ item.showDate.startTime }}-{{ item.showDate.endTime }} 入园</view>
+					</view>
 				</view>
+				<view class="top-edit" @click="changeSku(item)">修改 <uni-icons style="height: 20rpx;" color="#6A8A27" type="right" size="12"></uni-icons></view>
 			</view>
-			<view class="top-edit" @click="changeSku">修改 <uni-icons style="height: 20rpx;" color="#999999" type="right" size="12"></uni-icons></view>
-		</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" v-if="skuItem.store>0">
-						<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 class="num-right" style="width: 160rpx;" v-else>
-						<view>无库存</view>
+			<view class="tickets-box">
+				<view class="w-full num-box">
+					<view class="flex-between num-left">
+						<view class="left-title text-overflow">{{item.sInfo.sku_name}}</view>
+						<view class="left-price">{{item.sInfo.price / 100}}</view>
+						<view class="num-right">
+							<view :class="['btn-num',item.sInfo.buyNum<=1?'disabled':'']"   @click="delNumber(item.sInfo)" >-</view>
+							<view class="num-span">{{ item.sInfo.buyNum }}</view>
+							<view class="btn-num"  @click="addNumber(item.sInfo)" >+</view>
+						</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 style="padding: 30rpx 0 20rpx;" class="num-subtitle text-overflow" @click="showpopRule(true, item.sInfo)">
+						<view class="flex" v-if="item.sInfo.display_tags">
+							{{item.sInfo.display_tags.split(',').join(" | ")}}
+						</view>
+						<view style="padding-left:4rpx">| 预订须知 ></view>
 					</view>
-					<view>预订须知 ></view>
-				</view>
-				<!-- <view style="color: #C3282E;" class="num-subtitle text-overflow">购票限制没有绑定字段</view> -->
 				</view>
-			</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" >
-			<view class="people-box-title">
-				<view v-if="!skuBuyMultiple">仅需填写{{pInfo.specifications[0].buyNum}}位出行人</view>
-				<view v-else>出行人信息</view>
-			</view>
-			
+			<view class="people-box-title">出行人信息</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 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.is_real_name&&skuItem.selPeople.some(v=>v.id==item.id))||(!skuItem.is_real_name&&skuItem.selPerson.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 v-if="!judegeAgeLimit(skuItem, item)" class="disabled">信息不符</view>
-							</view>
-							<view class="selected" v-if="(skuItem.is_real_name&&skuItem.selPeople.some(v=>v.id==item.id))||(!skuItem.is_real_name&&skuItem.selPerson.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="showAddressPopUp({},[],true)" v-if="addressList.length>0">
-							<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/20241023/337cf610ce5924c2a65b7a28b6a4891e.png')" alt="" />
-									</view>
-									
-									<view v-if="judegeAgeLimit(skuItem,person)">
-										<view style="padding: 20rpx 0 14rpx;">手机号 {{person.tel}}</view>
-										<view>身份证 {{person.id_number}}</view>
-									</view>
-									<view v-else style="color: #C3282E;padding: 20rpx 0 14rpx;">不符合适用人群年龄限制</view>
-								</view>
-								
-								<img @click.stop="changeAddressAddPopup('open',person)" v-if="!skuBuyMultiple" style="width: 32rpx;height: 32rpx;" 
-								:src="showImg('/uploads/20241023/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="#515150" type="plus" size="30"></uni-icons>
-										<text style="padding:0 30rpx;">出行人{{personIndex+1}}</text>
-										<text >点击填写1位出行人信息</text>
-									</view>
-									<uni-icons  color="#515150" 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',skuItem.selPerson)" v-if="skuBuyMultiple" style="width: 32rpx;height: 32rpx;" :src="showImg('/uploads/20241023/337cf610ce5924c2a65b7a28b6a4891e.png')" alt="" />
-									</view>
-									
-									
-									<view v-if="judegeAgeLimit(skuItem,skuItem.selPerson)">
-										<view style="padding: 20rpx 0 14rpx;">手机号 {{skuItem.selPerson.tel}}</view>
-										<view>身份证 {{skuItem.selPerson.id_number}}</view>
-									</view>
-									<view v-else style="color: #C3282E;padding: 20rpx 0 14rpx;">不符合适用人群年龄限制</view>
-								</view>
-								
-								<img @click.stop="changeAddressAddPopup('open',skuItem.selPerson)" v-if="!skuBuyMultiple" style="width: 32rpx;height: 32rpx;" 
-								:src="showImg('/uploads/20241023/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="#515150" type="plus" size="30"></uni-icons>
-										<text style="padding:0 30rpx;">出行人1</text>
-										<text >点击填写1位出行人信息</text>
-									</view>
-									<uni-icons  color="#515150" type="right" size="16"></uni-icons>
-								</view>
-							</view>
-						</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="people-box-sku">
+					<view class="w-full flex flex-items-center"  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>
+							<input class="input" type="text" placeholder="请输入手机号" v-model="phone" />
+							<uni-icons v-if="phone&&phone.length>0"
+								type="closeempty" size="14" @click="clearTel()"></uni-icons>
 						</view>
 					</view>
-					
-					
 				</view>
 			</view>
-			</view>
 		</view>
 		
 		<!-- 优惠券 -->
 		<view @click="goOrderCoupon" class="tickets-container flex-between top-line">
-		    <view class="order-title">优惠券</view>
-		    <view class="coupon-btn" v-if="coupon==''">
+			<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>
+			<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>
@@ -192,106 +68,61 @@
 			<view class="price-box">
 				<view class="text">合计:</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>
-		<!-- 选择出行人 -->
-		<uni-popup ref="addressPopup" type="bottom" backgroundColor="#F4F4F4" >
-			<view class="people-popup">
-				<view class="top flex-between" style="padding-bottom: 14rpx;">
-					<text class="text-overflow" @click="changeAddressPopup('close')">取消</text>
-					<text style="color: #515150;" class="confirm" @click="changeAddressPopup('close',true)">确定</text>
-				</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 flex-items-center">
-							<img @click.stop="changeAddressAddPopup('open',item)" class="flex-shrink-0" :src="showImg('/uploads/20241023/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>
-					</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: #515150;" 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}}
+						{{skuInfo.sku_name}}
 					</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 class="content flex-1 h-1rpx no-scrollbar" v-if="skuInfo && skuInfo.sku_model">
+					<view class="detail-content" v-html="formateRichText(skuInfo.sku_model.bookinfo)"></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-date calendar-edit" v-if="singleOrder.sInfo && singleOrder.sInfo.id">
 				<view class="popup-content-title flex">
 					<view class="flex-1 w-1rpx text-overflow">
-						{{sInfo.title}}
+						{{singleOrder.sInfo.sku_name}}
 					</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 style="position: 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"
+							<view :class="['item', item.stock>0?'':'disabled',singleOrder.seldDateIndex===index?'active':'']" 
+							v-for="(item,index) in singleOrder.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 class="price" v-if="item.stock > 0">￥{{item.price/100}}</view>
 								<view v-else>不可定</view>
 							</view>
 						</view>
 						<view class="dateMore" @click="openCalendar">
 							<view style="width: 55rpx;">更多日期</view>
+							<view style="padding-left: 9rpx;">></view>
 						</view>
 					</view>
 					
-					<view v-if="timesArr.length > 0 && sInfo.is_time_stock">
+					<view v-if="singleOrder.timesArr.length > 0 && singleOrder.sInfo.sku_model.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}]" 
+							<view v-for="(item,index) in singleOrder.timesArr" :key="index" 
+							:class="['time-item',{'time-disable': item.stock_number < 1, 'time-active': item.stock_number > 0 && index == singleOrder.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 + ')') : '有票'}}
@@ -301,61 +132,44 @@
 				</view>
 				<view class="sku-bottom">
 					<view class="flex" style="align-items: baseline;">
-					    合计：<view class="bottom-price">{{allSeldDate[seldDateIndex].money / 100 || 0}}</view>
+						合计：<view class="bottom-price">{{singleOrder.allSeldDate[singleOrder.seldDateIndex].price / 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"/>
+			: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},
+		components: {},
 		data() {
 			return {
-				pInfo: {specifications: []}, // 当前商品
-				sInfo: {sku_model: {}}, // 当前门票
+				// 下单产品
+				orderList: [],
+				phone: '',
 				
-				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'),
+				maxSeldDate: new Date((new Date()).getFullYear(), (new Date()).getMonth() + 1, 0).Format('yyyy-MM-dd'),
 				calendarParam: {
 					stratDate:'',endDate: '', selected: []
 				},
-				allSeldDate: [],
-				seldDateIndex: 0,
-				timesArr: [],
-				seldTimeIndex: 0,
-				
-				buyNum: 0,
-				
-				addressList: [], // 出行人列表
-				currentPerson: {}, // 列表当前要设置的出行人 用地址引用直接修改
-				currentPersonIds: [], // 当前门票的所有出行人
-				addressSelect: {}, // 出行人弹窗选择的人
-				
-				showMore: false,
-				skuBuyMultiple: false,
 				coupon:'',
 				
-				skuInfo: {}, // 当前点击的sku
-				addressTitle: '添加出行人',
-				setDefault: false
+				singleOrderForChange: {}, // 浅拷贝
+				singleOrder: {}, // 深拷贝修改的数据
+				
+				skuInfo: {}, // 预定须知当前点击的sku
 			}
 		},
 		onLoad(options) {
@@ -367,9 +181,7 @@
 		onShow() {
 			this.coupon = this.$store.state.user.coupon
 		},
-		
-		onUnload () {
-		},
+
 		methods: {
 			goOrderCoupon () {
 				let allPrice = 0
@@ -398,380 +210,55 @@
 				}
 			},
 			
-			// 获取sku价格日历money
-			async initPriceCal(skuId) {
-				let res = await this.Post({
-					specifications_id: skuId,
-					date: this.showDate.date,
-					start_time:this.showDate.startTime||'',
-					end_time:this.showDate.endTime||''
-				}, '/api/goods/getSpecificationsPriceCalendarAndTime')
-				if (res.code == 1) {
-					return {code:1,...res.data}
-				}
-				return {code:2}
-			},
-			
-			async initPageData () {
-				this.setDefault = false
-				this.showMore = false
-				this.skuBuyMultiple = false
+			initPageData () {
 				let data = uni.getStorageSync('ticketOrder');
 				try{
 					data = JSON.parse(data)
-					// selPeople 一证多票 selPerson 一证一票
-					data.pInfo.specifications.forEach(v=>{
-						let age_limit = null
-						try {
-							age_limit = JSON.parse(v.age_restriction)
-						} catch (e) {
-							age_limit = null
+					data.forEach(v=>{
+						v.allSeldDate = v.allSeldDate || [];
+						v.seldDateIndex = v.seldDateIndex>=0?v.seldDateIndex:-1
+						v.timesArr = v.timesArr || []
+						v.seldTimeIndex = v.seldTimeIndex>=0?v.seldTimeIndex:-1
+						v.showDate = {
+							date: ((v.allSeldDate[v.seldDateIndex])||{}).date,
+							startTime: (v.timesArr[v.seldTimeIndex]||{}).start_time,
+							endTime: (v.timesArr[v.seldTimeIndex]||{}).end_time
 						}
-						v.age_limit = age_limit
-						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);
-					
-			
-					// 过滤出时间格式一致的sku
-					let is_time_stock = data.sInfo.is_time_stock
-					let is_price_calendar = data.sInfo.is_price_calendar
-					data.pInfo.specifications = data.pInfo.specifications.filter(v=>v.is_time_stock==is_time_stock && v.is_price_calendar==is_price_calendar)
-					
-					
-					this.minSeldDate=data.minSeldDate
-					this.maxSeldDate = data.maxSeldDate
-					this.calendarParam = data.calendarParam
-					this.allSeldDate = data.allSeldDate || []
-					this.seldDateIndex = data.seldDateIndex
-					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
-					}
-					
-					
-					for(let sku of data.pInfo.specifications) {
-						let res = await this.initPriceCal(sku.id)
-						if (res.code === 1) {
-							sku.price = res.money
-							sku.store = res.store
-						}
-					}
-					
-					this.pInfo = data.pInfo
-					this.sInfo = data.sInfo
-					
-					
+					this.orderList = data
+					console.log(this.orderList)
 					
 				} catch(e){
 					console.log(e)
 				}
-				
-				this.getAddressList()
-				this.getMaxCouponData()
-			},
-			
-			
-			/*---------------出行人------------------------------*/
-			// 判断出行人年龄限制
-			judegeAgeLimit (ticket, person) {
-				console.log(ticket,person)
-				let age_limit = ticket.age_limit
-				let personAge = person.age
-				let result = true
-				if (!age_limit) {
-					return true
-				} else {
-					if (age_limit.start&& result) {
-						result = personAge>=age_limit.start
-					}
-					if (age_limit.end&&result) {
-						result = personAge<=age_limit.end
-					}
-				}
-				return result
+				// this.getMaxCouponData()
 			},
-			
-			// 选择出行人
-			showAddressPopUp (person,personList, isMore) {
-				
-				if (isMore) {
-					let currentSku = this.pInfo.specifications[0]
-					if (currentSku.is_real_name) {
-						let personIndex = currentSku.selPeople.findIndex(v=>!v.id)
-			
-						if (personIndex<0) {personIndex = 0}
-						person = currentSku.selPeople[personIndex]
-						personList = currentSku.selPeople
-					} else {
-						person = currentSku.selPerson
-						personList = [currentSku.selPerson]
-					}
-				}
 
-				this.currentPerson = person
-				this.currentPersonIds = []
-				personList.forEach(v=>{
-					if (v.id) {
-						this.currentPersonIds.push(v.id)
-					}
-				})
-				
-				if (person.id) {
-					this.addressSelect = person
-				} 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 ) {
-						// 找符合条件的
-						let currentData = this.pInfo.specifications[0]
-						let person0 = currentData.selPeople[0]
-						let person = currentData.selPerson
-						let currentPerson = {}
-						if (!currentData.is_card) {
-							person.tel = JSON.parse(uni.getStorageSync('userInfo')).mobile
-						} else if(this.addressList.length>0) {
-							
-							if (this.addressList.some(v=>v.is_default=='1')) {
-								currentPerson = this.addressList.find(v=>v.is_default=='1')
-							} else {
-								currentPerson = this.addressList[0]
-							}
-							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
-					}
-				})
-			},
-			// 出行人弹窗
-			changeAddressPopup(type, confirm) {
-				if (confirm) {
-					// 赋值
-					this.currentPerson.id = this.addressSelect.id
-					this.currentPerson.name = this.addressSelect.name
-					this.currentPerson.id_number = this.addressSelect.id_number
-					this.currentPerson.tel = this.addressSelect.tel
-					this.currentPerson.user_id = this.addressSelect.user_id
-					this.currentPerson.age = this.addressSelect.age
-					
-				}
-				
-				if (type == 'open') this.$refs.addressPopup.open('bottom');
-				else this.$refs.addressPopup.close();
-				this.$forceUpdate();
-			},
-			// 选中出行人
-			seldThisAddress(item){
-				if (this.addressSelect.id == item.id) {
-					this.addressSelect = {}
-				} else {
-					if (this.currentPersonIds.includes(item.id)&&item.id!=this.currentPerson.id) {
-						return
-					} else {
-						this.addressSelect = item
-					}
-				}
-			},
-			
-			// 表单上选择点击出行人
-			personClick (person, sku) {
-	
-				// 一证一票
-				if (sku.is_real_name) {
-					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
-							}
-						}
-					}
-				} else {
-					if(sku.selPerson.id == person.id) {
-						sku.selPerson.id = null
-						sku.selPerson.id_number = null
-						sku.selPerson.name = null
-						sku.selPerson.user_id = null
-						sku.selPerson.tel = null
-						sku.selPerson.age = null
-					} else {
-						sku.selPerson.id = person.id
-						sku.selPerson.id_number = person.id_number
-						sku.selPerson.name = person.name
-						sku.selPerson.user_id = person.user_id
-						sku.selPerson.tel = person.tel
-						sku.selPerson.age = person.age
-					}
-				}
-					
-			},
-			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')
-				}
-			},
-			
-			/*---------------------------出行人结束-----------------------------------*/
+			clearTel () {this.phone = ''},
 			
 			// 减少数量
 			delNumber(skuItem) {
-				if (skuItem.buyNum <= 0) {
+				if (skuItem.buyNum <= 1) {
 					return
 				}
-				if (skuItem.id == this.sInfo.id && skuItem.buyNum<=1) {
-					return
-				}
-
 				skuItem.buyNum -= 1
-				skuItem.selPeople.pop()
 				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) {
 				skuItem.buyNum += 1
-				// if(this.max_num && this.buyNum > this.max_num){
-				// 	this.buyNum = this.max_num
-				// 	this.$toast("本产品单笔限购"+this.max_num+"份")
-				// }
-				if (Array.isArray(skuItem.selPeople)) {
-					skuItem.selPeople.push({
-						id:null,id_number:null,name:null,
-						tel:null,user_id:null,age:null,
-					})
-				} else {
-					skuItem.selPeople = [{
-						id:null,id_number:null,name:null,
-						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.orderList.forEach(v=>{
+					allPrice+= v.sInfo.price*v.sInfo.buyNum
 				})
 				this.allprice = allPrice
 				if (this.coupon) {
@@ -791,10 +278,7 @@
 				return price < 0 ? 0 : (price/100).toFixed(2)
 			},
 			
-			// 判断是否买多个sku
-			calBuyMultiple () {
-				this.skuBuyMultiple = this.pInfo.specifications.slice(1).some(v=>v.buyNum>0)
-			},
+	
 			
 			// 预定须知
 			showpopRule(flag, item) {
@@ -810,60 +294,62 @@
 			
 			/*---------------------------价格日历-----------------------------------*/
 			// 选择列表规格
-			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();
+			changeSku(item) {
+				this.singleOrderForChange = item
+				this.singleOrder = JSON.parse(JSON.stringify(item)) 
+				// 重新获取分时
+				this.getPriceCal()
 			},
 			// 获取价格日历列表
-			getPriceCal(skuId, goodsId) {
+			getPriceCal() {
 				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)
+					start_date: this.minSeldDate,
+					end_date: this.maxSeldDate,
+					sku_id: this.singleOrder.sInfo.id
+				}, '/api/product/product_date_price').then(res => {
+					this.singleOrder.allSeldDate = res.data || []
+					if (this.singleOrder.seldDateIndex<0) {
+						this.singleOrder.seldDateIndex = this.singleOrder.allSeldDate.findIndex(item => item.stock > 0)
+					}
+					this.getTimeStock(this.singleOrder.allSeldDate[this.singleOrder.seldDateIndex].date)
 					this.openPop()
 				})
 			},
 			// 获取规格分时库存
 			getTimeStock(date) {
+				if (!this.singleOrder.sInfo.sku_model.is_time_stock || this.singleOrder.seldDateIndex<0) {
+					return
+				}
 				this.Post({
-					specifications_id: this.sInfo.id,
+					sku_id: this.singleOrder.sInfo.id,
 					date: date,
-				}, '/api/goods/getTimeStock').then(res => {
-					if (Array.isArray(res.data)) {
-						this.timesArr = res.data || []
-						this.seldTimeIndex = -1
+				}, '/api/product/product_timestock_price').then(res => {
+					this.singleOrder.timesArr = res.data || []
+					if (this.singleOrder.seldTimeIndex<0) {
+						this.singleOrder.seldTimeIndex = this.singleOrder.timesArr.findIndex(item => item.stock_number > 0)
 					}
-					if (res.data.length > 0) {
-						this.seldTimeIndex = this.timesArr.findIndex(item => item.stock_number > 0)
-					}
-					// if (res.data.length > 0) {
-					// 	this.timesArr = res.data || []
-					// 	this.seldTimeIndex = this.timesArr.findIndex(item => item.stock_number > 0)
-					// }
 				})
 			},
+			
+			openCalendar () {
+				this.calendarParam = {
+					startDate: (this.singleOrder.allSeldDate.find(v=>v.stock>0) || {}).date,
+					endDate: (this.singleOrder.allSeldDate[this.singleOrder.allSeldDate.findLastIndex(v=>v.stock>0)]||{}).date,
+					selected: this.singleOrder.allSeldDate.filter(v=>v.stock>0).map(v=>{
+						return {
+							date: v.date,
+							info: '￥'+v.price/100,
+							notNeedDot:true,
+						}
+					})
+				}
+				this.$refs.calendar.open();
+			},
+
 			// 选择日期
 			clickTab(item, index) {
-				if (item.store>0) {
-					this.seldDateIndex = index
+				if (item.stock>0) {
+					this.singleOrder.seldDateIndex = index
 					this.getTimeStock(item.date)
 				}
 				
@@ -871,13 +357,13 @@
 			// 选择时段
 			changeTime(item, index) {
 				if(item.stock_number > 0) {
-					this.seldTimeIndex = index
+					this.singleOrder.seldTimeIndex = index
 				}
 			},
 			confirmCalendar (val) {
-				let index = this.allSeldDate.findIndex(v=>v.date == val.fulldate)
+				let index = this.singleOrder.allSeldDate.findIndex(v=>v.date == val.fulldate)
 				if (index>=0) {
-					this.clickTab(this.allSeldDate[index],index)
+					this.clickTab(this.singleOrder.allSeldDate[index],index)
 				}
 			},
 			closePopup() {
@@ -888,153 +374,55 @@
 			},
 			addBuyCard () {
 				// 如果是分时，未选择分时
-				if(this.sInfo.is_time_stock && this.seldTimeIndex < 0) {
+				if(this.singleOrder.sInfo.is_time_stock && this.singleOrder.seldTimeIndex < 0) {
 					uni.showToast({title:'请选择分时',icon:'none'})
 					return;
 				}
-				this.showDate = {
-					date: ((this.allSeldDate[this.seldDateIndex])||{}).date,
-					startTime: (this.timesArr[this.seldTimeIndex]||{}).start_time,
-					endTime: (this.timesArr[this.seldTimeIndex]||{}).end_time
+				this.singleOrder.showDate = {
+					date: ((this.singleOrder.allSeldDate[this.singleOrder.seldDateIndex])||{}).date,
+					startTime: (this.singleOrder.timesArr[this.singleOrder.seldTimeIndex]||{}).start_time,
+					endTime: (this.singleOrder.timesArr[this.singleOrder.seldTimeIndex]||{}).end_time
 				}
+				// 修改原本的数据
+				this.singleOrderForChange.allSeldDate = this.singleOrder.allSeldDate
+				this.singleOrderForChange.timesArr = this.singleOrder.timesArr
+				this.singleOrderForChange.seldDateIndex = this.singleOrder.seldDateIndex
+				this.singleOrderForChange.seldTimeIndex = this.singleOrder.seldTimeIndex
+				this.singleOrderForChange.showDate = this.singleOrder.showDate
 				this.closePopup()
-				
-				//todo 请求接口重新获取 将页面数据全部重置
-				this.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)
-				})
-				
-				this.pInfo.specifications[0].buyNum = 1
-				
-				let date = this.allSeldDate[this.seldDateIndex].date
-				
-				for(let sku of this.pInfo.specifications) {
-					sku.selPeople = [
-						{
-							id:null,id_number:null,name:null,
-							tel:null,user_id:null,age:null,
-						},
-					]
-					sku.selPerson = {
-						id:null,id_number:null,name:null,tel:null,user_id:null,age:null,
-					}
-					let res = this.initPriceCal(sku.id)
-					if (res.code === 1) {
-						sku.price = res.money
-						sku.store = res.store
-					}
-				}
+
 			},
 			/*---------------------------价格日历-----------------------------------*/
 			order() {
-				let use_date = this.allSeldDate[this.seldDateIndex].date
-				let start_time =(this.timesArr[this.seldTimeIndex]||{}).start_time
-				let end_time = (this.timesArr[this.seldTimeIndex]||{}).end_time
 				let goods = []
-				
-				
 				// 设置参数
 				let canSubmit = true
-				this.pInfo.specifications.filter(v=>v.buyNum>0).forEach(sku=>{
-					if (!sku.is_card) {
-						if (!this.IsTel(sku.selPerson.tel)) {
-							uni.showToast({
-								title:'请输入正确的手机号',
-								icon:'none'
-							})
-							canSubmit = false
-						}
-						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||'',
-							reserve_mobile: sku.selPerson.tel,
-						}
-						goods.push(param)
-						
-					} else {
-						if (sku.is_real_name) {
-							if (sku.selPeople.some(v=>!v.id)) {
-								uni.showToast({
-									title:'请选择出行人',
-									icon:'none'
-								})
-								canSubmit = false
-							}
-							for(let v of sku.selPeople) {
-								let judegRes = this.judegeAgeLimit(sku, v)
-								if (!judegRes) {
-									uni.showToast({
-										title:'出行人年龄信息不符合使用限制',
-										icon:'none'
-									})
-									canSubmit = false
-									break;
-								}
-							}
-							
-							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'
-								})
-								canSubmit = false
-							}
-			
-							let judegRes = this.judegeAgeLimit(sku, sku.selPerson)
-							if (!judegRes) {
-								uni.showToast({
-									title:'出行人年龄信息不符合使用限制',
-									icon:'none'
-								})
-								canSubmit = false
-							}
-			
-							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)
-						}
+				this.orderList.filter(v=>v.sInfo.buyNum>0).forEach(item=>{
+					let sku = item.sInfo
+					let use_date = item.allSeldDate[item.seldDateIndex].date
+					let start_time =(item.timesArr[item.seldTimeIndex]||{}).start_time
+					let end_time = (item.timesArr[item.seldTimeIndex]||{}).end_time
+					let param = {
+						specifications_id: sku.id,
+						num: sku.buyNum,
+						date: use_date,
+						start_time: start_time||'',
+						end_time: end_time||'',
+						reserve_mobile: this.phone,
 					}
-
+					goods.push(param)
 				})
-				console.log(goods)
-				if (!canSubmit) {
-					return
-				}
+				
 			
 				let data = {
 					goods: goods,
 					coupon: this.coupon ? this.coupon.id : "",
-					// reserve_name: this.reserve_name,
-					// reserve_phone: this.reserve_phone
-					// remark: this.remark
 				}
 				console.log('data数据',data);
 				this.Post({
 					method: 'POST',
 					data: JSON.stringify(data)
-				}, '/api/order/place').then(res => {
+				}, '/api/order/create').then(res => {
 					if (res.code == 1) {
 						uni.removeStorageSync('ticketOrder')
 						console.log(res.data.order_id);
@@ -1110,7 +498,7 @@
 			font-family: PingFang SC;
 			font-weight: bold;
 			font-size: 27rpx;
-			color: #999999;
+			color: #6A8A27;
 		}
 	}
 
@@ -1125,7 +513,6 @@
 	    justify-content: space-between;
 		flex-direction: column;
 		padding: 40rpx 20rpx;
-		border-bottom: 1px solid #CCCCCC;
 	
 	    .num-left {
 	        width: 100%;
@@ -1142,7 +529,7 @@
 	        .left-price {
 	            font-weight: bold;
 	            font-size: 36rpx;
-	            color: #C3282E;
+	            color: #D62828;
 				padding-right: 27rpx;
 	        }
 	        .left-price::before {
@@ -1159,7 +546,7 @@
 			font-family: PingFang SC;
 			font-weight: 500;
 			font-size: 23rpx;
-			color: #666666;
+			color: #6A8A27;
 		}
 	    .num-right {
 			display: flex;
@@ -1177,7 +564,7 @@
 	            width: 46rpx;
 	            height: 46rpx;
 	            line-height: 40rpx;
-	            background: #515150;
+	            background: #6A8A27;
 	            border-radius: 50%;
 	            font-weight: 500;
 	            font-size: 45rpx;
@@ -1186,7 +573,8 @@
 	        }
 			.btn-num.disabled{
 				color: #999999;
-				background: #E8E8E8;
+				background: white;
+				border: 1px solid #999;
 			}
 	    }
 	}
@@ -1558,8 +946,8 @@
 	.btn {
 		width: 250rpx;
 		height: 80rpx;
-		background: #C3282E;
-		border-radius: 43rpx;
+		background: #6A8A27;
+		border-radius: 11rpx;
 		text-align: center;
 		line-height: 80rpx;
 
@@ -1629,145 +1017,144 @@
 		}
 		
 		.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;
+				background: white;
 				border-radius: 10rpx;
-				border: 1px solid #000000;
-				margin-right: 24rpx;
+				background: #FFFFFF;
 				font-family: PingFang SC;
 				font-weight: 500;
 				font-size: 27rpx;
-				color: #000000;
+				color: #6A8A27;
 				display: flex;
-				flex-direction: column;
+				flex-direction: row;
 				align-items: center;
-				justify-content: space-around;
+				justify-content: center;
 				flex-shrink: 0;
 				padding: 6rpx 0;
-			}
-			.item.active{
-				background: #515150;
-				color: white;
-				border: none;
-				.price{color: white;}
-			}
-			.item.disabled{
-				color: #666;
-				border-color: #CCC;
+				position: absolute;
+				bottom: 0;
+				right: 0;
 			}
 			
-			.price{
-				color: #C3282E;
+			.date-content{
+				width: 100%;
+				display: flex;
+				overflow-y: auto;
+				position: relative;
+				padding-right: 140rpx;
+				
+				.item{
+					width: 120rpx;
+					height: 133rpx;
+					border-radius: 10rpx;
+					margin-right: 24rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					font-size: 27rpx;
+					color: #000;
+					display: flex;
+					flex-direction: column;
+					align-items: center;
+					justify-content: space-around;
+					flex-shrink: 0;
+					padding: 6rpx 0;
+					background: #F5F5F5;
+				}
+				.item.active{
+					background: #6A8A27;
+					color: white;
+					.price{color: white;}
+				}
+				.item.disabled{
+					background: #F5F5F5;
+					color: #999999;
+				}
+				
+				.price{
+					color: #EE3E3B;
+				}
+				
+			}
+			.date-content::-webkit-scrollbar{
+				display: none;
 			}
-			
-		}
-		.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: #515150;
-			color: white;
-			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: bold;
-			color: #C3282E;
-		}
-		.bottom-price::before {
-			font-size: 24rpx;
-			content: '￥';
+		.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;
+				line-height: 58rpx;
+				color: #000;
+				background: #F5F5F5;
+			}
+			.time-active {
+				background: #6A8A27;
+				color: white;
+			}
+			.time-disable {
+				background: #F5F5F5;
+				color: #999999;
+			}
 		}
-	
-		.bottom-btn {
-			width: 250rpx;
-			height: 80rpx;
-			background: #C3282E;
-			border-radius: 40rpx;
-			font-size: 32rpx;
-			text-align: center;
-			font-weight: bold;
-			color: #FFFFFF;
-			line-height: 78rpx;
+
+		.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: bold;
+				color: #D62828;
+			}
+			.bottom-price::before {
+				font-size: 24rpx;
+				content: '￥';
+			}
+		
+			.bottom-btn {
+				width: 250rpx;
+				height: 80rpx;
+				background: #6A8A27;
+				border-radius: 11rpx;
+				font-size: 32rpx;
+				text-align: center;
+				font-weight: bold;
+				color: #FFFFFF;
+				line-height: 80rpx;
+			}
 		}
 	}
-	}
 	
 	.coupon-btn {
 		color: #999999;;
@@ -1777,7 +1164,7 @@
 			display: block;
 			width: 153rpx;
 			height: 40rpx;
-			background: #C3282E;
+			background: #6A8A27;
 			border-radius: 9rpx;
 			font-weight: 500;
 			font-size: 24rpx;
@@ -1791,10 +1178,10 @@
 	}
 	
 	/deep/ .uni-calendar-item--extra{
-		color: #333 !important;
+		color: #EE3E3B !important;
 	}
 	/deep/ .uni-calendar-item--isDay{
-		background: #525251 !important;
+		background: #6A8A27 !important;
 		border-radius: 50%;
 		
 		.uni-calendar-item--extra{
@@ -1803,7 +1190,7 @@
 	}
 	
 	/deep/ .uni-calendar-item--checked{
-		background: #525251 !important;
+		background: #6A8A27 !important;
 		border-radius: 50%;
 		
 		.uni-calendar-item--extra{
diff --git a/uni_modules/uni-calendar/changelog.md b/uni_modules/uni-calendar/changelog.md
index 0160b69..a728bb8 100644
--- a/uni_modules/uni-calendar/changelog.md
+++ b/uni_modules/uni-calendar/changelog.md
@@ -1,20 +1,28 @@
+## 1.4.11（2024-01-10）
+- 修复 回到今天时，月份显示不一致问题
+## 1.4.10（2023-04-10）
+- 修复 某些情况 monthSwitch 未触发的Bug
+## 1.4.9（2023-02-02）
+- 修复 某些情况切换月份错误的Bug
+## 1.4.8（2023-01-30）
+- 修复 某些情况切换月份错误的Bug [详情](https://ask.dcloud.net.cn/question/161964)
 ## 1.4.7（2022-09-16）
-- 可以使用 uni-scss 控制主题色
+- 优化 支持使用 uni-scss 控制主题色
 ## 1.4.6（2022-09-08）
-- fix: 表头年月切换，导致改变当前日期为选择月1号，且未触发change事件
+- 修复 表头年月切换，导致改变当前日期为选择月1号，且未触发change事件的Bug
 ## 1.4.5（2022-02-25）
-- 修复 条件编译 nvue 不支持的 css 样式
+- 修复 条件编译 nvue 不支持的 css 样式的Bug
 ## 1.4.4（2022-02-25）
-- 修复 条件编译 nvue 不支持的 css 样式
+- 修复 条件编译 nvue 不支持的 css 样式的Bug
 ## 1.4.3（2021-09-22）
-- 修复 startDate、 endDate 属性失效的 bug
+- 修复 startDate、 endDate 属性失效的Bug
 ## 1.4.2（2021-08-24）
 - 新增 支持国际化
 ## 1.4.1（2021-08-05）
-- 修复 弹出层被 tabbar 遮盖 bug
+- 修复 弹出层被 tabbar 遮盖的Bug
 ## 1.4.0（2021-07-30）
 - 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
 ## 1.3.16（2021-05-12）
 - 新增 组件示例地址
 ## 1.3.15（2021-02-04）
-- 调整为uni_modules目录规范 
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-calendar/components/uni-calendar/uni-calendar-item.vue b/uni_modules/uni-calendar/components/uni-calendar/uni-calendar-item.vue
index 369710e..ce7c534 100644
--- a/uni_modules/uni-calendar/components/uni-calendar/uni-calendar-item.vue
+++ b/uni_modules/uni-calendar/components/uni-calendar/uni-calendar-item.vue
@@ -9,7 +9,7 @@
 		}"
 	 @click="choiceDate(weeks)">
 		<view class="uni-calendar-item__weeks-box-item">
-			<text v-if="selected&&weeks.extraInfo" class="uni-calendar-item__weeks-box-circle"></text>
+			<text v-if="selected&&weeks.extraInfo&&!weeks.extraInfo.notNeedDot" class="uni-calendar-item__weeks-box-circle"></text>
 			<text class="uni-calendar-item__weeks-box-text" :class="{
 				'uni-calendar-item--isDay-text': weeks.isDay,
 				'uni-calendar-item--isDay':calendar.fullDate === weeks.fullDate && weeks.isDay,
@@ -51,11 +51,10 @@
 </template>
 
 <script>
-	import {
-	initVueI18n
-	} from '@dcloudio/uni-i18n'
-	import messages from './i18n/index.js'
-	const {	t	} = initVueI18n(messages)
+	import { initVueI18n } from '@dcloudio/uni-i18n'
+	import i18nMessages from './i18n/index.js'
+	const {	t	} = initVueI18n(i18nMessages)
+
 	export default {
 		emits:['change'],
 		props: {
@@ -152,7 +151,8 @@
 	}
 
 	.uni-calendar-item--isDay-text {
-		color: $uni-primary;
+		// color: $uni-primary;
+		color: #C3282E;
 	}
 
 	.uni-calendar-item--isDay {
diff --git a/uni_modules/uni-calendar/components/uni-calendar/uni-calendar.vue b/uni_modules/uni-calendar/components/uni-calendar/uni-calendar.vue
index 9cd0e69..0beebfb 100644
--- a/uni_modules/uni-calendar/components/uni-calendar/uni-calendar.vue
+++ b/uni_modules/uni-calendar/components/uni-calendar/uni-calendar.vue
@@ -20,7 +20,7 @@
 				<view class="uni-calendar__header-btn-box" @click.stop="next">
 					<view class="uni-calendar__header-btn uni-calendar--right"></view>
 				</view>
-				<text class="uni-calendar__backtoday" @click="backtoday">{{todayText}}</text>
+				<text class="uni-calendar__backtoday" @click="backToday">{{todayText}}</text>
 
 			</view>
 			<view class="uni-calendar__box">
@@ -62,12 +62,12 @@
 
 <script>
 	import Calendar from './util.js';
-	import calendarItem from './uni-calendar-item.vue'
-	import {
-	initVueI18n
-	} from '@dcloudio/uni-i18n'
-	import messages from './i18n/index.js'
-	const {	t	} = initVueI18n(messages)
+	import CalendarItem from './uni-calendar-item.vue'
+
+	import { initVueI18n } from '@dcloudio/uni-i18n'
+	import i18nMessages from './i18n/index.js'
+	const {	t	} = initVueI18n(i18nMessages)
+
 	/**
 	 * Calendar 日历
 	 * @description 日历组件可以查看日期，选择任意范围内的日期，打点操作。常用场景如：酒店日期预订、火车机票选择购买日期、上下班打卡等
@@ -90,7 +90,7 @@
 	 */
 	export default {
 		components: {
-			calendarItem
+			CalendarItem
 		},
 		emits:['close','confirm','change','monthSwitch'],
 		props: {
@@ -199,26 +199,26 @@
 			}
 		},
 		created() {
-			// 获取日历方法实例
 			this.cale = new Calendar({
-				// date: new Date(),
 				selected: this.selected,
 				startDate: this.startDate,
 				endDate: this.endDate,
 				range: this.range,
 			})
-			// 选中某一天
-			// this.cale.setDate(this.date)
 			this.init(this.date)
-			// this.setDay
 		},
 		methods: {
 			// 取消穿透
 			clean() {},
 			bindDateChange(e) {
 				const value = e.detail.value + '-1'
-				console.log(this.cale.getDate(value));
 				this.setDate(value)
+
+				const { year,month } = this.cale.getDate(value)
+        this.$emit('monthSwitch', {
+            year,
+            month
+        })
 			},
 			/**
 			 * 初始化日期显示
@@ -323,11 +323,17 @@
 			/**
 			 * 回到今天
 			 */
-			backtoday() {
-				console.log(this.cale.getDate(new Date()).fullDate);
-				let date = this.cale.getDate(new Date()).fullDate
-				// this.cale.setDate(date)
-				this.init(date)
+			backToday() {
+				const nowYearMonth = `${this.nowDate.year}-${this.nowDate.month}`
+				const date = this.cale.getDate(new Date())
+        const todayYearMonth = `${date.year}-${date.month}`
+
+				this.init(date.fullDate)
+
+        if(nowYearMonth !== todayYearMonth) {
+          this.monthSwitch()
+        }
+
 				this.change()
 			},
 			/**
@@ -446,7 +452,6 @@
 
 	.uni-calendar--fixed-width {
 		width: 50px;
-		// padding: 0 15px;
 	}
 
 	.uni-calendar__backtoday {
diff --git a/uni_modules/uni-calendar/components/uni-calendar/util.js b/uni_modules/uni-calendar/components/uni-calendar/util.js
index 2d6100b..5ec8a92 100644
--- a/uni_modules/uni-calendar/components/uni-calendar/util.js
+++ b/uni_modules/uni-calendar/components/uni-calendar/util.js
@@ -76,10 +76,20 @@ class Calendar {
 				dd.setDate(dd.getDate() + AddDayCount) // 获取AddDayCount天后的日期
 				break
 			case 'month':
-				if (dd.getDate() === 31) {
+				if (dd.getDate() === 31 && AddDayCount>0) {
 					dd.setDate(dd.getDate() + AddDayCount)
 				} else {
-					dd.setMonth(dd.getMonth() + AddDayCount) // 获取AddDayCount天后的日期
+					const preMonth = dd.getMonth()
+					dd.setMonth(preMonth + AddDayCount) // 获取AddDayCount天后的日期
+					const nextMonth = dd.getMonth()
+					// 处理 pre 切换月份目标月份为2月没有当前日(30 31) 切换错误问题
+					if(AddDayCount<0 && preMonth!==0 && nextMonth-preMonth>AddDayCount){
+						dd.setMonth(nextMonth+(nextMonth-preMonth+AddDayCount))
+					}
+					// 处理 next 切换月份目标月份为2月没有当前日(30 31) 切换错误问题
+					if(AddDayCount>0 && nextMonth-preMonth>AddDayCount){
+						dd.setMonth(nextMonth-(nextMonth-preMonth-AddDayCount))
+					}
 				}
 				break
 			case 'year':
diff --git a/uni_modules/uni-calendar/package.json b/uni_modules/uni-calendar/package.json
index c59180c..bceaed3 100644
--- a/uni_modules/uni-calendar/package.json
+++ b/uni_modules/uni-calendar/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-calendar",
   "displayName": "uni-calendar 日历",
-  "version": "1.4.7",
+  "version": "1.4.11",
   "description": "日历组件",
   "keywords": [
     "uni-ui",
diff --git a/uni_modules/uni-calendar/readme.md b/uni_modules/uni-calendar/readme.md
index 4f3ca0e..4e1748c 100644
--- a/uni_modules/uni-calendar/readme.md
+++ b/uni_modules/uni-calendar/readme.md
@@ -77,7 +77,7 @@ export default {
 ### Calendar Props
 
 |  属性名	|    类型	| 默认值| 说明																													|
-| 		| 																													|
+| -	| -	| - | - |
 | date		| String	|-		| 自定义当前时间，默认为今天																							|
 | lunar		| Boolean	| false	| 显示农历																												|
 | startDate	| String	|-		| 日期选择范围-开始日期																									|
@@ -91,7 +91,7 @@ export default {
 ### Calendar Events
 
 |  事件名		| 说明								|返回值|
-| 								|		| 									|
+| -	|	-	| -	|
 | open	| 弹出日历组件，`insert :false` 时生效|- 	|
 
 
@@ -100,4 +100,4 @@ export default {
 
 ## 组件示例
 
-点击查看：[https://hellouniapp.dcloud.net.cn/pages/extUI/calendar/calendar](https://hellouniapp.dcloud.net.cn/pages/extUI/calendar/calendar)
\ No newline at end of file
+点击查看：[https://hellouniapp.dcloud.net.cn/pages/extUI/calendar/calendar](https://hellouniapp.dcloud.net.cn/pages/extUI/calendar/calendar)