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

components/pay/pay.vue

@@ -82,8 +82,12 @@ export default {
 							url: '/pages/reserve/offline-success?payInfo='+JSON.stringify(that.payInfo)
 						});
 					}else{
-						uni.navigateTo({
-							url: '/pages/order-submit/pay-success?payInfo='+JSON.stringify(that.payInfo)
+						// uni.navigateTo({
+						// 	url: '/pages/order-submit/pay-success?payInfo='+JSON.stringify(that.payInfo)
+						// });
+						
+						uni.reLaunch({
+						    url: '/pages/jiuzhai/paysuccess?PreferPrice='+that.payInfo.total_price+'&isFrom=2'
 						});
 					}
 					

pages/guidecar/bookaCarList.vue

@@ -59,7 +59,7 @@
 			}
 
 			.box-rili-item {
-				// width: 50px;无效
+				width: 50px;//无效
 				height: 50px;
 				border-radius: 10px;
 				font-size: 13px;
@@ -330,11 +330,17 @@
 		</view>
 		<view class="box-rili">
 			<view class="box-rili-scroll">
-				<view class="box-rili-item" :class="{'box-rili-item2':msg.Q_Date == x.date}"
-					v-for="(x,y) in topdateList" :key='y' @click="choicedatelist(x)">
-					<span style='width: 50px;display: inline-block;text-align: center;'>{{x.showdate}}</span>
-					<span>{{x.week}}</span>
-				</view>
+				
+				<scroll-view :scroll-x='true' style="width: 100%;" @scroll='getscroll'  :scroll-left="scrollleft">
+					<view style="display: flex;align-items: center;">
+						<view class="box-rili-item" :class="{'box-rili-item2':msg.Q_Date == x.date}"
+							v-for="(x,y) in topdateList" :key='y' @click="choicedatelist(x)">
+							<span style='width: 50px;display: inline-block;text-align: center;'>{{x.showdate}}</span>
+							<span>{{x.week}}</span>
+						</view>
+					</view>
+					
+				</scroll-view>
 			</view>
 			<view class="porili" @click="showcalendar = true">
 				<image
@@ -565,6 +571,7 @@
 					StartDate:'',
 					EndDate:'',
 				},
+				scrollleft:0
 				
 			}
 			
@@ -581,7 +588,9 @@
 				this.msg.ArriveCityType = this.carMsg.ArriveCityType;
 				this.msg.Q_Date = this.carMsg.Q_Date;
 			}
-			
+			   this.$nextTick(function() {
+			        this.scrollleft = 0
+			    });
 			this.mainColor = this.$uiConfig.mainColor;
 			this.gettimeList()
 			this.init();
@@ -591,7 +600,10 @@
 			});
 
 		},
-		methods: {
+		methods: {
+			getscroll(e){
+				console.log(e.detail.scrollLeft)
+			},
 			yuding(x){
 				this.u = uni.getStorageSync("mall_UserInfo");
 				if (!this.u) {
@@ -625,7 +637,8 @@
 				let nowtime = date1.getFullYear() + "-" + (date1.getMonth() + 1) + "-" + date1.getDate();
 				let htime = date2.getFullYear() + "-" + (date2.getMonth() + 1) + "-" + date2.getDate();
 				this.topdateList = this.getDayAll(nowtime, htime)
-				this.startDate = nowtime
+				this.startDate = nowtime;
+				this.getscollwz()
 
 			},
 			getDayAll(starDay, endDay) { //根据2个时间段获取之间的所有日期
@@ -695,6 +708,26 @@
 				this.msg.pageIndex = 1;
 				this.g = [];
 				this.init()
+				this.getscollwz()
+			},
+			getscollwz(){//在日历上选择了列表上滚动
+				let index = 0
+				this.topdateList.map((x,i)=>{
+					if(x.date == this.msg.Q_Date){
+						index = i;
+						console.log(index)
+						return
+					}
+				})
+				if(index>3){
+					this.$nextTick(function() {
+					     this.scrollleft = (index-2)*58
+					 });
+				}else{
+					this.$nextTick(function() {
+					     this.scrollleft = 0
+					 });
+				}
 			},
 			getclose() {
 				this.showcalendar = false;

pages/guidecar/map.vue

 <template>
 	<view class="map">
-		<map id="navmap" style="width: 100%;height: 600px;"  :markers="markers"   :latitude="src_latitude" :longitude="src_longitude"
+		<map id="navmap" style="width: 100%;height: 600px;"  :markers="markers"   :latitude="src_latitude" :longitude="src_longitude" :scale="scale" 
 		          :hidden="false">  
 		        </map>
 		<view class="liststyle" v-if="details.type==1">
@@ -30,6 +30,7 @@
 				upcar:[],
 				downcar:[],
 				mainColor:'',
+				scale:9
 			}
 		},
 		onReady(){

pages/guidecar/orderList.vue

@@ -257,7 +257,7 @@
 			}, 1000);
 		},
 		onLoad(option) {
-			this.current = option.status || -1;
+			this.current = option.status || 0;
 			this.getHeadList();
 			this.payInfo.OpenId = uni.getStorageSync('mall_UserInfo').OpenId;
 			this.u = uni.getStorageSync("mall_UserInfo");

pages/hotel/order.vue

@@ -159,9 +159,7 @@
 			}
 		},
 		created() {
-			uni.setNavigationBarTitle({
-				title: this.HotelInfo.HotelName
-			});
+		
 		},
 		onLoad(options) {
 			if(options.RoomInfo){
@@ -173,9 +171,6 @@
 			if(options.dayObj){
 				this.dayObj = JSON.parse(options.dayObj)
 			}
-			console.log(this.RoomInfo,'RoomInfo');
-			console.log(this.HotelInfo,'HotelInfo');
-			console.log(this.dayObj,'dayObj');
 			this.rMsg.HotelId = this.HotelInfo.HotelId;
 			this.rMsg.productId = this.RoomInfo.ID;
 			this.rMsg.StartDate = this.dayObj.start;
@@ -184,7 +179,9 @@
 			this.orderMsg.Unit_Price = this.RoomInfo.B2BPrice;
 			this.orderMsg.StartDate = this.dayObj.start;
 			this.orderMsg.EndDate = this.dayObj.end;
-			
+			uni.setNavigationBarTitle({
+				title: this.HotelInfo.HotelName
+			});
 			this.CalTotalPrice();
 			this.getRoomPrice();
 		},
@@ -230,7 +227,7 @@
 			CalTotalPrice(){
 				this.orderMsg.Final_Price=0;
 				this.priceList.forEach(x=>{
-					if(this.$utils.getretailer){
+					if(this.$utils.getretailer()){
 						this.orderMsg.Final_Price += parseInt(this.orderMsg.RoomNumber)*x.B2BPrice;
 					}else{
 						this.orderMsg.Final_Price += parseInt(this.orderMsg.RoomNumber)*x.SalesPrice;
@@ -313,7 +310,7 @@
 						})
 						setTimeout(()=>{
 							uni.redirectTo({
-							    url: '/pages/jiuzhai/allorderList'
+							  url: '/pages/jiuzhai/paysuccess?PreferPrice='+that.orderMsg.Final_Price
 							});
 						}, 100 )
 					},
@@ -322,6 +319,11 @@
 						uni.showToast({
 							title: "支付失败"
 						})
+						setTimeout(()=>{
+							uni.redirectTo({
+							    url: '/pages/jiuzhai/allorderList'
+							});
+						}, 100 )
 					}
 				});
 			},

