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()
@@ -589,10 +593,20 @@
 		},
 		methods: {
 			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({
+				let that= this
+				uni.requestSubscribeMessage({
+					tmplIds: that.details.template_message_list,
+					complete(_res) {
+						console.log(_res)
+						that.request2({
 								url: '/api/AppletCar/SetAppletCarOrderInfo',
-						data: this.addMsg
+								data: that.addMsg
 							},
 							res => {
 								uni.hideLoading()
 								if (res.resultCode == 1) {
-							this.queren(res.data)
+									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"

--- 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
--- 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, '数据');
+							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
@@ -9,57 +9,93 @@
 			<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;
@@ -147,23 +192,24 @@
 		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
--- 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
--- 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>