Merge branch 'master' of http://gitlab.oytour.com/zk123/jz_travel

7a8d3734 · 罗超 · f2b1a864 · d67153af · 7a8d3734 · 7a8d3734
Commit 7a8d3734 authored Jun 02, 2021 by 罗超
21 changed files
--- a/pages/guidecar/bookaCarList.vue
+++ b/pages/guidecar/bookaCarList.vue
@@ -372,7 +372,7 @@
 									</view>
 									<view class="s-c-r prices">
 										<span style='margin-top: 3px;font-size: 11px;'>￥</span>
-										<span style='font-weight: bold;'>{{isdistributor==true? x.Price:x.B2CPrice}}</span>
+										<span style='font-weight: bold;'>{{$utils.getretailer()==true? x.Price:x.B2CPrice}}</span>
 										<span style='margin-top: 3px;font-size: 11px;'>起</span>
 									</view>
 								</view>
@@ -404,7 +404,7 @@
 										</view>
 										<view class="s-c-r prices" v-if="index==0">
 											<span style='margin-top: 3px;font-size: 11px;'>￥</span>
-											<span style='font-weight: bold;'>{{isdistributor==true? x.Price:x.B2CPrice}}</span>
+											<span style='font-weight: bold;'>{{$utils.getretailer()==true? x.Price:x.B2CPrice}}</span>
 											<span style='margin-top: 3px;font-size: 11px;'>起</span>
 										</view>
 										<view class="s-c-r sold" v-if="index==x.SiteList.length-1">
@@ -501,25 +501,30 @@
 		</u-popup>
 		
 		
-		                
+		<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth= 'gbAuth'></auth>
 	</view>
 </template>

 <script>
+	import auth from "@/components/auth/index.vue";
 	import Calendar from './components/Calendar.vue'
 	
 	export default {
 		components: {
 			Calendar,
+			auth
 			
 		},
 		data(options) {
 			return {
+				showAuth:false,
 				screenshow: false,
 				startDate: '',
 				pageTitle: "去订车",
 				showcalendar: false,
 				mainColor: '',
+				
+				u:{},
 				msg: {
 					pageIndex: 1,
 					pageSize: 20,
@@ -560,7 +565,7 @@
 					StartDate:'',
 					EndDate:'',
 				},
-				isdistributor:false,
+				
 			}
 			
 			
@@ -576,7 +581,6 @@
 				this.msg.ArriveCityType = this.carMsg.ArriveCityType;
 				this.msg.Q_Date = this.carMsg.Q_Date;
 			}
-			this.isdistributor = this.$utils.getretailer()
 			
 			this.mainColor = this.$uiConfig.mainColor;
 			this.gettimeList()
@@ -588,11 +592,21 @@

 		},
 		methods: {
-			yuding(x){
-				uni.navigateTo({
-					url: '/pages/guidecar/specialCarReserve?Id='+x.Id +'&Date='+this.msg.Q_Date
-					
-				})
+			yuding(x){
+				this.u = uni.getStorageSync("mall_UserInfo");
+				if (!this.u) {
+				  this.u = {
+					nickName: "未登录",
+					avatarUrl: ""
+				  };
+				  this.showAuth = true;
+				}	else{
+					uni.navigateTo({
+						url: '/pages/guidecar/specialCarReserve?Id='+x.Id +'&Date='+this.msg.Q_Date
+						
+					})
+				}
+				
 			},
 			popupchange(e) { //tab事件
 				this.popupcurrent = e;
@@ -832,6 +846,16 @@
 				}
 				
 			},
+			reloadUserinfo() {
+			  this.u = uni.getStorageSync("mall_UserInfo");
+			  // this.showAuth=false;
+			  this.init();
+			
+			},
+			//关闭登录窗口
+			gbAuth(){
+				this.showAuth = false;
+			},

 		}
 	}

--- a/pages/guidecar/guidecarList.vue
+++ b/pages/guidecar/guidecarList.vue
@@ -26,7 +26,7 @@
 			</view>
 			<view class="g_Second" style="position: relative;background: #fff;width: 100%;">
 				<view style=" border-bottom: 1px solid rgba(0, 0, 0, 0.03);">
-					<u-tabs :list="list" :is-scroll="false" :current="current" @change="change" bar-height='4' active-color="#FF8585"></u-tabs>
+					<u-tabs :list="list" :is-scroll="false" :show-bar="false" duration="0" font-size="28" :activeFontSize="34" :bold="true" :current="current" @change="change" bar-height='4' active-color="#FF8585"></u-tabs>
 				</view>
 				<view v-if="screenshow==true" class="tanchu">
 					<scroll-view :scroll-y="true" :enable-back-to-top="true" style="max-height: 321px;">