pages/jiuzhai/allorderdetails.vue

@@ -254,11 +254,18 @@
 				<view class="box-c-car">
 					<view class="box-c-caritem">
 						<view class="box-c-caritem-l">上车地点</view>
-						<view class="box-c-caritem-r" @click="goopenlocation(x.DepartLonlat)">{{x.DepartAddress}}</view>
+						<view class="box-c-caritem-r" @click="goopenlocation(x.DepartLonlat)" style="display: flex;align-items: flex-start;justify-content: flex-end;">
+							<u-icon name="location-o" size="34"></u-icon>
+							{{x.DepartAddress}}
+						</view>
 					</view>
 					<view class="box-c-caritem">
 						<view class="box-c-caritem-l">下车地点</view>
-						<view class="box-c-caritem-r" @click="goopenlocation(x.ArriveLonlat)">{{x.ArriveAddress}}</view>
+						<view class="box-c-caritem-r" @click="goopenlocation(x.ArriveLonlat)" style="display: flex;align-items: flex-start;justify-content: flex-end;">
+							<u-icon name="location-o" size="34"></u-icon>
+							{{x.ArriveAddress}}
+						</view>
+						
 					</view>
 					<view class="xian"></view>
 					<view class="box-c-caritem">
@@ -304,12 +311,12 @@
 					<view class="box-c-caritem-l">付款方式</view>
 					<view class="box-c-caritem-r">{{OrderInfo.PaymentWayName}}</view>
 				</view>
-				<view class="box-c-caritem" >
+				<!-- <view class="box-c-caritem" >
 					<view class="box-c-caritem-l">应收</view>
 					<view class="box-c-caritem-r">￥{{OrderInfo.PreferPrice}}元</view>
-				</view>
+				</view> -->
 				<view class="box-c-caritem" >
-					<view class="box-c-caritem-l">实收</view>
+					<view class="box-c-caritem-l">金额</view>
 					<view class="box-c-caritem-r"><span style='color:#F20707'>￥{{OrderInfo.Income}}元</span></view>
 				</view>
 			</view>

pages/jiuzhai/jz_Line.vue

@@ -514,6 +514,7 @@
 					"天数日期",
 					"出发城市"
 				],
+				CityId:0
 			};
 		},
 		created() {
@@ -534,8 +535,9 @@
 							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
+							this.msg.companyId = this.branchList[0].BId;
+							this.currentBrachName = this.branchList[0].BName;
+							this.CityId = this.branchList[0].CityId;
 						}
 					},
 					null
@@ -544,6 +546,7 @@
 			changeBranch(val) {
 				this.msg.companyId = this.branchList[val].BId
 				this.currentBrachName = this.branchList[val].BName
+				this.CityId = this.branchList[val].CityId;
 				this.research();
 			},
 			setDays(day) {
@@ -707,7 +710,7 @@
 			//跳转至详情
 			goJzDetail(tcid, configId) {
 				uni.navigateTo({
-					url: "/pages/jiuzhai/jz_LineDetail?tcid=" + tcid + '&configId=' + configId
+					url: "/pages/jiuzhai/jz_LineDetail?tcid=" + tcid + '&configId=' + configId + '&cityId=' + this.CityId
 				});
 			},
 			//获取第一张图

pages/jiuzhai/jz_LineDetail.vue

@@ -138,6 +138,41 @@
 			</view>
 			<view class="jz_Zhankai" style="display:none;">展开全部</view>
 		</view>
+		<view class="jz_TripDays">
+			<span style="display: inline-block;position: relative;margin-bottom:40rpx;">
+				<text style="position: relative;z-index: 2; color:#1F1F1F;font-size:36rpx;font-weight:bold;">往返交通</text>
+				<span style="width:40px;background-color: #DFBE6E;height: 6px;bottom: 2px;left: 0;right: 0;position: absolute;z-index: 1;"></span>
+			</span>
+			<view class="jz_TripMain">
+				<view>
+					<view class="jz_Flight" v-for="(fItem,fIndex) in dataList.currentPriceInfo.priceFlight" :key="fIndex">
+						<view class="jz_FlightItem">
+							<view style="width:150rpx;">
+								<view class="jz_FlightTitle">{{fItem.departureAirPortName}}</view>
+								<view class="jz_FlightBottom">{{fItem.departureTime}}</view>
+							</view>
+							<view class="jz_FlightIcon">
+								<view style="display: flex;align-items: center;font-size:24rpx;">
+									<img v-if="fItem.trafficType==1" style="width:30rpx;height:30rpx;" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/airfly.png" alt="" />
+									<img v-if="fItem.trafficType==2" style="width:30rpx;height:30rpx;" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/train.png" alt="" />
+									<view style="margin-left:10rpx;">{{fItem.flightNumber}}</view>
+								</view>
+								<view class="jz_Arrow">
+									<img style="width:110rpx;height:8rpx;" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/b_arrow.png" />
+								</view>
+								<view class="jz_StartDate">
+									{{getFlightDay(fItem.startDate)}}
+								</view>
+							</view>
+							<view style="width:150rpx;">
+								<view class="jz_FlightTitle">{{fItem.arrivalAirPortName}}</view>
+								<view class="jz_FlightBottom">{{fItem.arrivalTime}}</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
 		<view class="jz_TripDays">
 			<span style="display: inline-block;position: relative;margin-bottom:40rpx;">
 				<text style="position: relative;z-index: 2; color:#1F1F1F;font-size:36rpx;font-weight:bold;">行程特色</text>
@@ -348,7 +383,8 @@
 				delMsg: {
 					tcid: 0,
 					configId: 0,
-					tcnum:''
+					tcnum:'',
+					cityId:0
 				},
 				scenicNum: 0, // 景点数量
 				breakfastNum: 0, //早餐数
@@ -366,9 +402,10 @@
 			
 		},
 		onLoad(option) {
-			if (option.tcid && option.configId) {
+			if (option.tcid && option.configId && option.cityId) {
 				this.delMsg.tcid = option.tcid;
 				this.delMsg.configId = option.configId;
+				this.delMsg.cityId = option.cityId;
 				this.getDetails();
 			}
 			let that = this
@@ -491,6 +528,12 @@
 					return Myday[1] + '-' + Myday[2]
 				}
 			},
+			getFlightDay(day){
+				if (day) {
+					let Myday = day.split('-');
+					return Myday[1] + '月' + Myday[2] + '日'
+				}
+			},
 			//点击切换
 			getDayInfo(item){
 				if(this.crCount+this.etCount+this.etbCount>=this.currentPrice.totalSeat){
@@ -540,6 +583,40 @@
 	};
 </script>
 <style>
+	.jz_FlightItem{
+		display: flex;
+		justify-content: space-between;
+		width:90%;
+		margin:auto;
+		margin-bottom:45rpx;
+	}
+	.jz_FlightTitle{
+		color:#999999;
+		font-size:24rpx;
+	    white-space: nowrap;
+		text-overflow: ellipsis;
+		overflow: hidden;
+		word-break: break-all;
+	}
+	.jz_Arrow{
+		position: absolute;
+		top: 17rpx;
+	}
+	.jz_StartDate{
+		color:#999999;
+		font-size:24rpx;
+		margin-top:25rpx;
+	}
+	.jz_FlightBottom{
+		color:#111111;
+		font-size:26rpx;
+		margin-top:10rpx;
+	}
+	.jz_FlightIcon{
+		text-align: center;
+		position: relative;
+		flex-shrink: 0;
+	}
 	.jz_LineDetail {
 		background-color: #ECF1F4;
 		padding-bottom:70px;
@@ -993,4 +1070,8 @@
 		border: none!important;
 		height:auto!important;
 	}
+	.jz_Flight{
+		display: flex;
+		justify-content: space-between;
+	}
 </style>
\ No newline at end of file

pages/jiuzhai/jz_MyOrder.vue

@@ -65,9 +65,6 @@
 	}
 
 	.jz_Zailai {
-		position: absolute;
-		right: 40rpx;
-		bottom: 20rpx;
 		background-color: #111111;
 		border-radius: 16px;
 		width: 150rpx;
@@ -81,6 +78,13 @@
 	.isShowAll {
 		height: auto;
 	}
+	.jz_BtnContent{
+		margin-top:15px;
+		right:40rpx;
+		bottom:20rpx;
+		display:flex;
+		justify-content: flex-end;
+	}
 </style>
 <template>
 	<view class="jz_MyOrder">
@@ -99,7 +103,7 @@
 								<u-icon name="arrow-up" @click="getShow(item)" v-else color="#2979ff" size="28"></u-icon>
 							</view>
 							<view class="jz-Oright">
-								{{item.orderStateName}}
+								{{item.orderStateName=='占位'?'待付款':item.orderStateName}}
 							</view>
 						</view>
 						<view style="display:flex;">
@@ -111,8 +115,12 @@
 								<view style="margin-top:22rpx;">付款总额：¥{{item.preferPrice}}</view>
 							</view>
 						</view>
-						<view class="jz_Zailai" style="right:90px;" @click="gojz_List">再来一单</view>
-						<view class="jz_Zailai" style="width:60px;" @click="goCancel(item)">取消</view>
+						<view v-if="item.isApplyForCancel==1" style="color:red;font-size:24rpx;margin-left:122rpx;">订单取消，正在确认中！</view>
+						<view class="jz_BtnContent">
+							<view class="jz_Zailai" style="margin-right:10rpx;" @click="gojz_List">再来一单</view>
+							<view v-if="item.orderState==2" class="jz_Zailai" style="width:110rpx;margin-right:10rpx;" @click="goZhifu(item)">付款</view>
+							<view v-if="item.isApplyForCancel!=1" class="jz_Zailai" style="width:110rpx;" @click="goCancel(item)">取消</view>
+						</view>
 					</view>
 				</scroll-view>
 			</view>
@@ -141,8 +149,11 @@
 					name: '待付款',
 					Id:2
 				}, {
-					name: '已付款',
+					name: '已完成',
 					Id:1
+				},{
+					name: '已取消',
+					Id:4
 				}],
 				current: 0,
 				dataList: [],
@@ -153,6 +164,7 @@
 					nomore: "没有更多了",
 				},
 				status: "加载中",