--- a/pages/guidecar/map.vue
+++ b/pages/guidecar/map.vue
@@ -64,9 +64,16 @@
 				})
 				this.markers = [];
 				if(this.details.type == 1){
+					
+					// this.src_latitude = ((Number((this.upcar[0].Lonlat.split(',')[1]))  +  Number(this.upcar[this.upcar.length-1].Lonlat.split(',')[1]) )/2).toString();
+					// this.src_longitude = ((Number((this.upcar[0].Lonlat.split(',')[0]))  +  Number(this.upcar[this.upcar.length-1].Lonlat.split(',')[0]) )/2).toString();;
 					this.src_latitude = this.upcar[0].Lonlat.split(',')[1];
 					this.src_longitude = this.upcar[0].Lonlat.split(',')[0];
 					this.upcar.map(x=>{
+						if(this.details.SelectID == x.Id){
+							this.src_latitude = x.Lonlat.split(',')[1];
+							this.src_longitude = x.Lonlat.split(',')[0];
+						}
 						let obj = {
 							id: x.Id,
 							iconPath: 'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/dcdtbiaoji.png',  
@@ -82,6 +89,10 @@
 					this.src_latitude = this.downcar[0].Lonlat.split(',')[1];
 					this.src_longitude = this.downcar[0].Lonlat.split(',')[0];
 					this.downcar.map(x=>{
+						if(this.details.SelectID == x.Id){
+							this.src_latitude = x.Lonlat.split(',')[1];
+							this.src_longitude = x.Lonlat.split(',')[0];
+						}
 						let obj = {
 							id: x.Id,
 							iconPath: 'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/dcdtbiaoji.png',  
@@ -124,6 +135,7 @@
 		background: #FFF;
 		border-radius: 10px 10px 0px 0px;
 		padding: 10px 15px;
+		overflow-y: auto;
 	}
 	.liststyle-item{
 		padding: 5px 0;

--- a/pages/guidecar/pickcarcity2.vue
+++ b/pages/guidecar/pickcarcity2.vue
@@ -58,10 +58,11 @@
 				searchList:[],//搜索出来的
 				searchKey: "",
 				show:false,
-				indexList: [{ti:"A"}, {ti:"B"}, {ti:"C"}, {ti:"D"}, {ti:"E"}, {ti:"F"}, {ti:"G"},{ ti:"H"}, {ti:"I"}, {ti:"J"}, {ti:"K"}, {ti:"L"},
-				 {ti:"M"}, {ti:"N"}, {ti:"O"}, {ti:"P"},{ ti:"Q"}, {ti:"R"}, {ti:"S"}, {ti:"T"}, {ti:"U"},
-									{ti:"V"}, {ti:"W"}, {ti:"X"}, {ti:"Y"}, {ti:"Z"}
-								],
+				indexList:[],
+				// indexList: [{ti:"A"}, {ti:"B"}, {ti:"C"}, {ti:"D"}, {ti:"E"}, {ti:"F"}, {ti:"G"},{ ti:"H"}, {ti:"I"}, {ti:"J"}, {ti:"K"}, {ti:"L"},
+				//  {ti:"M"}, {ti:"N"}, {ti:"O"}, {ti:"P"},{ ti:"Q"}, {ti:"R"}, {ti:"S"}, {ti:"T"}, {ti:"U"},
+				// 					{ti:"V"}, {ti:"W"}, {ti:"X"}, {ti:"Y"}, {ti:"Z"}
+				// 				],
 				dztype:1,
 				ArriveMsg:{
 					StartCityId:0,

--- a/pages/guidecar/specialCarReserve.vue
+++ b/pages/guidecar/specialCarReserve.vue
@@ -375,20 +375,28 @@
 				uni.showLoading({
 					title: '下单中...'
 				})
-				this.request2({
-						url: '/api/AppletCar/SetAppletCarOrderInfo',
-						data: this.addMsg
-					},
-					res => {
-						uni.hideLoading()
-						if (res.resultCode == 1) {
-							this.queren(res.data)
-						}
-					},
-					err => {
-						uni.hideLoading()
+				let that= this
+				uni.requestSubscribeMessage({
+					tmplIds: that.details.template_message_list,
+					complete(_res) {
+						console.log(_res)
+						that.request2({
+								url: '/api/AppletCar/SetAppletCarOrderInfo',
+								data: that.addMsg
+							},
+							res => {
+								uni.hideLoading()
+								if (res.resultCode == 1) {
+									that.queren(res.data)
+								}
+							},
+							err => {
+								uni.hideLoading()
+							}
+						);
 					}
-				);
+				});
+				
 			},
 			queren(OrderId){
 				let url='/api/WeChatPay/GetDmcPayInfo'
@@ -425,12 +433,22 @@
 						uni.showToast({
 							title: "支付成功"
 						})
+						setTimeout(()=>{
+							uni.redirectTo({
+							    url: '/pages/jiuzhai/allorderList'
+							});
+						}, 100 )
 					},
 					fail: function(err) {
 						console.log('fail:', err);
 						uni.showToast({
 							title: "支付失败"
 						})
+						setTimeout(()=>{
+							uni.redirectTo({
+							    url: '/pages/jiuzhai/allorderList'
+							});
+						}, 100 )
 					}
 				});
 			},
@@ -447,7 +465,7 @@
 						if (res.resultCode == 1) {
 							this.details = res.data
 							this.addMsg.DepartureTime  = this.details.StartDate;
-							this.addMsg.Unit_Price  = this.details.Price;
+							this.addMsg.Unit_Price  = (this.$utils.getretailer()==true ? this.details.Price :this.details.B2CPrice) ;
 							
 							this.upcar = [];
 							this.downcar = []

--- a/pages/hotel/description.vue
+++ b/pages/hotel/description.vue
@@ -4,7 +4,7 @@
 			<u-tabs :is-scroll="false" name="Name" :list="navs" active-color="#DFBE6E" :current="active" @change="changeHandler"
 			 :show-bar="true" :activeFontSize="32" inactive-color="#111111" :bold="true" height="100" duration="0" font-size="28"></u-tabs>
 		</view>
-		<scroll-view scroll-y="true" class="hotel-descr" @scroll="scroll">
+		<scroll-view scroll-y="true" class="hotel-descr" @scroll="scroll" :scroll-top="scrollTop">
 			<view class="content">
 				<view class="flex">
 					<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1622085515000_731.png" mode="widthFix"
@@ -141,7 +141,7 @@
 				this.scrollTop = posi;
 				this.$nextTick(function() {
 					this.scrollTop = posi;
-				});
+				});				
 			},
 			changeActive() {
 				let t = 0

--- a/pages/hotel/detail.vue
+++ b/pages/hotel/detail.vue
@@ -32,7 +32,6 @@
 						</view>
 						<view class="mi-right">
 							<view style="font-size: 40rpx;font-weight: 600;text-align: right;margin-bottom: 6rpx;" class="king">{{dataList.StarName}}</view>
-							<view style="font-weight: 500;color:#dfbe6e99;text-align: right;" class="f12">658人下单入住</view>
 							<!-- <view class="flex">
 								<text style="color:white;margin-right: 14rpx;" class="f12">星级</text>
 								<u-rate active-color="#DFBE6E" inactive-color="#f1f1f1" current="4" active-icon="star" inactive-icon="star" disabled></u-rate>
@@ -75,7 +74,7 @@
 						<view class="sb-left">
 							<view class="sb-item" v-for="(subItem,sIndex) in dataList.PublicFacilities">{{subItem}}</view>
 						</view>
-						<view class="sb-right">
+						<view class="sb-right" @click="openDescription">
 							<text style="margin-right: 20rpx;">设施/详情</text>
 							<u-icon name="arrow" size="20" />
 						</view>
@@ -833,8 +832,11 @@
 	.hotel-detail .hotel-content .hotel-base .shebei .sb-left {
 		width: 1px;
 		flex: 1;
-		display: flex;
+		/* display: flex; */
 		align-items: center;
+		display: -webkit-box;
+		overflow: auto;
+		margin-right:20rpx;
 	}

 	.hotel-detail .hotel-content .hotel-base .shebei .sb-left .sb-item {

--- a/pages/jiuzhai/allorderList.vue
+++ b/pages/jiuzhai/allorderList.vue
@@ -254,6 +254,7 @@
 			}
 		},
 		onLoad(options){
+			this.current = options.status || 0;
 			let currentPages = getCurrentPages();
 			let u = "/" + currentPages[currentPages.length - 1].route;
 			let pages = wx.getStorageSync("basedata") ?
@@ -454,7 +455,6 @@
 			},
 			queren(data,index){
 				this.payindex = index
-				console.log(data,222,index)
 				let url='/api/WeChatPay/GetDmcPayInfo'
 				let GoodsName = ''
 				if(data.OrderType==1){

--- a/pages/jiuzhai/jz_Line.vue
+++ b/pages/jiuzhai/jz_Line.vue
@@ -71,10 +71,10 @@

 	.jz_ListMain {
 		padding-bottom: 10px;
-		margin:0 30rpx;
+		margin: 0 30rpx;
 		border-bottom: 1px solid #f1f1f1;
 		margin-bottom: 10px;
-		
+
 	}

 	.jz_TuDivBotm img {
@@ -167,18 +167,19 @@
 		display: flex;
 		align-items: center;
 	}
+
 	.jz_Content .team-box {
 		display: flex;
 		align-items: stretch;
 		justify-content: space-between;
 		flex-wrap: wrap;
 	}
-	
+
 	.jz_Content .team-box:after {
 		content: "";
 		flex: auto;
 	}
-	
+
 	.jz_Content .team-box .team {
 		width: calc(50% - 30rpx);
 		background: #ECF1F4;
@@ -186,18 +187,20 @@
 		font-size: 26rpx;
 		color: #999999;
 		text-align: center;
-		padding:20rpx;
-		margin-top:30rpx;
+		padding: 20rpx;
+		margin-top: 30rpx;
 		margin-right: 30rpx;
 		display: flex;
 		justify-content: center;
 		align-items: center;
 	}
+
 	.jz_Content .team-box .team.active {
 		background: #111111;
 		color: #FFFFFF;
 	}
-	.jz_Content .team-box .team .team-content{
+
+	.jz_Content .team-box .team .team-content {
 		text-overflow: -o-ellipsis-lastline;
 		overflow: hidden;
 		text-overflow: ellipsis;
@@ -205,41 +208,48 @@
 		-webkit-line-clamp: 2;
 		-webkit-box-orient: vertical;
 	}
-	.jz_Content .start-range-box{
+
+	.jz_Content .start-range-box {
 		background: #ECF1F4;
 		border-radius: 10rpx;
-		margin-top:30rpx;
+		margin-top: 30rpx;
 		display: flex;
 		align-items: center;
-		padding:20rpx;
+		padding: 20rpx;
 	}
-	.jz_Content .start-range-box .date-box{
-		flex:1;
+
+	.jz_Content .start-range-box .date-box {
+		flex: 1;
 		font-weight: 400;
 	}
-	.jz_Content .start-range-box .split-box{
+
+	.jz_Content .start-range-box .split-box {
 		color: #bbb;
 		font-size: 24rpx;
-		margin:0 20rpx
+		margin: 0 20rpx
 	}
-	.jz_Content .start-range-box .date-box.right view{
+
+	.jz_Content .start-range-box .date-box.right view {
 		text-align: right;
 	}
-	.jz_Content .start-range-box .date-box .label{
-		color:#bbb;
+
+	.jz_Content .start-range-box .date-box .label {
+		color: #bbb;
 		font-size: 24rpx;
 	}
-	.jz_Content .start-range-box .date-box .chosen-date{
-		color:#111;
+
+	.jz_Content .start-range-box .date-box .chosen-date {
+		color: #111;
 		font-size: 28rpx;
 		font-weight: 600;
 	}
-	.jz_Content  .start-city {
+
+	.jz_Content .start-city {
 		display: inline-block;
 		position: relative;
 	}
-	
-	.jz_Content  .start-city text {
+
+	.jz_Content .start-city text {
 		position: relative;
 		z-index: 2;
 		font-size: 30rpx;
@@ -247,8 +257,8 @@
 		font-weight: 500;
 		color: #111;
 	}
-	
-	.jz_Content  .start-city::after {
+
+	.jz_Content .start-city::after {
 		background-color: #DFBE6E;
 		height: 6px;
 		bottom: 2px;
@@ -259,6 +269,7 @@
 		display: block;
 		content: ' ';
 	}
+
 	.jz_Content .price {
 		margin-top: 10rpx;
 		font-weight: 500;
@@ -266,7 +277,7 @@
 		font-size: 20rpx;
 		text-align: right;
 	}
-	
+
 	.jz_Content .price .money {
 		font-size: 36rpx;
 	}
@@ -274,22 +285,19 @@
 <template>
 	<div class="jz_Line">
 		<view class="jz_Content">
-			<!-- <u-search placeholder="目的地,旅游线路" shape="round" v-model="searchKey" input-align="left" :value="searchKey" text-color="#111"
-			 :show-action="false"></u-search> -->
 			<view class="search-box">
 				<view class="date" @click="showBranch=true">
 					<u-icon name="location" color="#111" size="24"></u-icon>
 					<text style="margin-left: 20rpx;">{{currentBrachName}}</text>
 				</view>
 				<view style="width: 1px; flex: 1;">
-					<u-search placeholder="目的地名称" v-model="searchKey" input-align="left" :value="searchKey"
-						text-color="#111" bg-color="rgba(0,0,0,0)" :show-action="false"></u-search>
+					<u-search placeholder="目的地名称" v-model="msg.searchKey" input-align="left" :value="msg.searchKey" text-color="#111"
+					 bg-color="rgba(0,0,0,0)" :show-action="false"></u-search>
 				</view>
 			</view>
 			<view>
 				<u-dropdown ref="uDropdown" @open="open" @close="close" active-color="#000" inactive-color="#444">
-					<u-dropdown-item v-model="msg.orderBy" :title="optionsTitle[0]" :options="orderBys"
-						@change="changeOrderBy">
+					<u-dropdown-item v-model="msg.orderBy" :title="optionsTitle[0]" :options="orderBys" @change="changeOrderBy">
 					</u-dropdown-item>
 					<u-dropdown-item :title="optionsTitle[1]">
 						<view class="slot-content" style="padding: 30rpx;padding-top:0;background-color: #FFF;">
@@ -299,13 +307,13 @@
 										<text style="font-size: 28rpx;color:#111;font-weight: 800;margin-right: 10rpx;">{{x.DestinationName}}</text>
 									</view>
 									<view class="team-box">
-										<view v-for="(y,yi) in x.Teams" :key="i" class="team" :class="{'active':msg.team.indexOf(y.TeamId)!=-1}" @click="setTeams(i,yi)">
+										<view v-for="(y,yi) in x.Teams" :key="i" class="team" :class="{'active':msg.team.indexOf(y.TeamId)!=-1}"
+										 @click="setTeams(i,yi)">
 											<view class="team-content">{{y.TeamName}}</view>
 										</view>
 									</view>
 								</template>
 							</scroll-view>
-							
 							<view style="box-shadow: 0px -10px 30px 0px rgba(36, 36, 36, 0.06);margin-top:40rpx;display: flex;">
 								<view style="flex:1;margin-right: 30rpx;">
 									<u-button :custom-style="btnStyle" @click="clearTeams">清除</u-button>
@@ -322,8 +330,9 @@
 								<view style="padding-top:30rpx">
 									<text style="font-size: 28rpx;color:#111;font-weight: 800;margin-right: 10rpx;">行程天数</text>
 								</view>
-								<view class="team-box" >
-									<view v-for="x in days" class="team" style="width:calc(25% - 30rpx);" :class="{'active':msg.days.indexOf(x.day)!=-1}" @click="setDays(x.day)">{{x.name}}</view>
+								<view class="team-box">
+									<view v-for="x in days" class="team" style="width:calc(25% - 30rpx);" :class="{'active':msg.days.indexOf(x.day)!=-1}"
+									 @click="setDays(x.day)">{{x.name}}</view>
 								</view>
 								<view style="padding-top:30rpx">
 									<text style="font-size: 28rpx;color:#111;font-weight: 800;margin-right: 10rpx;">出发日期</text>
@@ -342,7 +351,7 @@
 									</view>
 								</view>
 							</scroll-view>
-							
+
 							<view style="box-shadow: 0px -10px 30px 0px rgba(36, 36, 36, 0.06);margin-top:40rpx;display: flex;">
 								<view style="flex:1;margin-right: 30rpx;">
 									<u-button :custom-style="btnStyle" @click="clearDayAndDate">清除</u-button>
@@ -353,27 +362,16 @@
 							</view>
 						</view>
 					</u-dropdown-item>
-					<u-dropdown-item v-model="msg.startCity" :title="optionsTitle[3]" :options="startCitys"
-						@change="changeStartCity" >
+					<u-dropdown-item v-model="msg.startCityId" :title="optionsTitle[3]" :options="startCitys" @change="changeStartCity">
 					</u-dropdown-item>
-					<!-- <u-dropdown-item v-model="searchObj.enclosure" :title="optionsTitle[1]" :options="options2" @change="change2"></u-dropdown-item> -->
 				</u-dropdown>
 			</view>
-
-			<!-- <view class="jz_Sort">
-				<view class="jz_SortItem">价格</view>
-				<view class="jz_SortItem">团期</view>
-				<view class="jz_SortItem" @click="screenshow=true">线路</view>
-				<view class="jz_SortItem" @click="isShowDate=true">日期</view>
-			</view> -->
 			<view v-if="screenshow==true" class="Jz_Mask" @click="screenshow=false"></view>
 			<u-empty v-if="dataList.length==0" text="暂无数据" mode="data"></u-empty>
 			<template v-else>
 				<view style="height: calc(100vh - 120px);overflow: hidden;">
-					<scroll-view :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" @scrolltolower="lower"
-						:style="{ height: '100%' }">
-						<view class="jz_ListMain" v-for="(item,index) in dataList" :key="index"
-							@click="goJzDetail(item.tcid,item.configId)">
+					<scroll-view :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" @scrolltolower="lower" :style="{ height: '100%' }">
+						<view class="jz_ListMain" v-for="(item,index) in dataList" :key="index" @click="goJzDetail(item.tcid,item.configId)">
 							<view class="jz_List">
 								<view class="jz_TuDiv">
 									<img class="jz_TuBigImg" mode="aspectFill" :src="getImgs(item.imgCover)" alt="" />
@@ -384,13 +382,8 @@
 										{{item.productRecommend}}
 									</view>
 									<view style="margin:10px 0;display: flex;align-items: center;">
-										<!-- <img class="jz_calederImg"
-											src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/canlder.png" />{{item.startDate}}
-										<text class="jz_Canhoubu">
-											{{item.isSubstitution==0?'不可候补':'可以候补'}}
-										</text> -->
 										<view class="start-city">
-											<text>成都出发</text>
+											<text>{{item.startCityName}}出发</text>
 										</view>
 										<view style="margin-left: 20rpx;">
 											<u-tag mode="plain" border-color="#DFBE6E" color="#DFBE6E" :text="`${item.dayNum}天`" size="mini"></u-tag>
@@ -412,7 +405,8 @@
 		<u-popup v-model="showTimePopup" mode="bottom" border-radius="20" length="90%" :safe-area-inset-bottom="true">
 			<canlendar @finish="chosenDateResult"></canlendar>
 		</u-popup>
-		<u-picker mode="selector" v-model="showBranch" :default-selector="[0]" :range="branchList" @confirm='changeBranch' range-key="BName"></u-picker>
+		<u-picker mode="selector" v-model="showBranch" :default-selector="[0]" :range="branchList" @confirm='changeBranch'
+		 range-key="BName"></u-picker>
 	</div>
 </template>
 <script>
@@ -424,17 +418,19 @@
 		data() {
 			return {
 				pageTitle: '线路',
-				showTimePopup:false,
+				showTimePopup: false,
 				msg: {
 					pageIndex: 1,
 					pageSize: 15,
 					orderBy: "",
-					team:[],
-					days:['<100'],
-					startDate:'',
-					endDate:'',
-					startCity:-1,
-					branchId:0
+					team: [],
+					days: ['<100'],
+					startDate: '',
+					endDate: '',
+					startCityId: -1,
+					companyId: 0,
+					searchKey: '', //搜索数据
+					priceOrderByField:2
 				},
 				time: '',
 				params: {
@@ -445,188 +441,73 @@
 					minute: false,
 					second: false
 				},
-				btnStyle:{
+				btnStyle: {
 					borderRadius: '16rpx',
 					color: '#111',
 					fontSize: '30rpx',
 					width: '100%',
-					border:"1px solid #111",
-					background:"#FFF"
+					border: "1px solid #111",
+					background: "#FFF"
 				},
-				btnStyle2:{
+				btnStyle2: {
 					borderRadius: '16rpx',
 					color: '#fff',
 					fontSize: '30rpx',
 					width: '100%',
-					background:"#111"
+					background: "#111"
 				},
 				dataList: [], //数据
-				searchKey: '', //搜索数据
+
 				value1: 1,
 				isShowDate: false,
-				orderBys: [{
-						label: '推荐排序',
-						value: 1,
-					},
-					{
-						label: '好评优先',
-						value: 2,
-					},
-					{
-						label: '低价优先',
-						value: 3,
+				orderBys: [],
+				lineList: [],
+				days: [{
+						name: "不限",
+						day: '<100'
 					},
 					{
-						label: '高价优先',
-						value: 4,
-					}
-				],
-				lineList: [{
-						DestinationName: '四川',
-						DestinationId: 1,
-						Teams:[
-							{
-								TeamName:"星空九寨",
-								TeamId:1
-							},
-							{
-								TeamName:"锦绣九寨",
-								TeamId:2
-							},
-							{
-								TeamName:"亲子系列：亲亲宝贝熊猫体验夏令营",
-								TeamId:3
-							},
-							{
-								TeamName:"礼佛峨眉·乐山大佛",
-								TeamId:4
-							}
-						]
+						name: "2日以下",
+						day: '<=2'
 					},
 					{
-						DestinationName: '新疆',
-						DestinationId: 2,
-						Teams:[
-							{
-								TeamName:"印象新疆漫游西域假期",
-								TeamId:11
-							},
-							{
-								TeamName:"花间集~“杏”好遇见你",
-								TeamId:21
-							}
-						]
+						name: "3日",
+						day: '=3'
 					},
 					{
-						DestinationName: '内蒙古',
-						DestinationId: 2,
-						Teams:[
-							{
-								TeamName:"印象内蒙古草原风情",
-								TeamId:12
-							},
-							{
-								TeamName:"邂逅·内蒙",
-								TeamId:22
-							},
-							{
-								TeamName:"诗画·内蒙",
-								TeamId:32
-							},
-							{
-								TeamName:"辽阔•内蒙",
-								TeamId:42
-							},
-							{
-								TeamName:"私享内蒙",
-								TeamId:52
-							},
-							{
-								TeamName:"绝美金秋·额济纳旗",
-								TeamId:62
-							}
-						]
-					}
-				],
-				days:[
-					{
-						name:"不限",
-						day:'<100'
+						name: "4日",
+						day: '=4'
 					},
 					{
-						name:"2日以下",
-						day:'<=2'
+						name: "5日",
+						day: '=5'
 					},
 					{
-						name:"3日",
-						day:'=3'
+						name: "6日",
+						day: '=6'
 					},
 					{
-						name:"4日",
-						day:'=4'
+						name: "7日",
+						day: '=7'
 					},
 					{
-						name:"5日",
-						day:'=5'
-					},
-					{
-						name:"6日",
-						day:'=6'
-					},
-					{
-						name:"7日",
-						day:'=7'
-					},
-					{
-						name:"8日以上",
-						day:'>=8'
+						name: "8日以上",
+						day: '>=8'
 					}
-					
+
 				],
 				loadText: {
 					loadmore: "轻轻上拉，加载更多",
 					loading: "努力加载中",
 					nomore: "没有更多了",
 				},
-				startCitys:[
-					{
-						label:'不限',
-						value:-1
-					},
-					{
-						label:'成都',
-						value:0
-					},
-					{
-						label:'绵阳',
-						value:1
-					},
-					{
-						label:'德阳',
-						value:2
-					}
-				],
+				startCitys: [],
 				screenshow: false,
 				status: "加载中",
 				page_count: 0,
-				branchList:[{
-					BName:'成都站',
-					BId:0
-				},
-				{
-					BName:'武汉站',
-					BId:1
-				},
-				{
-					BName:'西安站',
-					BId:2
-				},
-				{
-					BName:'昆明站',
-					BId:3
-				}],
-				currentBrachName:"",
-				showBranch:false,
+				branchList: [],
+				currentBrachName: "",
+				showBranch: false,
 				optionsTitle: [
 					"推荐排序",
 					"线路玩法",
@@ -636,100 +517,117 @@
 			};
 		},
 		created() {
-			this.getList();
+			this.getLineQuery();
+			this.research();
 			uni.setNavigationBarTitle({
-				title:"精品旅游线路"
+				title: "精品旅游线路"
 			})
-			this.msg.branchId=this.branchList[0].BId
-			this.currentBrachName=this.branchList[0].BName
 		},
 		methods: {
-			changeBranch(val){
-				this.msg.branchId=this.branchList[val].BId
-				this.currentBrachName=this.branchList[val].BName
+			//获取查询条件
+			getLineQuery() {
+				this.apipost(
+					"b2b_get_GetMiniAppTravelQuery", {},
+					res => {
+						if (res.resultCode == 1) {
+							this.orderBys = res.data.OrderByList;
+							this.branchList = res.data.SiteList;
+							this.startCitys = res.data.CityList;
+							this.lineList = res.data.linePlaceList;
+							this.msg.companyId = this.branchList[0].BId
+							this.currentBrachName = this.branchList[0].BName
+						}
+					},
+					null
+				);
 			},
-			setDays(day){
-				if(day=='<100'){
-					this.msg.days=['<100']
-				}else{
-					if(this.msg.days.indexOf('<100')!=-1){
-						this.msg.days.splice(this.msg.days.indexOf('<100'),1)
+			changeBranch(val) {
+				this.msg.companyId = this.branchList[val].BId
+				this.currentBrachName = this.branchList[val].BName
+			},
+			setDays(day) {
+				if (day == '<100') {
+					this.msg.days = ['<100']
+				} else {
+					if (this.msg.days.indexOf('<100') != -1) {
+						this.msg.days.splice(this.msg.days.indexOf('<100'), 1)
 					}
-					let temp=this.msg.days.indexOf(day)
-					if(temp==-1){
+					let temp = this.msg.days.indexOf(day)
+					if (temp == -1) {
 						this.msg.days.push(day)
-					}else{
-						this.msg.days.splice(temp,1)
+					} else {
+						this.msg.days.splice(temp, 1)
 					}
 				}
 			},
-			clearDayAndDate(){
-				this.msg.days=['<100']
-				this.optionsTitle[2]='天数日期'
-				this.msg.startDate=''
-				this.msg.endDate=''
+			clearDayAndDate() {
+				this.msg.days = ['<100']
+				this.optionsTitle[2] = '天数日期'
+				this.msg.startDate = ''
+				this.msg.endDate = ''
 				this.$forceUpdate()
 				this.$refs.uDropdown.close();
 			},
-			changeDayAndDate(){
-				let temp=''
-				if(this.msg.days.indexOf("<100")==-1){
-					this.msg.days.forEach(x=>{
-						this.days.forEach(y=>{
-							if(y.day==x){
-								temp+=y.name+","
+			changeDayAndDate() {
+				let temp = ''
+				if (this.msg.days.indexOf("<100") == -1) {
+					this.msg.days.forEach(x => {
+						this.days.forEach(y => {
+							if (y.day == x) {
+								temp += y.name + ","
 							}
 						})
 					})
 				}
-				if(this.msg.startDate!=''){
-					temp+="最早:"+this.msg.startDate+","
+				if (this.msg.startDate != '') {
+					temp += "最早:" + this.msg.startDate + ","
 				}
-				if(this.msg.endDate!=''){
-					temp+="最早:"+this.msg.endDate+","
+				if (this.msg.endDate != '') {
+					temp += "最早:" + this.msg.endDate + ","
 				}
-				this.optionsTitle[2]=temp==''?'天数日期':temp
+				this.optionsTitle[2] = temp == '' ? '天数日期' : temp
 				this.$forceUpdate()
 				this.$refs.uDropdown.close();
+				this.research();
 			},
 			chosenDateResult(obj) {
 				this.msg.startDate = obj.start;
 				this.msg.endDate = obj.end;
 				this.showTimePopup = false
 			},
-			clearTeams(){
-				this.msg.team=[]
-				this.optionsTitle[1]='线路玩法'
+			clearTeams() {
+				this.msg.team = []
+				this.optionsTitle[1] = '线路玩法'
 				this.$forceUpdate()
 				this.$refs.uDropdown.close();
 			},
-			changeTeams(){
-				if(this.msg.team.length==0){
-					this.optionsTitle[1]='线路玩法'
-				}else{
-					let temp=''
-					this.lineList.forEach(x=>{
-						x.Teams.forEach(y=>{
-							if(this.msg.team.indexOf(y.TeamId)!=-1){
-								temp+=y.TeamName+","
+			changeTeams() {
+				if (this.msg.team.length == 0) {
+					this.optionsTitle[1] = '线路玩法'
+				} else {
+					let temp = ''
+					this.lineList.forEach(x => {
+						x.Teams.forEach(y => {
+							if (this.msg.team.indexOf(y.TeamId) != -1) {
+								temp += y.TeamName + ","
 							}
 						})
 					})
-					this.optionsTitle[1]=temp
+					this.optionsTitle[1] = temp
 				}
 				this.$forceUpdate()
 				this.$refs.uDropdown.close();
+				this.research();
 			},
-			setTeams(x,y){
-				let id=this.lineList[x].Teams[y].TeamId
-				
-				let temp=this.msg.team.indexOf(id)
-				if(temp==-1){
+			setTeams(x, y) {
+				let id = this.lineList[x].Teams[y].TeamId
+				let temp = this.msg.team.indexOf(id)
+				if (temp == -1) {
 					this.msg.team.push(id)
-				}else{
-					this.msg.team.splice(temp,1)
+				} else {
+					this.msg.team.splice(temp, 1)
 				}
-				this.$forceUpdate()
+				this.$forceUpdate();
 			},
 			changeOrderBy(index) {
 				let temp = this.orderBys.find(x => {
@@ -740,14 +638,15 @@
 					}
 				})
 				this.optionsTitle[0] = temp.label
-				this.msg.orderBy=temp.value
+				this.msg.orderBy = temp.value
 				this.$forceUpdate()
+				this.research();
 			},
 			changeStartCity(index) {
-				if(index==-1){
+				if (index == -1) {
 					this.optionsTitle[3] = "出发城市"
-					this.msg.startCity=-1
-				}else{
+					this.msg.startCity = -1
+				} else {
 					let temp = this.startCitys.find(x => {
 						if (x.value == index) {
 							return x
@@ -755,10 +654,11 @@
 							return false
 						}
 					})
-					this.optionsTitle[3] = temp.label+"出发"
-					this.msg.startCity=temp.value
+					this.optionsTitle[3] = temp.label + "出发"
+					this.msg.startCity = temp.value
 				}
 				this.$forceUpdate()
+				this.research();
 			},
 			open(index) {
 				this.$refs.uDropdown.highlight();
@@ -766,8 +666,14 @@
 			close(index) {
 				this.$refs.uDropdown.highlight(index);
 			},
+			research() {
+				this.msg.pageIndex = 1;
+				this.dataList = [];
+				this.getList();
+			},
 			//获取数据
 			getList() {
+				console.log("this.msg", this.msg);
 				this.apipost(
 					"b2b_get_GetB2BTravelPageList",
 					this.msg,
@@ -775,8 +681,6 @@
 						if (res.resultCode == 1) {
 							this.dataList = this.dataList.concat(res.data.pageData);
 							this.page_count = res.data.pageCount;
-						} else {
-
 						}
 					},
 					null

--- a/pages/jiuzhai/jz_MyOrder.vue
+++ b/pages/jiuzhai/jz_MyOrder.vue
@@ -5,10 +5,6 @@

 	}

-	/* 	.jz_MyOrderMain{
-		background-color: #ECF1F4;
-	}
- */
 	.jz_OrderList {
 		width: 100%;
 		min-height: 334rpx;
@@ -71,7 +67,7 @@
 	.jz_Zailai {
 		position: absolute;
 		right: 40rpx;
-		bottom: 40rpx;
+		bottom: 20rpx;
 		background-color: #111111;
 		border-radius: 16px;
 		width: 150rpx;
@@ -115,7 +111,8 @@
 								<view style="margin-top:22rpx;">付款总额：¥{{item.preferPrice}}</view>
 							</view>
 						</view>
-						<view class="jz_Zailai" @click="gojz_List">再来一单</view>
+						<view class="jz_Zailai" style="right:90px;" @click="gojz_List">再来一单</view>
+						<view class="jz_Zailai" style="width:60px;" @click="goCancel(item)">取消</view>
 					</view>
 				</scroll-view>
 			</view>
@@ -133,15 +130,19 @@
 				msg: {
 					pageIndex: 1,
 					pageSize: 15,
-					MiniAppUserId: 0
+					MiniAppUserId: 0,
+					orderState:-1
 				},
 				mainColor: "",
 				list: [{
-					name: '全部'
+					name: '全部',
+					Id:-1
 				}, {
-					name: '待付款'
+					name: '待付款',
+					Id:2
 				}, {
-					name: '未使用'
+					name: '已付款',
+					Id:1
 				}],
 				current: 0,
 				dataList: [],
@@ -158,12 +159,15 @@
 			this.getOrderInfo();
 		},
 		onLoad(option) {
+			this.current = option.status || 0;
 			this.mainColor = this.$uiConfig.mainColor;

 		},
 		methods: {
-			change(val) {
-
+			change(i) {
+				this.current = i;
+				this.msg.orderState = this.list[i].Id;
+				this.research();
 			},
 			//获取第一张图
 			getFirstImg(obj) {
@@ -191,14 +195,28 @@
 					this.status = "nomore";
 				}
 			},
-			getOrderInfo() {
+			research()
+			{
+				this.msg.pageIndex=1;
+				this.getOrderInfo(1);
+			},
+			getOrderInfo(type) {
+				if(type==1){
+					this.dataList=[];
+				}
 				this.userInfo = uni.getStorageSync('mall_UserInfo');
 				this.msg.MiniAppUserId = this.userInfo.UserId
 				this.apipost("sellorder_post_GetMiniAppTravelOrderList", this.msg,
 					res => {
 						if (res.resultCode == 1) {
 							console.log(res, '数据');
-							this.dataList = this.dataList.concat(res.data.pageData);
+							if(type==1){
+								this.dataList = res.data.pageData;
+							}
+							else{
+								this.dataList = this.dataList.concat(res.data.pageData);
+							}
+							
 							this.dataList.forEach(x => {
 								x.isShowHalf = true;
 							})
@@ -209,6 +227,51 @@
 					},
 					null
 				);
+			},
+			//取消订单
+			goCancel(item) {
+				console.log(item, 'item');
+				//未付款-调用后台取消
+				if ((item.paymentTime == null||item.paymentTime=='')&&item.orderState==2) {
+					this.apipost(
+						"sellorder_post_B2BRemoveOrder", {
+							ID: item.orderId
+						},
+						res => {
+							if (res.data.resultCode == 1) {
+								uni.showToast({
+									title: '操作成功',
+									icon: 'success',
+								})
+								this.research();
+							}
+						},
+						err => {}
+					);
+				}	
+				else{
+					let msg={
+						OrderId:item.orderId,
+						UserId:uni.getStorageSync('mall_UserInfo').UserId
+					}
+					//已付款取消申请
+					this.apipost("sellorder_post_AppletUserCancelOrder", msg ,
+						res => {
+							if (res.resultCode == 1) {
+								console.log(res, '数据');
+								uni.showToast({
+									title: '操作成功',
+									icon: 'success',
+								})
+								this.research();
+							
+							} else {
+					
+							}
+						},
+						null
+					);
+				}
 			}
 		}


--- a/pages/restaurant/components/buyNotice.vue
+++ b/pages/restaurant/components/buyNotice.vue
+<template>
+	<view class="buy-notice-restaurant">
+		<view class="meal-info">
+			<image :src="mealData.MealPic" mode="aspectFit" class="MealPic"></image>
+			<view class="right">
+				<view class="name">{{mealData.MealName}}</view>
+				<view class="sale">已售 {{mealData.SaleCount}}</view>
+			</view>
+		</view>
+		<view class="ticket-title">
+			套餐内容
+			<text class="ticket-title-bg"></text>
+		</view>
+		<view class="meal-con">
+			{{mealData.MealDesc}}
+		</view>
+		<view class="ticket-title">
+			购买须知
+			<text class="ticket-title-bg"></text>
+		</view>
+		<view class="buy-notice-con">
+			<rich-text :nodes="mealData.OtherTag"></rich-text>
+		</view>
+		<view class="btn-box">
+			<view class="price">
+				<text class="price-pre">￥</text>
+				{{$utils.getretailer()==true? mealData.LPriceB:mealData.LPriceC}}
+			</view>
+			<view class="btn" @click="subscribe">
+				立即预订
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default{
+		props:{
+			mealData:{
+				type:Object,
+				default:{}
+			}
+		},
+		data(){
+			return{
+				
+			}
+		},
+		methods:{
+			subscribe(){
+				this.$emit("success")
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.buy-notice-restaurant{
+		height: 70vh;
+		padding: 45rpx 45rpx 120rpx 45rpx;
+		overflow-y: scroll;
+		overflow-x: hidden;
+		.meal-info{
+			display: flex;
+			padding-bottom: 50rpx;
+			border-bottom: 1rpx solid #E7E7E7;
+			.MealPic{
+				width: 129rpx;
+				height: 129rpx;
+				background-color: #DFBE6E;
+				border-radius: 20rpx;
+			}
+			.right{
+				flex-grow: 5;
+				margin-left: 35rpx;
+				.name{
+					font-size: 34rpx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #1B1D1E;
+				}
+				.sale{
+					width: 120rpx;
+					height: 40rpx;
+					background-color: #ECF1F4;
+					border-radius: 4rpx;
+					font-size: 22rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #111111;
+					text-align: center;
+					line-height: 38rpx;
+					margin-top: 20rpx;
+				}
+			}
+		}
+		.ticket-title {
+			// width: 70rpx;
+			height: 50rpx;
+			font-size: 34rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #1F1F1F;
+			background-color: transparent;
+			// line-height: 44rpx;
+			position: relative;
+			margin: 40rpx 0;
+		
+			.ticket-title-bg {
+				width: 70rpx;
+				height: 10rpx;
+				background-color: #DFBE6E;
+				border-radius: 4px;
+				position: absolute;
+				left: 0;
+				bottom: 6rpx;
+				z-index: 1;
+				opacity: 0.6;
+			}
+		}
+		.meal-con{
+			white-space: pre-wrap;
+			font-size: 28rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #111111;
+		}
+		.buy-notice-con{
+			font-size: 28rpx;
+			font-family: PingFang SC;
+			font-weight: 600;
+			color: #111111;
+		}
+		.btn-box{
+			position: fixed;
+			right: 55rpx;
+			bottom:100rpx;
+			display: flex;
+			justify-content: flex-end;
+			align-items: center;
+			.price{
+				font-size: 40rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #D91818;
+				// line-height: 38rpx;
+				.price-pre{
+					font-size: 22rpx;
+				}
+			}
+			.btn{
+				width: 300rpx;
+				height: 80rpx;
+				background-color: #111111;
+				border-radius: 20rpx;
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #FFFFFF;
+				text-align: center;
+				line-height: 78rpx;
+				margin-left: 45rpx;
+			}
+		}
+	}
+</style>
--- a/pages/restaurant/components/package-good.vue
+++ b/pages/restaurant/components/package-good.vue
@@ -8,58 +8,94 @@
 			<view class="package-name">{{data.MealName}}</view>
 			<view class="f11">
 				<text class="king" style="margin-right: 14rpx;" v-if="data.MinBuyNum>0">{{data.MinBuyNum}}人起订</text>
-				
-				<text><text v-for="(item,index) in data.UsageTimeList" :key="index">
-					{{item.Name}} <text v-if="index!=data.UsageTimeList.length-1">、</text>
-				</text>可用,</text>
+
+				<text>
+					<text v-for="(item,index) in data.UsageTimeList" :key="index" v-if="data.UsageTimeList[0].ID!==0">
+						{{item.Name}}
+						<text v-if="index!=data.UsageTimeList.length-1">、</text>
+					</text>
+					<text v-if="data.UsageTimeList[0].ID!==0">可用,</text>
+					<text v-if="data.UsageTimeList[0].ID===0">
+						使用时间不限
+					</text>
+				</text>
 				<text v-if="data.IsHoliday===1">节假日可用</text>
 			</view>
 			<viwe class="give f11">
 				<text v-if="data.MakeDay===0">可预约当天</text>
 				<text v-if="data.MakeDay>0">提前{{data.MakeDay}}天预约</text>
 			</viwe>
-			<view class="price" style="margin-top:30rpx;">
+			<view class="buy-know" @click="seeBuyNotice">
+				购买须知
+			</view>
+			<view class="price" style="margin-top:10rpx;">
 				<text class="f11" style="margin-right: 10rpx;">￥</text>
-				<text v-if="data.LPriceB">{{data.LPriceB}}</text>
-				<text v-if="!data.LPriceB">暂无报价</text>
+				<!-- <text v-if="data.LPriceB">{{data.LPriceB}}</text> -->
+				<!-- <text v-if="!data.LPriceB">暂无报价</text> -->
+				<text>{{$utils.getretailer()==true? data.LPriceB:data.LPriceC}}</text>
 			</view>
 		</view>
 		<view class="rm-opera">
-			<view class="buy" @click="previewOrder">
+			<view class="buy" @click="previewOrder" v-if="data.RemainingInventory>0">
 				<view class="buy-content">抢</view>
 				<view class="buy-tips">在线订</view>
 			</view>
-			<!-- <view class="buy disabled">
+			<view class="buy disabled" v-if="data.RemainingInventory===0">
 				<view class="buy-content">抢</view>
 				<view class="buy-tips">已售罄</view>
-			</view> -->
+			</view>
 		</view>
-		
+		<u-popup v-model="showBuyNotice" mode="bottom" border-radius="40" :safe-area-inset-bottom="true">
+			<buyNotice :mealData="data" @success="buyNoticeSuccess"></buyNotice>
+		</u-popup>
+
 	</view>
 </template>

 <script>
+	import buyNotice from "./buyNotice.vue"
 	export default {
-		props:{
-			data:{
-				type:Object,
-				dafault:{}
+		components: {
+			buyNotice
+		},
+		props: {
+			data: {
+				type: Object,
+				dafault: {}
+			}
+		},
+		data() {
+			return {
+				showBuyNotice: false
 			}
 		},
 		mounted() {
 			console.log(this.data)
 		},
 		methods: {
-			previewOrder(){
-				uni.navigateTo({
-					url:"/pages/restaurant/order"
-				})
+			previewOrder() {
+				this.$emit("success")
+			},
+			buyNoticeSuccess(){
+				this.showBuyNotice = false
+				if(this.data.RemainingInventory>0){
+					this.previewOrder()
+				}else{
+					uni.showToast({
+						title:"该套餐已售罄",
+						icon:"none"
+					})
+				}
+				
 			},
+			seeBuyNotice() {
+				this.showBuyNotice = true
+			}
 		},
 	}
 </script>

-<style>
+<style scoped>
 	.package-good {
 		margin-bottom: 30rpx;
 		display: flex;
@@ -79,7 +115,8 @@
 		width: 1px;
 		flex: 1;
 	}
-	.package-good .rm-opera{
+
+	.package-good .rm-opera {
 		margin-left: 10rpx;
 		display: flex;
 		flex-direction: column;
@@ -87,14 +124,16 @@
 		justify-items: center;
 		align-items: center;
 	}
-	.package-good .rm-opera .warm-count{
+
+	.package-good .rm-opera .warm-count {
 		text-align: center;
 		font-size: 18rpx;
 		font-weight: 500;
 		color: #111111;
 		margin-bottom: 10rpx;
 	}
-	.package-good .rm-opera .buy{
+
+	.package-good .rm-opera .buy {
 		width: 70rpx;
 		height: 81rpx;
 		background: #FFFFFF;
@@ -103,26 +142,31 @@
 		display: flex;
 		flex-direction: column;
 	}
-	.package-good .rm-opera .buy.disabled{
+
+	.package-good .rm-opera .buy.disabled {
 		background: #EBEBEB;
 		border: 2rpx solid #DCDCDC;
 	}
-	.package-good .rm-opera .buy.disabled .buy-tips{
+
+	.package-good .rm-opera .buy.disabled .buy-tips {
 		background: #A09E9E;
 		color: #fff;
 	}
-	.package-good .rm-opera .buy.disabled .buy-content{
+
+	.package-good .rm-opera .buy.disabled .buy-content {
 		color: #A09E9E;
 	}
-	.package-good .rm-opera .buy .buy-tips{
+
+	.package-good .rm-opera .buy .buy-tips {
 		height: 27rpx;
 		background: #000000;
 		text-align: center;
-		color:#DFBE6E;
+		color: #DFBE6E;
 		font-size: 18rpx;
 		line-height: 27rpx;
 	}
-	.package-good .rm-opera .buy .buy-content{
+
+	.package-good .rm-opera .buy .buy-content {
 		height: 1px;
 		flex: 1;
 		text-align: center;
@@ -133,6 +177,7 @@
 		font-weight: 800;
 		color: #111111;
 	}
+
 	.package-good .rm-right .package-name {
 		font-size: 30rpx;
 		font-weight: 800;
@@ -143,27 +188,28 @@
 	}

 	.package-good .rm-right .give {
-		
+
 		background: #ECF1F4;
 		border-radius: 4rpx;
 		padding: 10rpx;
-		margin-top:15rpx;
+		margin-top: 15rpx;
 		display: inline-block;
 	}
-	
-	.package-good .rm-right .price{
+
+	.package-good .rm-right .price {
 		font-weight: 800;
 		font-size: 40rpx;
-		color:#111;
+		color: #111;
 	}

 	.package-good .rm-left {
-		width: 174rpx;
-		height: 257rpx;
+		width: 175rpx;
+		height: 213rpx;
 		border-radius: 20rpx;
 		margin-right: 30rpx;
 		position: relative;
 		overflow: hidden;
+		box-shadow: 0px 10rpx 30rpx 0rpx rgba(36, 36, 36, 0.2);
 	}

 	.package-good .rm-left image {
@@ -182,4 +228,12 @@
 		right: 0;
 		bottom: 0;
 	}
+
+	.buy-know {
+		margin-top: 10rpx;
+		font-size: 22rpx;
+		font-family: PingFang SC;
+		font-weight: 800;
+		color: #111111;
+	}
 </style>
--- a/pages/restaurant/components/restaurant-good.vue
+++ b/pages/restaurant/components/restaurant-good.vue
@@ -5,13 +5,14 @@
 		</view>
 		<view class="restaurant-info">
 			<view class="restaurant-name">{{data.Name}}</view>
-			<view class="restaurant-start">
+			<!-- <view class="restaurant-start">
 				<view class="other-rate">
-					<text>{{data.Feature}}</text>
+					<text class="feature">{{data.Feature}}</text>
 					<span class="line"></span>
 				</view>
-			</view>
-			<view class="localtion">{{data.Address}}</view>
+			</view> -->
+			<view class="localtion feature">{{data.Feature}}</view>
+			<view class="localtion feature addr">{{data.Address}}</view>
 			<view style="display: flex;flex-wrap: wrap;">
 				<view v-for="(item,index) in data.FoodTag" :key="index">
 					<u-tag :text="item" bg-color="#FFF" border-color="#DFBE6E" color="#DFBE6E" size="mini" style="margin-right: 20rpx;" v-if="item"></u-tag>
@@ -23,7 +24,8 @@
 			</view>
 			<view class="price">
 				<text>￥</text>
-				<text class="money">{{data.B2BPrice}}</text>
+				<!-- <text class="money">{{data.B2BPrice}}</text> -->
+				<text class="money">{{$utils.getretailer()==true? data.B2BPrice:data.B2CPrice}}  </text>
 				<text>/起</text>
 			</view>
 		</view>
@@ -42,9 +44,6 @@
 				default:{}
 			}
 		},
-		created() {
-			console.log(this.data)
-		},
 		data() {
 			return {
 				// key: value
@@ -64,7 +63,7 @@
 		padding-bottom: 30rpx;
 		border-bottom: 1rpx solid #E2E2E2;
 		display: flex;
-		align-items: center;
+		/* align-items: center; */
 	}
 	.restaurant-list-item .img-box{
 		width: 220rpx;
@@ -72,6 +71,7 @@
 		border-radius: 20rpx;
 		overflow: hidden;
 		margin-right: 30rpx;
+		box-shadow: 0rpx 10rpx 30rpx 0rpx rgba(36, 36, 36, 0.2);
 	}
 	.restaurant-list-item .img-box image{
 		width: 100%;
@@ -80,6 +80,7 @@
 	.restaurant-list-item .restaurant-info{
 		width: 1px;
 		flex: 1;
+		padding-top: 20rpx;
 	}
 	.restaurant-list-item .restaurant-info .restaurant-name{
 		font-weight: 500;
@@ -143,4 +144,17 @@
 	.restaurant-list-item .restaurant-info .price .money{
 		font-size: 36rpx;
 	}
+	.feature{
+		margin-top: 20rpx;
+		text-align: justify;
+		text-align-last: left;
+		overflow : hidden;
+		text-overflow: ellipsis;
+		display: -webkit-box;
+		-webkit-line-clamp: 2;
+		-webkit-box-orient: vertical;
+	}
+	.addr{
+		color: #111111 !important;
+	}
 </style>
--- a/pages/restaurant/detail.vue
+++ b/pages/restaurant/detail.vue
@@ -4,7 +4,7 @@
 			<view class="media" :style="{'opacity':(100-boxOption)+'%'}">
 				<u-swiper :list="imgsList" :effect3d="false" :height="407" :interval="5000" :border-radius="0"
 					@click="openPicture" name="picUrl" v-if="active==1"></u-swiper>
-				
+
 				<view @click="goback" :style="[titleStyle,{opacity:'100% !important'}]"
 					style="position: fixed;top: 0;left: 0;padding-left: 6rpx;">
 					<u-icon name="arrow-left" size="44" color="#FFF" style="margin-top: 22rpx;"></u-icon>
@@ -23,10 +23,12 @@
 							<view class="restaurant-name">{{details.Name}}</view>
 							<view class="restaurant-tag" style="display: flex;flex-wrap: wrap;">
 								<view v-for="(item,index) in details.FoodTag" :key="index">
-										 <u-tag style="margin-right: 22rpx;" :text="item" mode="plain" border-color="#DFBE6E" color="#DFBE6E" size="mini" v-if="item"/>
+									<u-tag style="margin-right: 22rpx;" :text="item" mode="plain" border-color="#DFBE6E"
+										color="#DFBE6E" size="mini" v-if="item" />
 								</view>
 								<view v-for="(item,index) in details.GeographicTag" :key="index">
-										 <u-tag style="margin-right: 22rpx;" :text="item" mode="plain" border-color="#DFBE6E" color="#DFBE6E" size="mini" v-if="item"/>
+									<u-tag style="margin-right: 22rpx;" :text="item" mode="plain" border-color="#DFBE6E"
+										color="#DFBE6E" size="mini" v-if="item" />
 								</view>
 							</view>
 						</view>
@@ -40,12 +42,14 @@
 								@click="changeLike"></image>
 						</view>
 					</view>
-					<view class="location" style="margin-bottom: 36rpx;padding-bottom: 36rpx;border-bottom: 1px solid rgba(0,0,0,.1);">
+					<view class="location"
+						style="margin-bottom: 36rpx;padding-bottom: 36rpx;border-bottom: 1px solid rgba(0,0,0,.1);">
 						<view class="loc-left">
 							<view class="loc-name">
 								<u-icon name="clock" size="28" />
 								<text style="margin-left: 14rpx;">营业时间 {{details.OpeningHours}}</text>
-								<u-tag style="margin-left: 22rpx;" text="营业中" bg-color="#DFBE6E" border-color="#DFBE6E" color="#ffffff" v-if="details.BusinessState===1"/>
+								<u-tag style="margin-left: 22rpx;" text="营业中" bg-color="#DFBE6E" border-color="#DFBE6E"
+									color="#ffffff" v-if="details.BusinessState===1" />
 							</view>
 							<view class="loc-remark">
 								<!-- <view>无休息日，全年营业</view> -->
@@ -64,37 +68,46 @@
 							</view>
 						</view>
 						<view class="loc-right">
-							<text style="margin-right: 20rpx;" @click="goMap(details.Address,details.Lng,details.Lat)">地图详情</text>
+							<text style="margin-right: 20rpx;"
+								@click="goMap(details.Address,details.Lng,details.Lat)">地图详情</text>
 							<u-icon name="arrow" size="20" />
 						</view>
 					</view>
-					
+
 					<view class="empty-block" style="margin: 0 -50rpx;"></view>
 					<view class="big-title" style="margin-top: 50rpx;">
 						<text>推荐菜品</text>
 					</view>
 					<view class="chooseDate" @click="chooseDate">
 						<text>选择日期</text>
-						<uni-calendar ref="calendar" :insert="true" :selected="calendar" @confirm="confirm"></uni-calendar>
+						<text v-if="Date">:{{Date}}</text>
 					</view>
-					
-					
+
+
 					<ul class="title-style-one hr">
 						<li v-for="(item,index) in details.FoodRecommendList" :key="index">
 							<view class="item-title regular">{{item.FoodName}}</view>
 						</li>
 					</ul>
 					<view class="big-title">
-						<text>优惠套餐</text> 
+						<text>优惠套餐</text>
 					</view>
 					<view class="restaurant-room">
-						<view v-for="(item,index) in details.resultMealList" :key="index" class="room-list">
-							<package-good :data="item"></package-good>
+						<view class="no-data" v-if="details.resultMealList.length===0">
+							<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/no-data.png" mode="aspectFit" class="no-data-img"></image>
+							<view class="zhanwu">
+								暂无数据
+							</view>
+						</view>
+						<view v-for="(item,index) in details.resultMealList" :key="index" class="room-list" v-if="details.resultMealList.length>=0">
+							<package-good :data="item" @success="previewOrder(item)"></package-good>
 							<!-- <package-good-test></package-good-test> -->
 						</view>
 					</view>
 				</view>
 				<!-- <view class="empty-block"></view> -->
+				
+				
 				<view class="detail-box">
 					<!-- <view class="flex">
 						<view class="big-title">
@@ -128,15 +141,18 @@
 						<recommed-restaurant></recommed-restaurant>
 					</view> -->
 				</view>
-				<view class="">
-					
-				</view>
-				<!-- <u-popup v-model="showTimePopup" mode="bottom" border-radius="40" length="70%" :safe-area-inset-bottom="true" > -->
-					
-				<!-- </u-popup> -->
+				<u-popup v-model="showTimePopup" mode="bottom" border-radius="40" length="70%"
+					:safe-area-inset-bottom="true">
+					<view class="" style="margin-top: 40rpx;">
+						<calendar ref="calendar" :insert="true" :selected="calendar" @change="changeDate"></calendar>
+						<view class="caledar-btn" @click="confirm">
+							确定
+						</view>
+					</view>
+				</u-popup>
 			</view>
 		</scroll-view>
-		
+
 	</view>
 </template>

@@ -145,11 +161,11 @@
 	import packageGoodTest from './components/package-good2.vue';
 	import nearGood from './components/near-good.vue';
 	import recommedRestaurant from './components/recommed-restaurant.vue';
-	import uniCanlendar from "./components/uni-calendar/uni-calendar.vue"
+	import calendar from "./components/uni-calendar/uni-calendar.vue"
 	export default {
 		data() {
 			return {
-				imgsList: [{ 
+				imgsList: [{
 						picUrl: "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1622459632000_216.png"
 					},
 					{
@@ -163,7 +179,7 @@
 					}
 				],
 				ID: 0,
-				details:{},
+				details: {},
 				typeList: [{
 					Id: 0,
 					Name: '视频'
@@ -178,41 +194,12 @@
 				controls: false,
 				videoUrl: "https://video.c-ctrip.com/videos/230i1r000001hxb2mEEE4.mp4",
 				active: 1,
-				islike: false,
-				currentRoomType: 0,
-				nearbyType: 0,
-				searchObj: {
-					date: {}
-				},
-				threeLevelList: [{
-						name: "全部",
-						id: 0
-					},
-					{
-						name: "大床房",
-						id: 1
-					},
-					{
-						name: "双床房",
-						id: 2
-					},
-					{
-						name: "含早餐",
-						id: 3
-					},
-					{
-						name: "可取消",
-						id: 4
-					},
-					{
-						name: "优惠活动",
-						id: 5
-					}
-				],
+				nearbyType: 0,				
 				calendar: [{
 					date: "",
 					info: ''
-				}], 
+				}],
+				Date: ""
 			}
 		},
 		components: {
@@ -220,39 +207,25 @@
 			packageGoodTest,
 			nearGood,
 			recommedRestaurant,
-			uniCanlendar
+			calendar
 		},
 		created() {
-			let d1 = new Date();
-			let d = new Date();
-			let d2 = new Date(d.setDate(d.getDate() + 1))
-			var obj = {
-				start: `${d1.getFullYear()}-${d1.getMonth()+1}-${d1.getDate()}`,
-				end: `${d2.getFullYear()}-${d2.getMonth()+1}-${d2.getDate()}`,
-				startDay: `${this.getMonth(d1)}月${d1.getDate()}日`,
-				endDay: `${this.getMonth(d1)}月${d1.getDate()}日`,
-				startWeek: this.getWeek(d1),
-				endWeek: this.getWeek(d2),
-				day: 1
-			}
-			uni.setStorage({
-				key: 'Time',
-				data: JSON.stringify(obj)
-			})
-			this.searchObj.date = obj
-			// let d = new Date();
-			let nextDate = new Date(d.getTime() + 24*60*60*1000); 
-			let year=nextDate.getFullYear();
-			let month=nextDate.getMonth()+1
-			if(month<10){
-				month='0'+month
+			let d3 = new Date();
+			let nextDate = new Date(d3.getTime() + 24 * 60 * 60 * 1000);
+			let year = nextDate.getFullYear();
+			let month = nextDate.getMonth() + 1
+			if (month < 10) {
+				month = '0' + month
 			}
-			let day=nextDate.getDate()
-			if(day<10){
-				day='0'+day
+			let day = nextDate.getDate()
+			if (day < 10) {
+				day = '0' + day
 			}
-			let tomorrow = year+'-'+month+'-'+day
-			this.calendar[0].date=tomorrow
+			let tomorrow = year + '-' + month + '-' + day
+			this.calendar[0].date = tomorrow
+			
+			this.Date = tomorrow
+			console.log(this.calendar,this.Date)
 		},
 		onLoad(options) {
 			if (options && options.id) {
@@ -272,100 +245,52 @@
 			this.mainColor = this.$uiConfig.mainColor;
 		},
 		methods: {
-			chooseDate(){
-				// this.showTimePopup=true
+			chooseDate() {
+				this.showTimePopup = true
 				// this.$refs.calendar.open();
-				console.log(this.$refs,this)
 			},
-			confirm(e) {
+			changeDate(e){
 				this.Date = e.fulldate
 				this.calendar[0].date = e.fulldate
-				// this.getDetailByDate();
-				this.$forceUpdate()
 			},
-			// opencalendar(){
-			// 	 this.$refs.calendar.open();
-			// },
+			confirm() {
+				this.showTimePopup=false
+				this.getMealListByDate()
+			},
 			goMap(name, lon, lat) {
-				let newLon=parseFloat(lon)
-				let newLat=parseFloat(lat)
+				let newLon = parseFloat(lon)
+				let newLat = parseFloat(lat)
 				wx.openLocation({
-				  latitude:newLat,
-				  longitude:newLon,
-				  scale: 18,
-				  name,
-				  // address:"武侯区科华中路 2 号",
-				  success:(res)=>{
-					  // console.log(res)
-				  },
-				  fail: (err) => {
-				  	// console.log(err)
-				  }
+					latitude: newLat,
+					longitude: newLon,
+					scale: 18,
+					name,
+					// address:"武侯区科华中路 2 号",
+					success: (res) => {
+						// console.log(res)
+					},
+					fail: (err) => {
+						// console.log(err)
+					}
 				})
 			},
-			openPicture(){
+			openPicture() {
 				uni.navigateTo({
-					url:"/pages/restaurant/picture"
+					url: "/pages/restaurant/picture"
 				})
 			},
-			openDescription(){
+			openDescription() {
 				uni.navigateTo({
-					url:"/pages/restaurant/description"
+					url: "/pages/restaurant/description"
 				})
 			},
-			
-			// chosenDateResult(obj) {
-				
-			// 	obj.startDay = this.formatMonthDay(obj.startDay)
-			// 	obj.endDay = this.formatMonthDay(obj.endDay)
-			// 	this.searchObj.date = obj
-			// 	this.showTimePopup = false
-			// },
-			formatMonthDay(str) {
-				let temp = str.split('-')
-				temp[0] = temp[0] > 9 ? temp[0] : "0" + temp[0]
-				temp[1] = temp[1] > 9 ? temp[1] : "0" + temp[1]
-				return `${temp[0]}月${temp[1]}日`
-			},
-			getMonth(date) {
-				let m = date.getMonth() + 1
-				return m > 9 ? m : "0" + m
-			},
-			getDay(date) {
-				let d = date.getDate()
-				return d > 9 ? d : "0" + d
-			},
-			getWeek(date) {
-				let day = date.getDay();
-				if (day === 1) {
-					var week = "一";
-				} else if (day === 2) {
-					week = "二";
-				} else if (day === 3) {
-					week = "三";
-				} else if (day === 4) {
-					week = "四";
-				} else if (day === 5) {
-					week = "五";
-				} else if (day === 6) {
-					week = "六";
-				} else if (day === 7) {
-					week = "日";
-				}
-				return "周" + week
-			},
-			changeNearbyType(t) {
-				this.nearbyType = t
-			},
-			changeRoomType(i) {
-				this.currentRoomType = i
-			},
+
 			changeLike() {
 				this.request2({
 						url: '/api/AppletDining/GetFollowDining',
 						data: {
 							ID: this.details.FollowId,
-							SourceId:this.details.ID
+							SourceId: this.details.ID
 						}
 					},
 					res => {
@@ -375,40 +300,14 @@
 					}
 				);
 			},
-			previewImage(i) {
-				// uni.previewImage({
-				// 	urls: this.imgsList,
-				// 	current: i,
-				// 	longPressActions: {
-				// 		itemList: ["发送给朋友", "保存图片", "收藏"],
-				// 		success: function(data) {},
-				// 		fail: function(err) {
-				// 			console.log(err.errMsg);
-				// 		},
-				// 	},
-				// });
-			},
+			
 			scroll(e) {
 				this.boxOption = Math.floor((e.detail.scrollTop - 50) / 1.5);
 				this.titleStyle.opacity = ((e.detail.scrollTop - 100) < 0 ? 0 : Math.floor(e.detail.scrollTop - 100)) + "%"
 				this.$forceUpdate()
 			},
-			enlarge(file) {
-				// 全屏
-				this.videoContext = uni.createVideoContext('myVideo');
-				this.videoContext.requestFullScreen({
-					direction: 0
-				})
-			},
-			videoControl(e) {
-				if (e.detail.fullScreen == false) {
-					this.videoContext.stop()
-					this.controls = false
-				} else {
-					this.videoContext.play()
-					this.controls = true
-				}
-			},
+			
+			
 			goback() {
 				uni.navigateBack({
 					delta: 1,
@@ -434,24 +333,90 @@
 					}
 				);
 			},
+			//根据日期获取套餐列表
+			getMealListByDate() {
+				this.request2({
+						url: '/api/AppletDining/GetDiningMealList',
+						data: {
+							ID: this.ID,
+							BuyDate:this.Date
+						}
+					},
+					res => {
+						if (res.resultCode == 1) {
+							this.details.resultMealList = res.data;
+						}
+					}
+				);
+			},
+			previewOrder(item) {
+				let data = {
+					MealName: item.MealName,
+					date: this.Date,
+					Unit_Price: this.$utils.getretailer()==true?item.LPriceB:item.LPriceC,
+					MealId: item.Id,
+					DiningId: this.details.ID,
+					MakeDay: item.MakeDay,
+					IsHoliday: item.IsHoliday,
+					OtherTag:item.OtherTag,
+				}
+				uni.navigateTo({
+					url: "/pages/restaurant/order?data=" + encodeURIComponent(JSON.stringify(data)),
+				});
+			}
 		},
 	}
 </script>

-<style scoped>
-	.chooseDate{
-		/* width: 150px; */
+<style lang="scss" scoped>
+	.no-data {
+		.no-data-img {
+			width: 180rpx;
+			height: 240rpx;
+			margin-left: 50%;
+			transform: translateX(-50%);
+		}
+		.zhanwu{
+			text-align: center;
+			font-size: 28rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #999999;
+			margin-top: 20rpx;
+		}
+	}
+	
+	.chooseDate {
+		width: 275rpx;
+		margin-top: 20rpx;
 		/* display: inline-block; */
-		height: 60rpx;
+		/* height: 60rpx; */
 		background-color: #ECF1F4;
 		border-radius: 20rpx;
 		font-size: 24rpx;
 		font-family: PingFang SC;
 		font-weight: 500;
 		color: #111111;
+		text-align: center;
 		line-height: 58rpx;
 		padding: 0 10rpx;
 	}
+
+	.caledar-btn {
+		margin-top: 20rpx;
+		width: 650rpx;
+		height: 80rpx;
+		background-color: #111111;
+		border-radius: 20rpx;
+		font-size: 28rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #FFFFFF;
+		text-align: center;
+		line-height: 78rpx;
+		margin: 0 auto;
+	}
+
 	.restaurant-detail {
 		height: 100vh;
 		overflow: hidden;
@@ -732,9 +697,11 @@
 		font-weight: 500;
 		color: #6E6E6E; */
 	}
-	.restaurant-detail .restaurant-content .restaurant-base .head .op-box{
+
+	.restaurant-detail .restaurant-content .restaurant-base .head .op-box {
 		margin-top: -175rpx;
 	}
+
 	.restaurant-detail .restaurant-content .restaurant-base .head .op-box image {
 		width: 109rpx;
 		height: 109rpx;
@@ -877,7 +844,7 @@
 		bottom: 0;
 		left: 0;
 		right: 0;
-		padding:30rpx 50rpx;
+		padding: 30rpx 50rpx;
 	}

 	.restaurant-detail .media .media-info .mi-left {

--- a/pages/restaurant/list.vue
+++ b/pages/restaurant/list.vue
@@ -3,15 +3,15 @@
 		<view class="search-box">
 			<view style="width: 1px; flex: 1;">
 				<u-search placeholder="美食名称" v-model="msg.Name" input-align="left"
-					text-color="#111" bg-color="rgba(0,0,0,0)" :show-action="false"></u-search>
+					text-color="#111" bg-color="rgba(0,0,0,0)" :show-action="false" clearabled  @search="searchList" @clear="searchList"></u-search>
 			</view>
 		</view>
 		<view>
 			<u-dropdown ref="uDropdown" @open="open" @close="close" active-color="#000" inactive-color="#444">
-				<u-dropdown-item v-model="msg.OrderBy" :title="optionsTitle[0]" :options="options1" @change="change">
+				<u-dropdown-item v-model="msg.OrderBy" :title="optionsTitle[0]" :options="options1" @change="getFoodList">
 				</u-dropdown-item>
 				
-				<u-dropdown-item v-model="msg.FoodTypeIds" :title="optionsTitle[1]" :options="classOptions">
+				<u-dropdown-item v-model="msg.FoodTypeIds" :title="optionsTitle[1]" :options="classOptions" @change="getFoodList">
 				</u-dropdown-item>
 				<u-dropdown-item :title="optionsTitle[2]">
 					<view class="slot-content" style="padding: 30rpx;background-color: #FFF;">
@@ -25,7 +25,8 @@
 							<text style="font-size: 28rpx;color:#111;font-weight: 800;">价格</text>
 						</view>
 						<view class="hotel-rate-box">
-							<view v-for="(x,i) in rates" class="hotel-rate" :class="{'active':tempRateAndPrice.rate.indexOf(x.ID)!=-1}" @click="setRestaurantPrice(x.ID)">{{x.Name}}</view>
+							<!-- <view v-for="(x,i) in rates" class="hotel-rate" :class="{'active':tempRateAndPrice.rate.indexOf(x.ID)!=-1}" @click="setRestaurantPrice(x.ID)">{{x.Name}}</view> -->
+							<view v-for="(x,i) in rates" class="hotel-rate" :class="{'active':msg.DiningPriceType===x.ID}" @click="setRestaurantPrice(x.ID)">{{x.Name}}</view>
 						</view>
 						<view style="box-shadow: 0px -10px 30px 0px rgba(36, 36, 36, 0.06);margin-top:40rpx;display: flex;">
 							<view style="flex:1;margin-right: 30rpx;">
@@ -81,7 +82,7 @@
 					Name:"",
 					OrderBy:0,
 					FoodTypeIds:0,
-					DiningPriceType:-1,
+					DiningPriceType:0,
 				},
 				page_count:1,
 				status: "loadmore",
@@ -187,9 +188,6 @@
 			restaurantType
 		},
 		created() {
-			// uni.navigateTo({
-			// 	url:"/pages/hotel/detail"
-			// })
 			uni.setNavigationBarTitle({
 				title: "美食",
 			});
@@ -213,7 +211,10 @@
 			this.getFoodList();
 		},
 		methods: {
-			
+			searchList(){
+				this.msg.pageIndex=1
+				this.getFoodList();
+			},
 			scroll: function(e) {
 				this.old.scrollTop = e.detail.scrollTop;
 			},
@@ -233,89 +234,93 @@
 			  }
 			},
 			setRestaurantPrice(rateId){
-				if(rateId==-1){
-					this.tempRateAndPrice.rate=[-1]
-				}else{
-					if(this.tempRateAndPrice.rate.indexOf(-1)!=-1){
-						this.tempRateAndPrice.rate.splice(this.tempRateAndPrice.rate.indexOf(-1),1)
-					}
-					let temp=this.tempRateAndPrice.rate.indexOf(rateId)
-					if(temp==-1){
-						this.tempRateAndPrice.rate.push(rateId)
-					}else{
-						this.tempRateAndPrice.rate.splice(temp,1)
-					}
-				}
-				console.log(this.tempRateAndPrice.rate)
-			},
-			setRestaurant(typeId){
-				if(typeId==-1){
-					this.tempRateAndPrice.types=[-1]
-				}else{
-					if(this.tempRateAndPrice.types.indexOf(-1)!=-1){
-						this.tempRateAndPrice.types.splice(this.tempRateAndPrice.types.indexOf(-1),1)
-					}
-					let temp=this.tempRateAndPrice.types.indexOf(typeId)
-					if(temp==-1){
-						this.tempRateAndPrice.types.push(typeId)
-					}else{
-						this.tempRateAndPrice.types.splice(temp,1)
-					}
-				}
+				this.msg.DiningPriceType=rateId
+				// if(rateId==-1){
+				// 	this.tempRateAndPrice.rate=[-1]
+				// }else{
+				// 	if(this.tempRateAndPrice.rate.indexOf(-1)!=-1){
+				// 		this.tempRateAndPrice.rate.splice(this.tempRateAndPrice.rate.indexOf(-1),1)
+				// 	}
+				// 	let temp=this.tempRateAndPrice.rate.indexOf(rateId)
+				// 	if(temp==-1){
+				// 		this.tempRateAndPrice.rate.push(rateId)
+				// 	}else{
+				// 		this.tempRateAndPrice.rate.splice(temp,1)
+				// 	}
+				// }
 			},
+			// setRestaurant(typeId){
+			// 	if(typeId==-1){
+			// 		this.tempRateAndPrice.types=[-1]
+			// 	}else{
+			// 		if(this.tempRateAndPrice.types.indexOf(-1)!=-1){
+			// 			this.tempRateAndPrice.types.splice(this.tempRateAndPrice.types.indexOf(-1),1)
+			// 		}
+			// 		let temp=this.tempRateAndPrice.types.indexOf(typeId)
+			// 		if(temp==-1){
+			// 			this.tempRateAndPrice.types.push(typeId)
+			// 		}else{
+			// 			this.tempRateAndPrice.types.splice(temp,1)
+			// 		}
+			// 	}
+			// },
 			resetPrice(){
-				this.optionsTitle[2]="筛选"
-				this.searchObj.rateAndPrice={
-					types:[-1],
-					priceText:"不限",
-					rate:[-1]
-				}
+				// this.optionsTitle[2]="筛选"
+				// this.searchObj.rateAndPrice={
+				// 	types:[-1],
+				// 	priceText:"不限",
+				// 	rate:[-1]
+				// }
+				this.msg.DiningPriceType=0
+				this.getFoodList();
 				this.closeDropdown();
 			},
 			surePrice(){
-				let result=""
-				if(this.tempRateAndPrice.types.length>0){
-					this.options2.forEach(x=>{
-						if(this.tempRateAndPrice.types.indexOf(x.value)!=-1){
-							result+=x.label+","
-						}
-					})
-				}
-				if(this.tempRateAndPrice.rate.length>0){
-					this.rates.forEach(x=>{
-						if(this.tempRateAndPrice.rate.indexOf(x.value)!=-1){
-							result+=x.label+","
-						}
-					})
-				}
+				// let result=""
+				// if(this.tempRateAndPrice.types.length>0){
+				// 	this.options2.forEach(x=>{
+				// 		if(this.tempRateAndPrice.types.indexOf(x.value)!=-1){
+				// 			result+=x.label+","
+				// 		}
+				// 	})
+				// }
+				// if(this.tempRateAndPrice.rate.length>0){
+				// 	this.rates.forEach(x=>{
+				// 		if(this.tempRateAndPrice.rate.indexOf(x.value)!=-1){
+				// 			result+=x.label+","
+				// 		}
+				// 	})
+				// }
 				
-				result=result==""?"筛选":result
-				console.log(result)
-				this.optionsTitle[2]=result
-				this.$forceUpdate() 
-				this.searchObj.rateAndPrice=this.tempRateAndPrice
-				this.closeDropdown();
-			},
-			sureType(item){
-				this.searchObj.rtype=item.Id
-				this.optionsTitle[1]=item.Id==-1?'菜系':item.Name
+				// result=result==""?"筛选":result
+				// console.log(296,result)
+				// this.optionsTitle[2]=result
+				// this.$forceUpdate() 
+				// this.searchObj.rateAndPrice=this.tempRateAndPrice
+				// this.msg.DiningPriceType=this.tempRateAndPrice.rate.toString();
+				this.getFoodList();
 				this.closeDropdown();
-				item.newTimespan=this.rand(1000,9999)
-				this.currentTypeObj=item
-			},
-			rangechange4(e){
-				if(e.minValue==0){
-					if(e.maxValue==1000){
-						this.tempRateAndPrice.priceText="不限"
-					}else{
-						this.tempRateAndPrice.priceText=`￥${e.maxValue}以下`
-					}
-				}else if(e.maxValue==1000){
-					this.tempRateAndPrice.priceText=`￥${e.minValue}以上`
-				}else{
-					this.tempRateAndPrice.priceText=`￥${e.minValue} - ￥${e.maxValue}之间`
-				}
 			},
+			// sureType(item){
+			// 	this.searchObj.rtype=item.Id
+			// 	this.optionsTitle[1]=item.Id==-1?'菜系':item.Name
+			// 	this.closeDropdown();
+			// 	item.newTimespan=this.rand(1000,9999)
+			// 	this.currentTypeObj=item
+			// },
+			// rangechange4(e){
+			// 	if(e.minValue==0){
+			// 		if(e.maxValue==1000){
+			// 			this.tempRateAndPrice.priceText="不限"
+			// 		}else{
+			// 			this.tempRateAndPrice.priceText=`￥${e.maxValue}以下`
+			// 		}
+			// 	}else if(e.maxValue==1000){
+			// 		this.tempRateAndPrice.priceText=`￥${e.minValue}以上`
+			// 	}else{
+			// 		this.tempRateAndPrice.priceText=`￥${e.minValue} - ￥${e.maxValue}之间`
+			// 	}
+			// },
 			closeDropdown() {
 				this.$refs.uDropdown.close();
 			},

--- a/pages/restaurant/order.vue
+++ b/pages/restaurant/order.vue
@@ -2,33 +2,52 @@
 	<view>
 		<view class="hotel-order">
 			<view class="o-head">
-				<view class="room-name">烧烤多人餐</view>
-				<view class="room-remark">需要提前1天下单预约</view>
+				<view class="room-name">{{orderData.MealName}}</view>
+				<view class="Meal-date">
+					{{orderData.date}}
+				</view>
+				<view class="room-remark">
+					<text v-if="orderData.MakeDay===0">可预约当天</text>
+					<text v-if="orderData.MakeDay>0">提前{{orderData.MakeDay}}天预约</text>
+				</view>
 				<view class="big-title">
 					<text class=" f12">订餐必知</text>
 				</view>
 				<view class="rule">
-					<text class="king">此套餐节假日不可用</text>
-					<text>需要提前预约，餐厅营业时间为：周一至周日 09:00-21:00，请您提前安排好行程时间</text>
+					<text class="king" v-if="orderData.IsHoliday===0">此套餐节假日不可用</text>
+					<!-- <text>需要提前预约，餐厅营业时间为：周一至周日 09:00-21:00，请您提前安排好行程时间</text> -->
+					<rich-text :nodes="orderData.OtherTag"></rich-text>
 				</view>
 			</view>
 			<view class="form">
 				<view class="form-items">
-					<view class="label">用餐人数</view>
+					<view class="label">就餐人数</view>
+					<view class="val">
+						<u-number-box size="28" :min="1" :max="100" v-model="order.PeopleNumber" @change="PeopleNumberChange"></u-number-box>
+					</view>
+				</view>
+				<view class="form-items">
+					<view class="label">套餐份数</view>
 					<view class="val">
-						<u-number-box size="28" :min="1" :max="100" v-model="order.roomCount"></u-number-box>
+						<u-number-box size="28" :min="1" :max="100" v-model="order.BuyNum" @change="BuyNumChange"></u-number-box>
 					</view>
 				</view>
 				<view class="form-items">
 					<view class="label">联系人</view>
 					<view class="val">
-						<input type="text" v-model="order.userName" placeholder="若是多人,输入代表人员即可" />
+						<input type="text" v-model="order.Consignee" placeholder="若是多人,输入代表人员即可" />
 					</view>
 				</view>
 				<view class="form-items">
 					<view class="label">联系电话</view>
 					<view class="val">
-						<input type="text" v-model="order.userName" placeholder="输入电话号码" />
+						<input type="number" v-model="order.ConsigneeMobile" placeholder="输入电话号码" />
+					</view>
+				</view>
+				<view class="form-items">
+					<view class="label">备注</view>
+					<view class="val">
+						<input type="number" v-model="order.BuyerMessage" placeholder="您的特殊要求，我们会尽量安排" />
 					</view>
 				</view>
 			</view>
@@ -43,8 +62,8 @@
 							在线支付
 						</view>
 						<view class="val f14 regular" style="text-align: right;">
-							<text style="margin-right: 30rpx;">5分套餐</text>
-							<text class="red">￥3000</text>
+							<text style="margin-right: 30rpx;">{{order.BuyNum}}份套餐</text>
+							<text class="red">￥{{orderData.Unit_Price*order.BuyNum}}</text>
 						</view>
 					</view>
 					<view class="form-items" style="border-bottom: none;">
@@ -54,12 +73,12 @@
 					</view>
 					<view class="flex f12 grey">
 						<view style="flex:1">
-							<text style="margin-right: 30rpx;">烧烤多人餐</text>
+							<text style="margin-right: 30rpx;">{{orderData.MealName}}</text>
 						</view>
-						<view style="text-align: right;">5份 × ¥600</view>
+						<view style="text-align: right;">{{order.BuyNum}}份 × ¥{{orderData.Unit_Price}}</view>
 					</view>
 				</view>
-				
+
 			</view>
 			<view class="empty-block"></view>
 		</view>
@@ -67,49 +86,170 @@
 			<view class="box flex">
 				<view class="price">
 					<text class="f11">￥</text>
-					<text>3000</text>
+					<text>{{orderData.Unit_Price*order.BuyNum}}</text>
 				</view>
-				<view class="sum-detail">共计 5份</view>
-				<u-button :ripple="true" :hair-line="false" :custom-style="btnStyle">立即购买</u-button>
+				<view class="sum-detail">共计 {{order.BuyNum}}份</view>
+				<u-button :ripple="true" :hair-line="false" :custom-style="btnStyle" @click="buy">立即购买</u-button>
 			</view>
 		</view>
 	</view>
 </template>

 <script>
-	export default{
+	export default {
 		data() {
 			return {
 				order: {
-					roomCount:1,
-					userName:''
+					PeopleNumber: 1,
+					BuyNum: 1,
+					Consignee:"",
+					ConsigneeMobile:"",
+					BuyerMessage:"",
+					Sex:1,
 				},
-				btnStyle:{
-					height:"80rpx",
-					lineHeight:"80rpx",
-					borderRadius:"16rpx",
-					background:"#111",
-					color:"#FFF",
-					fontSize:"28rpx",
-					fontWeight:"600",
-					width:'193rpx',
-				}
+				btnStyle: {
+					height: "80rpx",
+					lineHeight: "80rpx",
+					borderRadius: "16rpx",
+					background: "#111",
+					color: "#FFF",
+					fontSize: "28rpx",
+					fontWeight: "600",
+					width: '193rpx',
+				},
+				orderData: {},
+				orderInfo:{}
 			}
 		},
 		created() {
 			uni.setNavigationBarTitle({
-				title: "九寨沟星宇国际大酒店",
+				title: "订单填写",
 			});
 		},
+		methods:{
+			PeopleNumberChange(val){
+				this.order.PeopleNumber=val.value
+			},
+			BuyNumChange(val){
+				this.order.BuyNum=val.value
+			},
+			buy(){
+				if(!this.order.Consignee){
+						uni.showToast({
+							title: "请填写联系人",
+							icon: "none",
+						});
+						return
+				}
+				if(!this.order.ConsigneeMobile){
+						uni.showToast({
+							title: "请填写联系人电话",
+							icon: "none",
+						});
+						return
+				}
+				let data={
+					MealId:this.orderData.MealId,
+					DiningId:this.orderData.DiningId,
+					Unit_Price:this.orderData.Unit_Price,
+					Date:this.orderData.date,
+					PeopleNumber:this.order.PeopleNumber,
+					Final_Price:this.orderData.Unit_Price*this.order.BuyNum,
+					BuyerMessage:this.order.BuyerMessage,
+					Consignee:this.order.Consignee,
+					ConsigneeMobile:this.order.ConsigneeMobile,
+					Sex:this.order.Sex,
+					BuyNum:this.order.BuyNum,
+				}
+				uni.showLoading({
+				    title: '支付中...'
+				});
+				this.request2({
+						url: '/api/AppletDining/SetAppletDiningOrderInfo',
+						data: data
+					},
+					res => {
+						 uni.hideLoading();
+						if(res.resultCode===1){
+							let that=this
+							uni.requestSubscribeMessage({
+								tmplIds: res.data.template_message_list,
+								complete(_res) {
+									that.queren(res.data.OrderId)
+								}
+							});
+						}
+					},
+					err=>{
+						 uni.hideLoading();
+					}
+				);
+			},
+			queren(OrderId){
+				let url='/api/WeChatPay/GetDmcPayInfo'
+				let GoodsName = this.orderData.MealName
+					GoodsName = GoodsName.slice(0, 10)
+				this.request2({
+						url: url,
+						data: {
+							OrderId:OrderId,
+							GoodsName:GoodsName,
+							OrderPayType:1,
+							OpenId:uni.getStorageSync('mall_UserInfo').OpenId,
+						}
+					},
+					res => {
+						this.orderInfo = JSON.parse(res.data);
+						this.Pay()
+					}
+				);
+			},
+			Pay(){
+				let that=this;
+				uni.requestPayment({
+					provider: 'wxpay',
+					timeStamp: this.orderInfo.timeStamp,
+					nonceStr: this.orderInfo.nonceStr,
+					package: this.orderInfo.package,
+					signType: this.orderInfo.signType,
+					paySign: this.orderInfo.sign,
+					success: function(res) {
+						console.log('success', res);
+						uni.showToast({
+							title: "支付成功"
+						})
+						setTimeout(()=>{
+							uni.redirectTo({
+							    url: '/pages/jiuzhai/allorderList'
+							});
+						}, 100 )
+			
+					},
+					fail: function(err) {
+						console.log('fail:', err);
+						uni.showToast({
+							title: "支付失败"
+						})
+					}
+				});
+			},
+		},
+		onLoad(options) {
+			let obj = JSON.parse(decodeURIComponent(options.data))
+			this.orderData = obj
+			console.log("order", this.orderData)
+			// this.Final_Price=this.ticketdData.PeopleNumber*this.ticketdData.Unit_Price
+		},
 	}
 </script>

 <style>
-	.hotel-order{
+	.hotel-order {
 		color: #111111;
 		margin-bottom: 160rpx;
 	}
-	.opera-box{
+
+	.opera-box {
 		background-color: #FFF;
 		padding: 20rpx 45rpx 40rpx 45rpx;
 		position: fixed;
@@ -118,7 +258,8 @@
 		right: 0;
 		z-index: 5;
 	}
-	.opera-box .box{
+
+	.opera-box .box {
 		height: 100rpx;
 		background: #FFFFFF;
 		box-shadow: 0px 10rpx 30rpx 0px rgba(36, 36, 36, 0.2);
@@ -127,69 +268,89 @@
 		align-items: center;
 		padding: 0 10rpx 0 36rpx;
 	}
-	.opera-box .box .price{
+
+	.opera-box .box .price {
 		font-size: 40rpx;
 		font-weight: 500;
 		color: #D91818;
 		margin-right: 20rpx;
+		line-height: 86rpx;
+		height: 100%;
 	}
-	.opera-box .box .sum-detail{
+
+	.opera-box .box .sum-detail {
 		font-size: 24rpx;
 		flex: 1;
 		font-weight: 500;
 		color: #6E6E6E;
 	}
-	.hotel-order .red{
-		color:#D91818 !important
+
+	.hotel-order .red {
+		color: #D91818 !important
 	}
-	.hotel-order .grey{
-		color:#6E6E6E !important
+
+	.hotel-order .grey {
+		color: #6E6E6E !important
 	}
-	.hotel-order .form{
+
+	.hotel-order .form {
 		margin-top: 60rpx;
-		padding:0 45rpx;
+		padding: 0 45rpx;
 	}
-	.hotel-order .form .form-items{
+
+	.hotel-order .form .form-items {
 		margin-bottom: 40rpx;
 		display: flex;
 		align-items: center;
 		padding-bottom: 36rpx;
-		border-bottom:1px solid #f5f5f5;
+		border-bottom: 1px solid #f5f5f5;
 		font-size: 28px;
 		font-weight: 500;
 	}
-	.hotel-order .form .form-items:last-child{
+
+	.hotel-order .form .form-items:last-child {
 		border-bottom: none;
 	}
-	.hotel-order .form .form-items .label{
+
+	.hotel-order .form .form-items .label {
+		white-space: nowrap;
+		text-align: justify ;
+		text-align-last: justify;
+		width: 115rpx;
 		font-size: 28rpx;
 		font-weight: 600;
-		margin-right: 60rpx;
-		flex-shrink: 0;
+		margin-right: 20rpx;
+		/* flex-shrink: 0; */
 	}
-	.hotel-order .form .form-items .val{
-		flex:1;
+
+	.hotel-order .form .form-items .val {
+		flex: 1;
 	}
-	.hotel-order .sheshi{
+
+	.hotel-order .sheshi {
 		margin-top: 50rpx;
 	}
-	.hotel-order .sheshi .she-title{
+
+	.hotel-order .sheshi .she-title {
 		font-size: 28rpx;
 		font-weight: 800;
 	}
-	.hotel-order .sheshi .she-content{
+
+	.hotel-order .sheshi .she-content {
 		margin-top: 24rpx;
 	}
-	.hotel-order .sheshi .she-content text{
-		
+
+	.hotel-order .sheshi .she-content text {
+
 		font-size: 24rpx;
 		font-weight: 500;
 		color: #4A4A4A;
 		line-height: 40rpx;
 		margin-right: 24rpx;
 	}
-	.hotel-order .form .form-items .val input{
-		border:none;
+
+	.hotel-order .form .form-items .val input {
+		border: none;
 		padding: 0;
 		margin: 0;
 		outline: none;
@@ -199,81 +360,97 @@
 		font-weight: 500;
 		width: 100%;
 	}
-	
+
 	.hotel-order .king {
 		color: #DFBE6E !important;
 	}
+
 	.hotel-order .f12 {
-		font-size:24rpx !important;
+		font-size: 24rpx !important;
 	}
+
 	.f11 {
-		font-size:22rpx !important;
+		font-size: 22rpx !important;
 	}
+
 	.hotel-order .f14 {
-		font-size:28rpx !important;
+		font-size: 28rpx !important;
 	}
+
 	.hotel-order .regular {
 		font-weight: 500 !important;
 	}
-	.hotel-order .flex{
+
+	.hotel-order .flex {
 		display: flex;
 		align-items: center;
 	}
-	.hotel-order .empty-block{
+
+	.hotel-order .empty-block {
 		height: 20rpx;
 		background: #ECF1F4;
 	}
-	.hotel-order .flex-wrap{
+
+	.hotel-order .flex-wrap {
 		flex-wrap: wrap;
 	}
-	.hotel-order .o-head{
+
+	.hotel-order .o-head {
 		padding: 45rpx;
 		background: #FFFFFF;
 		box-shadow: 0px 2rpx 15rpx 0px rgba(76, 76, 76, 0.13);
 		border-radius: 0px 0px 60rpx 60rpx;
 	}
-	.hotel-order .o-head .o-timer{
+
+	.hotel-order .o-head .o-timer {
 		height: 100rpx;
 		background: #ECF1F4;
 		border-radius: 20rpx;
 		padding: 0 40rpx;
 	}
-	.hotel-order .o-head .o-timer .time-item{
+
+	.hotel-order .o-head .o-timer .time-item {
 		font-size: 32rpx;
 		font-weight: 800;
-		flex:1;
+		flex: 1;
 	}
-	.hotel-order .o-head .o-timer .time-item:last-child{
+
+	.hotel-order .o-head .o-timer .time-item:last-child {
 		text-align: right;
 	}
-	.hotel-order .o-head .o-timer .time-split{
+
+	.hotel-order .o-head .o-timer .time-split {
 		font-size: 24rpx;
 		font-weight: 400;
 		text-align: center;
 	}
-	.hotel-order .o-head .room-name{
+
+	.hotel-order .o-head .room-name {
 		font-size: 32rpx;
 		font-weight: bold;
 		margin-top: 40rpx;
 		margin-bottom: 10rpx;
 	}
-	.hotel-order .o-head .room-remark{
+
+	.hotel-order .o-head .room-remark {
 		font-size: 28rpx;
 		font-weight: 500;
-		padding-bottom:30rpx;
+		padding-bottom: 30rpx;
 		margin-bottom: 30rpx;
 		border-bottom: 1px solid #E7E7E7;
 	}
-	.hotel-order .o-head .rule{
+
+	.hotel-order .o-head .rule {
 		font-size: 22rpx;
 		font-weight: 500;
 		color: #6E6E6E;
 		margin-top: 18rpx;
 	}
+
 	.hotel-order .big-title {
 		position: relative;
 	}
-	
+
 	.hotel-order .big-title::before {
 		display: block;
 		width: 71rpx;
@@ -281,12 +458,13 @@
 		background: #DFBE6E;
 		border-radius: 4rpx;
 		content: ' ';
-	
+
 		position: absolute;
 		left: 0;
 		bottom: 6rpx;
 		z-index: 1;
 	}
+
 	.hotel-order .big-title text {
 		font-size: 34rpx;
 		font-weight: bold;
@@ -294,4 +472,9 @@
 		position: relative;
 		z-index: 2;
 	}
+	.Meal-date{
+		font-size: 24rpx;
+		font-family: PingFang SC;
+		color: #999999;
+	}
 </style>
--- a/pages/ticketCoupons/components/buyNotice.vue
+++ b/pages/ticketCoupons/components/buyNotice.vue
@@ -34,7 +34,7 @@
 							可订时间
 						</view>
 						<view class="item-desc">
-							可订今日
+							{{TicketData.AllTime}}
 						</view>
 					</view>
 					<view class="detail-info-item" v-if="TicketData.OutTicket">
@@ -42,7 +42,7 @@
 							出票速度
 						</view>
 						<view class="item-desc">
-							平均2秒出票
+							{{TicketData.OutTicket}}
 						</view>
 					</view>
 					<view class="detail-info-item" v-if="TicketData.ChangeTickets">
@@ -50,7 +50,7 @@
 							无需换票
 						</view>
 						<view class="item-desc">
-							无需换票，持【身份证】直接进入
+							{{TicketData.ChangeTickets}}
 						</view>
 					</view>
 					<!-- 退票政策 -->
@@ -125,7 +125,7 @@
 					<view class="detail-btn">
 						<view class="price">
 							<text class="price-pre">￥</text>
-							{{TicketData.HPriceB}}
+							{{$utils.getretailer()==true? TicketData.HPriceB:TicketData.HPriceC}}   
 						</view>
 						<view class="btn" @click="success">
 							立即预订
@@ -175,6 +175,9 @@
 				}
 			}
 		},
+		mounted() {
+			console.log(this.TicketData)
+		},
 		methods: {
 			goUrl() {
 				uni.navigateTo({
@@ -318,6 +321,7 @@
 					margin-right: 45rpx;
 					text-align: center;
 					line-height: 38rpx;
+					overflow: hidden;
 				}
 				.item2-name {
 					width: 120rpx;
@@ -331,6 +335,7 @@
 					margin-right: 45rpx;
 					text-align: center;
 					line-height: 38rpx;
+					overflow: hidden;
 				}

 				.item-desc {

--- a/pages/ticketCoupons/components/subscribeTicket.vue
+++ b/pages/ticketCoupons/components/subscribeTicket.vue
@@ -129,11 +129,12 @@
 						data.forEach(x => {
 								let obj = {}
 								obj.date = x.Year+'-'+x.Month+'-'+x.Day;
-								// if(x.IsHavePrice==1){
-									obj.price = x.HPriceB;
-								// }else{
-								// 	obj.price = "";
-								// }
+								if(x.IsHavePrice==1){
+								 let p=this.$utils.getretailer()==true? x.HPriceB:x.HPriceC   
+									obj.price =p ;
+								}else{
+									obj.price = "";
+								}
 								datePrice.push(obj)
 						})
 						this.datePrice = datePrice

--- a/pages/ticketCoupons/detail.vue
+++ b/pages/ticketCoupons/detail.vue
@@ -6,7 +6,7 @@
 					style="position: fixed;top: 0;left: 0;z-index: 9; padding-left: 6rpx;">
 					<u-icon name="arrow-left" size="44" color="#000" style="margin-top: 22rpx;"></u-icon>
 				</view>
-				<image class="banner-img" :src="imgBaseUrl+details.AllPicList[0].TagPicList[0].Path" mode="aspectFit"
+				<image class="banner-img" :src="details.AllPicList[0].TagPicList[0].Path" mode="aspectFit"
 					@click="goUrl('/pages/ticketCoupons/imgList')"></image>
 			</view>
 			<view class="ticket-title" :style="[titleStyleFix]">
@@ -100,7 +100,7 @@

 						</view>
 						<view>
-							<view class="no-data" v-if="details.mealList.length==0">
+							<view class="no-data" v-if="details.mealList.length===0">
 								<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/no-data.png" mode="aspectFit" class="no-data-img"></image>
 								<view class="zhanwu">
 									暂无数据
@@ -119,7 +119,8 @@
 											{{_item.TicketName}}
 										</view>
 										<view class="price">
-											<text class="price-pre">￥</text>{{_item.HPriceB}}<text
+											<text class="price-pre">￥</text>{{$utils.getretailer()==true? _item.HPriceB:_item.HPriceC}}   
+<text
 												class="price-nex">起</text>
 										</view>
 										<view class="tag">

--- a/pages/ticketCoupons/imgList.vue
+++ b/pages/ticketCoupons/imgList.vue
@@ -8,7 +8,7 @@
 		  <view class="img-list-box">
 			<view v-for="(item,index) in dataList.TagPicList" :key="item.ID" class="img-list-item" @click="">
 				<view class="img-box" @click="previewImage(index,item.Path)" v-if="item.type==='image'">
-					<image :src="imgBaseUrl+item.Path" mode="aspectFit"></image>
+					<image :src="imgBaseUrl+item.Path" mode="aspectFit" :style="{'margin-right':index%2 ==0?'20rpx':0}"></image>
 				</view>	
 				<view class="img-box" style="position: relative" v-if="item.type==='video'">
 					<video id="myVideo" :src="imgBaseUrl+item.Path"
@@ -167,9 +167,13 @@
 					background-color: #E7E7E7;
 					border-radius: 20rpx;
 					overflow: hidden;
+					display: flex;
+					justify-content: space-between;
 					image{
 						width: 100%;
 						height: 100%;
+						// margin-right: 20rpx;
+						margin-bottom: 20rpx;
 					}
 					#myVideo{
 						width: 100%;

--- a/pages/ticketCoupons/list.vue
+++ b/pages/ticketCoupons/list.vue
@@ -73,7 +73,7 @@
 						</view>
 					</view>
 					<view class="SalesPrice">
-						<text class="SalesPrice-pre">￥</text>{{item.SalesPrice}}<text class="SalesPrice-nex">起</text>
+						<text class="SalesPrice-pre">￥</text>{{$utils.getretailer()==true? item.B2BPrice:item.B2CPrice}}<text class="SalesPrice-nex">起</text>
 					</view>
 				</view>
 			</view>