+				price:0
 			};
 		},
 		created() {
@@ -201,6 +213,10 @@
 				this.getOrderInfo(1);
 			},
 			getOrderInfo(type) {
+				uni.showLoading({
+					title:'加载中',
+					icon:'none'
+				})
 				if(type==1){
 					this.dataList=[];
 				}
@@ -208,6 +224,7 @@
 				this.msg.MiniAppUserId = this.userInfo.UserId
 				this.apipost("sellorder_post_GetMiniAppTravelOrderList", this.msg,
 					res => {
+						uni.hideLoading();
 						if (res.resultCode == 1) {
 							console.log(res, '数据');
 							if(type==1){
@@ -258,7 +275,6 @@
 					this.apipost("sellorder_post_AppletUserCancelOrder", msg ,
 						res => {
 							if (res.resultCode == 1) {
-								console.log(res, '数据');
 								uni.showToast({
 									title: '操作成功',
 									icon: 'success',
@@ -272,6 +288,55 @@
 						null
 					);
 				}
+			},
+			//付款
+			goZhifu(item){
+				console.log(item,'item');
+				let url='/api/WeChatPay/GetTravlePayInfo'
+				let GoodsName = item.title;
+					GoodsName = GoodsName.slice(0, 10);
+				this.price = item.preferPrice;
+				this.request2({
+						url: url,
+						data: {
+							OrderId:item.orderId,
+							GoodsName:GoodsName,
+							OrderPayType:1,
+							OpenId:uni.getStorageSync('mall_UserInfo').OpenId,
+						}
+					},
+					res => {
+						let orderInfo = JSON.parse(res.data);
+						this.goPay(orderInfo)
+					}
+				);
+			},
+			goPay(orderInfo){
+				let that=this;
+				uni.requestPayment({
+					provider: 'wxpay',
+					timeStamp: orderInfo.timeStamp,
+					nonceStr: orderInfo.nonceStr,
+					package: orderInfo.package,
+					signType: orderInfo.signType,
+					paySign: orderInfo.sign,
+					success: function(res) {
+						console.log('success', res);
+						uni.showToast({
+							title: "支付成功"
+						})
+						//todo
+						uni.redirectTo({
+						  url: '/pages/jiuzhai/paysuccess?PreferPrice='+that.price+'&isFrom=1'
+						});
+					},
+					fail: function(err) {
+						console.log('fail:', err);
+						uni.showToast({
+							title: "支付失败"
+						})
+					}
+				});
 			}
 		}
 

pages/jiuzhai/jz_SureOrder.vue

@@ -199,13 +199,18 @@
 							title: "支付成功"
 						})
 						//todo
-				
+						uni.redirectTo({
+						  url: '/pages/jiuzhai/paysuccess?PreferPrice='+that.orderData.PreferPrice+'&isFrom=1'
+						});
 					},
 					fail: function(err) {
 						console.log('fail:', err);
 						uni.showToast({
 							title: "支付失败"
 						})
+						uni.redirectTo({
+						   url: '/pages/jiuzhai/jz_MyOrder'
+						});
 					}
 				});
 			}

pages/jiuzhai/paysuccess.vue

@@ -38,6 +38,7 @@
 				showCoupons: false,
 				couponMessage: '',
 				PreferPrice:'',
+				isLineOrder:0,
 			};
 		},
 		onLoad(option) {
@@ -50,14 +51,27 @@
 			this.mainColor = this.$uiConfig.mainColor;
 			this.themCustomStyle.color = this.mainColor;
 			this.themCustomStyle.borderColor = this.mainColor;
-			
+			if(option.isFrom){
+				this.isLineOrder=option.isFrom
+			}
 		},
 		methods: {
 		
 			redictToOrders() {
-				uni.redirectTo({
-				    url: '/pages/jiuzhai/allorderList'
-				});
+				if(this.isLineOrder==0){
+					uni.redirectTo({
+					    url: '/pages/jiuzhai/allorderList'
+					});
+				}else if(this.isLineOrder==1){
+					uni.redirectTo({
+					    url: '/pages/jiuzhai/jz_MyOrder'
+					});
+					
+				}else if(this.isLineOrder==2){//司导订单
+					uni.redirectTo({
+					    url: '/pages/guidecar/orderList'
+					});
+				}
 			},
 			goHome() {
 				uni.reLaunch({

pages/restaurant/components/buyNotice.vue

@@ -12,14 +12,16 @@
 			<text class="ticket-title-bg"></text>
 		</view>
 		<view class="meal-con">
-			{{mealData.MealDesc}}
+			<text v-if="mealData.MealDesc">{{mealData.MealDesc}}</text>
+			<text v-else class="zanwu">暂无</text>
 		</view>
 		<view class="ticket-title">
 			购买须知
 			<text class="ticket-title-bg"></text>
 		</view>
 		<view class="buy-notice-con">
-			<rich-text :nodes="mealData.OtherTag"></rich-text>
+			<rich-text :nodes="mealData.OtherTag" v-if="mealData.OtherTag"></rich-text>
+			<text v-else class="zanwu">暂无</text>
 		</view>
 		<view class="btn-box">
 			<view class="price">
@@ -163,4 +165,10 @@
 			}
 		}
 	}
+	.zanwu{
+		    font-size: 28rpx;
+		    font-family: PingFang SC;
+		    font-weight: 400;
+		    color: #999999;
+	}
 </style>

pages/restaurant/components/package-good.vue

 <template>
 	<view class="package-good">
 		<view class="rm-left">
-			<image :src="data.MealPic" mode="aspectFit">
+			<image :src="data.MealPic" mode="aspectFill">
 			</image>
 		</view>
 		<view class="rm-right">

pages/restaurant/components/restaurant-type.vue

@@ -145,11 +145,11 @@
 			changeHandler(i) {
 				this.tid = i;
 				this.sd = this.d[this.tid].ChildrenList;
+				this.currentObj=this.d[i]
 			},
 			clickHandler(item) {
 				this.currentObj=item
 				this.currentObj.active=this.active
-				console.log(this.currentObj)
 				// let Id1 = this.d[this.tid].ID;
 				// let Id2 = item.ID;
 				// let CategoryIds = Id2;

pages/restaurant/components/uni-calendar/uni-calendar.vue

@@ -268,6 +268,20 @@
 			 */
 			choiceDate(weeks) {
 				if (weeks.disable) return
+				let resDay=Date.parse(weeks.fullDate);
+				let now=new Date();
+				now.setHours(0);//设置小时
+				now.setMinutes(0);//设置分钟
+				now.setSeconds(0);//设置秒
+				now.setMilliseconds(0);//设置毫妙
+				let today= now.getTime();
+				if(resDay<today){
+					uni.showToast({
+						title: "不能选择今天以前的日期",
+						icon: "none",
+					});
+					return
+				}
 				this.calendar = weeks
 				// 设置多选
 				this.cale.setMultiple(this.calendar.fullDate)

pages/restaurant/detail.vue

@@ -14,7 +14,7 @@
 				<view @click="goback">
 					<u-icon name="arrow-left" size="44"></u-icon>
 				</view>
-				<view style="flex: 1;margin-left: 30rpx; text-align: left;">{{details.Name}}</view>
+				<view style="flex: 1;margin-left: 30rpx; text-align: left;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">{{details.Name}}</view>
 			</view>
 			<view class="restaurant-content">
 				<view class="restaurant-base">
@@ -84,7 +84,7 @@
 					</view>
 
 
-					<ul class="title-style-one hr">
+					<ul class="title-style-one hr" v-if="details.FoodRecommendList.length>0">
 						<li v-for="(item,index) in details.FoodRecommendList" :key="index">
 							<view class="item-title regular">{{item.FoodName}}</view>
 						</li>
@@ -397,7 +397,7 @@
 	
 	.chooseDate {
 		width: 275rpx;
-		margin-top: 20rpx;
+		margin: 20rpx 0;
 		/* display: inline-block; */
 		/* height: 60rpx; */
 		background-color: #ECF1F4;

pages/restaurant/list.vue

@@ -172,7 +172,7 @@
 				showLoading: false,
 				status: "loadmore",
 				currentTypeObj: {
-					Id: -1,
+					ID: -1,
 					active: 0
 				},
 				foodType: [],
@@ -184,9 +184,6 @@
 			restaurantType
 		},
 		onLoad(options) {
-			if(options && options.Name){
-				this.msg.Name = options.Name
-			}
 			uni.setNavigationBarTitle({
 				title: "美食",
 			});
@@ -306,6 +303,7 @@
 			},
 			sureType(item) {
 				this.msg.FoodTypeIds = item.ID;
+				console.log(this.msg,item)
 				this.getFoodList();
 				this.closeDropdown();
 			},

pages/ticketCoupons/components/buyNotice.vue

@@ -71,17 +71,20 @@
 						</view>
 					</view>
 					<!-- 使用说明 -->
-					<view class="use-desc" v-if="TicketData.UseInstructionsList.length>0">
+					<view class="use-desc">
 						<view class="ticket-title">
 							使用说明
 							<text class="ticket-title-bg"></text>
 						</view>
-						<view v-for="(item,index) in TicketData.UseInstructionsList" :key="index">
+						<view class="zanwu" v-if="TicketData.UseInstructionsList.length===0||(TicketData.UseInstructionsList[0].title==''&&TicketData.UseInstructionsList[0].Dec=='')">
+							暂无
+						</view>
+						<view v-for="(item,index) in TicketData.UseInstructionsList" :key="index" v-if="TicketData.UseInstructionsList.length>0">
 							<view class="detail-info-item">
-								<view class="item2-name">
+								<view class="item2-name" v-if="item.title">
 									{{item.title}}
 								</view>
-								<view class="item-desc">
+								<view class="item-desc" v-if="item.Dec">
 									{{item.Dec}}
 								</view>
 							</view>
@@ -93,12 +96,15 @@
 							费用说明
 							<text class="ticket-title-bg"></text>
 						</view>
-						<view v-for="(item,index) in TicketData.PriceInstructionsList" :key="index">
+						<view class="zanwu" v-if="TicketData.PriceInstructionsList.length===0||(TicketData.PriceInstructionsList[0].title==''&&TicketData.PriceInstructionsList[0].Dec=='')">
+							暂无
+						</view>
+						<view v-for="(item,index) in TicketData.PriceInstructionsList" :key="index" v-if="TicketData.PriceInstructionsList.length>0">
 							<view class="detail-info-item">
-								<view class="item2-name">
+								<view class="item2-name" v-if="item.title">
 									{{item.title}}
 								</view>
-								<view class="item-desc">
+								<view class="item-desc" v-if="item.Dec">
 									{{item.Dec}}
 								</view>
 							</view>
@@ -106,17 +112,20 @@
 							
 					</view>
 					<!-- 其他信息 -->
-					<view class="other-desc">
+					<view class="other-desc" v-if="TicketData.OtherDescList.length>0">
 						<view class="ticket-title">
 							其他信息
 							<text class="ticket-title-bg"></text>
 						</view>
-						<view v-for="(item,index) in TicketData.OtherDescList" :key="index">
+						<view class="zanwu" v-if="TicketData.OtherDescList.length===0||(TicketData.OtherDescList[0].title==''&&TicketData.OtherDescList[0].Dec=='')">
+							暂无
+						</view>
+						<view v-for="(item,index) in TicketData.OtherDescList" :key="index" v-if="TicketData.OtherDescList.length>0">
 							<view class="detail-info-item">
-								<view class="item2-name">
+								<view class="item2-name" v-if="item.title">
 									{{item.title}}
 								</view>
-								<view class="item-desc">
+								<view class="item-desc" v-if="item.Dec">
 									{{item.Dec}}
 								</view>
 							</view>
@@ -307,11 +316,14 @@
 
 			.detail-info-item {
 				display: flex;
-				margin-bottom: 30rpx;
+				flex-wrap: wrap;
+				align-items: center;
+				margin-bottom: 20rpx;
 
 				.item-name {
-					width: 120rpx;
-					height: 40rpx;
+					// width: 120rpx;
+					// height: 40rpx;
+					padding: 8rpx;
 					background-color: #111111;
 					border-radius: 4rpx;
 					font-size: 24rpx;
@@ -324,8 +336,9 @@
 					overflow: hidden;
 				}
 				.item2-name {
-					width: 120rpx;
-					height: 40rpx;
+					// width: 120rpx;
+					// height: 40rpx;
+					padding: 8rpx;
 					background-color: #ECF1F4;
 					border-radius: 4rpx;
 					font-size: 24rpx;
@@ -333,28 +346,34 @@
 					font-weight: bold;
 					color: #111111;
 					margin-right: 45rpx;
+					margin-bottom: 20rpx;
 					text-align: center;
 					line-height: 38rpx;
 					overflow: hidden;
+					
 				}
 
 				.item-desc {
-					width: 500rpx;
+					// width: 500rpx;
 					font-size: 28rpx;
 					font-family: PingFang SC;
 					font-weight: 800;
 					color: #111111;
+					line-height: 28rpx;
+					// white-space: nowrap;
+					// overflow: hidden;
+					// text-overflow: ellipsis;
 				}
 			}
 
 			.method {
 				// width: 660rpx;
-				height: 225rpx;
+				// height: 225rpx;
 				background-color: #FCF8F0;
 				border-radius: 4rpx;
 				position: relative;
 				margin-top: 40rpx;
-				padding: 60rpx 0 0 25rpx;
+				padding: 60rpx 25rpx 25rpx 25rpx;
 				margin-bottom: 50rpx;
 
 				.method-title {
@@ -397,7 +416,7 @@
 					padding-left: 25rpx;
 					margin-bottom: 25rpx;
 					.tuipiao-name {
-						height: 40rpx;
+						// height: 40rpx;
 						background-color: #FFFFFF;
 						border: 1rpx solid #DFBE6E;
 						border-radius: 4rpx;
@@ -407,12 +426,13 @@
 						color: #DFBE6E;
 						text-align: center;
 						margin-right: 25rpx;
+						margin-bottom: 25rpx;
 						padding: 0 10rpx;
 						line-height: 38rpx;
 					}
 
 					.tuipiao-desc {
-						height: 40rpx;
+						// height: 40rpx;
 						font-size: 28rpx;
 						font-family: PingFang SC;
 						font-weight: bold;
@@ -455,4 +475,10 @@
 		
 
 	}
+	.zanwu{
+		    font-size: 28rpx;
+		    font-family: PingFang SC;
+		    font-weight: 400;
+		    color: #999999;
+	}
 </style>

pages/ticketCoupons/components/njzz-calendar/njzz-calendar.vue

@@ -23,7 +23,7 @@
 		</view>
 		<view class="dayBox">
 			<view class="day" v-for="(item,index) in space" v-bind:key="index"></view>
-			<view class="day" :class="[getDateStr(item.date)==getDateStr(dayActive.date)?'active':'']" v-for="(item,index) in dayList" v-bind:key="index" @tap="selectDate(item)">
+			<view class="day" :class="[getDateStr(item.date)==defaultSelect?'active':'']" v-for="(item,index) in dayList" v-bind:key="index" @tap="selectDate(item)">
 				<view :class="[isToday(item.date)?'today':'']">{{isToday(item.date) ? "今天" : item.date.getDate()}}</view>
 				<view class="calen-text-orange">{{item.price||item.price===0?'&yen;'+item.price:''}}</view>
 			</view>
@@ -33,7 +33,6 @@
 
 <script>
 	import uniIcons from "./uni-icons/uni-icons.vue"
-	/* import {uniIcons} from "../../components/uni-icons" */
 	export default{
 		components:{uniIcons},
 		name:"Zcalendar",
@@ -70,6 +69,11 @@
 				space:0//周几占位个数  例如 周二占位2个
  			}
 		},
+		watch:{
+			defaultSelect(val){
+				// this.getDefaultData(val)
+			}
+		},
 		mounted() {
 			this.today = new Date();
 			this.nowMonth = {
@@ -78,11 +82,11 @@
 			}
 			this.setMonthList()
 		},
-		updated() {
-			if(this.defaultSelect != "" && !this.dayActive){
-				this.dayActive = this.getDefaultData(this.defaultSelect)
-			}
-		},
+		// updated() {
+		// 	if(this.defaultSelect != "" && !this.dayActive){
+		// 		this.dayActive = this.getDefaultData(this.defaultSelect)
+		// 	}
+		// },
 		computed: { 
 		    monthDatePrice: function () {
 				//过滤出 每个月份的团期价格list 并且按照对象内的价格排序  以用来显示当前月份xxxx金额起,用于mode1
@@ -135,20 +139,20 @@
 				this.current = index
 				this.$emit('changeMonth',momth)
 			},
-			getDefaultData(d){ //设置初始值
-				let list = this.datePrice.filter(item=>item.date==d);
-				let obj={};
-				if(list.length>0){      //逻辑依旧是保证没有团期（价格）的不能选中
-					obj = {
-						date:new Date(list[0].date),
-						price:list[0].price
-					}
-				}else{
-					obj = false
-				}
+			// getDefaultData(d){ //设置初始值
+			// 	let list = this.datePrice.filter(item=>item.date==d);
+			// 	let obj={};
+			// 	if(list.length>0){      //逻辑依旧是保证没有团期（价格）的不能选中
+			// 		obj = {
+			// 			date:new Date(list[0].date),
+			// 			price:list[0].price
+			// 		}
+			// 	}else{
+			// 		obj = false
+			// 	}
 				
-				return obj;
-			},
+			// 	return obj;
+			// },
 			isToday(date){
 				return date.getFullYear()==this.today.getFullYear() && date.getMonth()==this.today.getMonth() && date.getDate() == this.today.getDate()
 			},
@@ -210,7 +214,6 @@
 			selectDate(data){ //选择日期
 				//多选模式请在这改造
 				/* this.$set(this.dayActive,"date",date) */
-				console.log(data)
 				let resDay=Date.parse(data.date);
 				let now=new Date();
 				now.setHours(0);//设置小时

pages/ticketCoupons/components/subscribeTicket.vue

@@ -20,23 +20,23 @@
 			</view>
 			<view class="chooseBtn-box">
 				<view class="btn-TicketName-box">
-					{{defaultSelect}}  
+					{{defaultSelect}}
 					<text class="btn-TicketName">
 						{{TicketName}}
 					</text>
-					
+
 				</view>
 				<view class="btn-box">
 					<view class="icon-box">
 						<view class="kefu-iocn">
-							<u-icon  name="service-o" color="#111111" size="24rpx"></u-icon>
+							<u-icon name="service-o" color="#111111" size="24rpx"></u-icon>
 						</view>
-						
+
 						<view class="">
 							客服
 						</view>
 					</view>
-					
+
 					<view class="subscribe-btn" @click="nextStep">
 						立即预订
 					</view>
@@ -64,11 +64,11 @@
 				type: Number,
 				default: 0
 			},
-			TitekCounponId:{
+			TitekCounponId: {
 				type: Number,
 				default: 0
 			},
-			TicketName:{
+			TicketName: {
 				type: String,
 				default: ""
 			}
@@ -77,12 +77,12 @@
 			return {
 				curryear: 0,
 				currmonth: 0,
-				defaultSelect:"",
+				defaultSelect: "",
 				datePrice: [],
-				price:"",
-				peopleNum:1,
-				showAuth:false,
-				u:{},
+				price: "",
+				peopleNum: 1,
+				showAuth: false,
+				u: {},
 			}
 		},
 		watch: {
@@ -90,13 +90,17 @@
 				this.defaultSelect = val;
 				let newMonth = val.split('-')[1]
 				let oldMonth = oldVal.split('-')[1]
-				if(newMonth!=oldMonth&&oldMonth!=undefined){
+				if (newMonth != oldMonth && oldMonth != undefined) {
 					this.getGoodsDateList(val)
 				}
-				
+				let list = this.datePrice.filter(item => item.date == this.dateStr);
+
+				if (list.length > 0) {
+					this.price = list[0].price
+				}
 			},
-			TicketID(val){
-				if(val){
+			TicketID(val) {
+				if (val) {
 					this.getGoodsDateList(this.dateStr)
 				}
 			}
@@ -104,16 +108,15 @@
 		mounted() {
 			let year = new Date().getFullYear(); //年
 			let month = new Date().getMonth() + 1; //月
-			if(month<10){
+			if (month < 10) {
 				month = ('0' + month)
 			}
-			this.curryear= year
-			this.currmonth= month
-			
+			this.curryear = year
+			this.currmonth = month
 		},
 		methods: {
 			valChange(e) {
-				this.peopleNum=e.value
+				this.peopleNum = e.value
 			},
 			getGoodsDateList(date) {
 				this.request2({
@@ -128,34 +131,35 @@
 						let data = res.data;
 						let datePrice = [];
 						data.forEach(x => {
-								let obj = {}
-								obj.date = x.Year+'-'+x.Month+'-'+x.Day;
-								if(x.IsHavePrice==1){
-								 let p=this.$utils.getretailer()==true? x.HPriceB:x.HPriceC   
-									obj.price =p ;
-								}else{
-									obj.price = "";
-								}
-								datePrice.push(obj)
+							let obj = {}
+							obj.date = x.Year + '-' + x.Month + '-' + x.Day;
+							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
-						let list = this.datePrice.filter(item=>item.date==this.dateStr);
-						this.price=list[0].price
-						console.log(144,list,this.datePrice,this.dateStr)
+						let list = this.datePrice.filter(item => item.date == this.dateStr);
+						if (list.length > 0) {
+							this.price = list[0].price
+						}
 					}
 				);
 			},
-			changeDate(data){ //选择日期事件  可以将data绑定到此页面以用来提交等操作 
+			changeDate(data) { //选择日期事件  可以将data绑定到此页面以用来提交等操作 
 				this.defaultSelect = data.date;
-				this.price=data.price
+				this.price = data.price
 				this.$forceUpdate()
 			},
-			
-			changeMonth(nowMonth){
-				let Month = nowMonth.year+'-'+nowMonth.month+'-01';
+
+			changeMonth(nowMonth) {
+				let Month = nowMonth.year + '-' + nowMonth.month + '-01';
 				this.getGoodsDateList(Month)
 			},
-			nextStep(){
+			nextStep() {
 				this.u = uni.getStorageSync("mall_UserInfo");
 				if (!this.u) {
 					this.u = {
@@ -163,28 +167,28 @@
 						avatarUrl: ""
 					};
 					this.showAuth = true;
-					
+
 				} else {
-					if(!this.price){
+					if (!this.price) {
 						uni.showToast({
 							title: "请选择日期",
 							icon: "none",
 						});
 						return
 					}
-					let data={
-						TicketId:this.TicketID,
-						TitekCounponId:this.TitekCounponId,
-						Unit_Price:this.price,
-						Date:this.defaultSelect,
-						TicketName:this.TicketName,
-						PeopleNumber:this.peopleNum,
+					let data = {
+						TicketId: this.TicketID,
+						TitekCounponId: this.TitekCounponId,
+						Unit_Price: this.price,
+						Date: this.defaultSelect,
+						TicketName: this.TicketName,
+						PeopleNumber: this.peopleNum,
 					}
 					uni.navigateTo({
-						url: "/pages/ticketCoupons/fillOrder?data="+encodeURIComponent(JSON.stringify(data)),
+						url: "/pages/ticketCoupons/fillOrder?data=" + encodeURIComponent(JSON.stringify(data)),
 					});
 				}
-				
+
 			},
 			reloadUserinfo() {
 				this.u = uni.getStorageSync("mall_UserInfo");
@@ -193,7 +197,7 @@
 			goback() {
 				uni.navigateBack()
 			},
-			close(){
+			close() {
 				this.$emit("close")
 			}
 		}
@@ -203,11 +207,12 @@
 
 <style lang="scss" scoped>
 	.subscribeTicket {
-		height: 80vh;
-		padding-top: 45rpx;
+		height: 70vh;
+		margin: 45rpx 0;
 		overflow-y: scroll;
 		overflow-x: hidden;
-		.title{
+
+		.title {
 			text-align: center;
 			font-size: 32rpx;
 			font-family: PingFang SC;
@@ -215,21 +220,25 @@
 			color: #111111;
 			margin-bottom: 10rpx;
 			position: relative;
-			.close-icon{
+
+			.close-icon {
 				position: absolute;
 				right: 30rpx;
 				top: 0;
 			}
 		}
-		.chooseTicketAndNum{
+
+		.chooseTicketAndNum {
 			height: 335rpx;
 			padding: 30rpx;
-			.chooseTicket{
+
+			.chooseTicket {
 				display: flex;
 				justify-content: space-between;
 				align-items: center;
 				margin-bottom: 100rpx;
-				.TicketName{
+
+				.TicketName {
 					width: auto;
 					height: 60rpx;
 					padding: 0rpx 30rpx;
@@ -242,7 +251,8 @@
 					color: #FFFFFF;
 				}
 			}
-			.chooseBtn-box{
+
+			.chooseBtn-box {
 				// width: 670px;
 				height: 100rpx;
 				background-color: #FFFFFF;
@@ -252,33 +262,38 @@
 				display: flex;
 				justify-content: space-between;
 				align-items: center;
-				.btn-TicketName-box{
+
+				.btn-TicketName-box {
 					font-size: 24rpx;
 					font-family: PingFang SC;
 					font-weight: bold;
 					color: #111111;
-					.btn-TicketName{
+
+					.btn-TicketName {
 						margin-left: 10rpx;
 					}
 				}
-				.btn-box{
+
+				.btn-box {
 					display: flex;
 					justify-content: space-between;
 					align-items: center;
-					
-					.icon-box{
+
+					.icon-box {
 						width: 44rpx;
 						font-size: 22rpx;
 						font-family: PingFang SC;
 						font-weight: 500;
 						color: #111111;
-						.kefu-iocn{
+
+						.kefu-iocn {
 							width: 44rpx;
 							display: flex;
 							justify-content: center;
 						}
 					}
-					.subscribe-btn{
+
+					.subscribe-btn {
 						width: 190rpx;
 						height: 80rpx;
 						margin-left: 20rpx;

pages/ticketCoupons/components/uni-calendar/uni-calendar.vue

@@ -216,6 +216,7 @@
 			 * 确认按钮
 			 */
 			confirm() {
+				
 				this.setEmit('confirm')
 				this.close()
 			},
@@ -268,6 +269,20 @@
 			 */
 			choiceDate(weeks) {
 				if (weeks.disable) return
+				let resDay=Date.parse(weeks.fullDate);
+				let now=new Date();
+				now.setHours(0);//设置小时
+				now.setMinutes(0);//设置分钟
+				now.setSeconds(0);//设置秒
+				now.setMilliseconds(0);//设置毫妙
+				let today= now.getTime();
+				if(resDay<today){
+					uni.showToast({
+						title: "不能选择今天以前的日期",
+						icon: "none",
+					});
+					return
+				}
 				this.calendar = weeks
 				// 设置多选
 				this.cale.setMultiple(this.calendar.fullDate)

pages/ticketCoupons/detail.vue

@@ -13,7 +13,7 @@
 				<view @click="goback">
 					<u-icon name="arrow-left" size="44"></u-icon>
 				</view>
-				<view style="flex: 1;margin-left: 30rpx; text-align: left;'background-color':'#000'">{{details.Name}}
+				<view style="flex: 1;margin-left: 30rpx; text-align: left;'background-color':'#000';white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">{{details.Name}}
 				</view>
 			</view>
 			<view style="position: relative;z-index: 2;">
@@ -128,8 +128,8 @@
 												src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/likeruyuan.png"
 												mode="aspectFit" v-if="_item.IsSameDayBuy==1"></image>
 											<view class="tag-item" v-if="_item.SubscribeTime||_item.ChangeTickets">
-												<text>{{_item.SubscribeTime}}</text>
-												<text class="gap">{{_item.ChangeTickets}}</text>
+												<text v-if="_item.SubscribeTime">随时可买</text>
+												<text class="gap" v-if="_item.ChangeTickets">无需换票</text>
 											</view>
 										</view>
 										<!-- 无忧退款 -->
@@ -246,7 +246,6 @@
 				this.ID = options.id
 				this.getDetail()
 			}
-			this.imgBaseUrl = "http://192.168.20.214:8130"
 			uni.getSystemInfo({
 				success(res) {
 					that.titleStyle = {
@@ -808,7 +807,7 @@
 					.tag {
 						display: flex;
 						max-width: 70%;
-						// height: 32rpx;
+						height: 32rpx;
 						margin-bottom: 20rpx;
 
 						.tag-img {

pages/ticketCoupons/policyDetail.vue

@@ -2,7 +2,7 @@
 	<!-- 政策详情 -->
 	<view class="policyDetail">
 		<u-tabs :list="typeList" :current="active" name="Name" :is-scroll="false" @change="changeHandler"
-			:active-color="mainColor" bg-color="#FFF" bar-height='4' height="100"></u-tabs>
+			:active-color="mainColor" bg-color="#FFF" :bar-style="barStyle" height="100"></u-tabs>
 		<view class="officialNotice">
 			<view class="title">
 				官方公告信息
@@ -72,10 +72,10 @@
 				active: 0,
 				mainColor: "#DFBE6E",
 				barStyle: {
-					width: '30rrpx',
-					height: '6rpx',
-					background: '#DFBE6E',
-					borderRadius: '3rpx'
+					width: '50rpx ',
+					height: '6rpx !important',
+					backgroundColor: '#DFBE6E !important',
+					borderRadius: '3rpx !important',
 				},
 				typeList: [{
 					Id: 0,