1

pages/restaurant/detail.vue

@@ -200,7 +200,8 @@
 					date: "",
 					info: ''
 				}],
-				Date: ""
+				Date: "",
+				up:""
 			}
 		},
 		components: {
@@ -365,6 +366,9 @@
 			},
 			//获取详情
 			getDetail() {
+				uni.showLoading({
+				    title: '加载中...'
+				});
 				this.request2({
 						url: '/api/AppletDining/GetDiningDetails',
 						data: {
@@ -372,6 +376,7 @@
 						}
 					},
 					res => {
+						uni.hideLoading();
 						if (res.resultCode == 1) {
 							res.data.FoodTag = res.data.FoodTag.split(',')
 							res.data.GeographicTag = res.data.GeographicTag.split(',')
@@ -385,6 +390,9 @@
 								this.imgsList.push(obj)
 							})
 						}
+					},
+					err=>{
+						uni.hideLoading();
 					}
 				);
 			},

pages/restaurant/order.vue

@@ -175,6 +175,12 @@
 							uni.requestSubscribeMessage({
 								tmplIds: res.data.template_message_list,
 								complete(_res) {
+									if(data.Final_Price===0){
+										uni.redirectTo({
+											   url: '/pages/jiuzhai/allorderList'
+											});
+										return
+									}
 									that.queren(res.data.OrderId)
 								}
 							});

pages/ticketCoupons/detail.vue

 <template>
 	<view style="height: 100vh; overflow: hidden;width:100vw;">
 		<scroll-view scroll-y="true" style="width: 100%;height: 100%;" @scroll="scroll">
-			<view style="height: 500rpx;position: relative;z-index: 1;background-color: #E7E7E7;" :style="{'opacity':(100-boxOption)+'%'}">
+			<view style="height: 500rpx;position: relative;z-index: 1;background-color: #E7E7E7;"
+				:style="{'opacity':(100-boxOption)+'%'}">
 				<view @click="goback" :style="[titleStyle,{opacity:'100% !important'}]"
 					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>
@@ -13,7 +14,9 @@
 				<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';white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">{{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;">
@@ -25,13 +28,15 @@
 								{{details.Name}}
 							</view>
 							<view class="score-bg">
-								<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/pingfen-bg.png" mode="aspectFit" class="pf-bg"></image>			
+								<image
+									src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/pingfen-bg.png"
+									mode="aspectFit" class="pf-bg"></image>
 								<view class="score">
 									{{details.ScoreNum}}
 									<text
 										v-if="details.ScoreNum===1||details.ScoreNum===2||details.ScoreNum===3||details.ScoreNum===4||details.ScoreNum===5">.0</text>
 								</view>
-								
+
 							</view>
 						</view>
 						<view class="info2">
@@ -101,13 +106,16 @@
 						</view>
 						<view>
 							<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>
+								<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.mealList" :key="index" class="ticket-list-box"
-								:class="{'last-item':index==details.mealList.length-1}" v-if="details.mealList.length>0">
+								:class="{'last-item':index==details.mealList.length-1}"
+								v-if="details.mealList.length>0">
 								<view class="ticket-key">
 									{{item.Key}}
 								</view>
@@ -119,9 +127,9 @@
 											{{_item.TicketName}}
 										</view>
 										<view class="price">
-											<text class="price-pre">￥</text>{{$utils.getretailer()==true? _item.HPriceB:_item.HPriceC}}   
-<text
-												class="price-nex">起</text>
+											<text
+												class="price-pre">￥</text>{{$utils.getretailer()==true? _item.HPriceB:_item.HPriceC}}
+											<text class="price-nex">起</text>
 										</view>
 										<view class="tag">
 											<image class="tag-img"
@@ -186,7 +194,9 @@
 				<!-- 填写订单弹出层 -->
 				<view>
 					<u-popup v-model="showSubscribeTicketPop" mode="bottom" border-radius="40">
-						<subscribeTicket :dateStr="Date" :TicketID="TicketID" :TitekCounponId="ID" :TicketName="TicketName" @close="showSubscribeTicketPop=false" :TicketImg="details.AllPicList[0].TagPicList[0].Path" :msgPath="msgPath"></subscribeTicket>
+						<subscribeTicket :dateStr="Date" :TicketID="TicketID" :TitekCounponId="ID"
+							:TicketName="TicketName" @close="showSubscribeTicketPop=false"
+							:TicketImg="details.AllPicList[0].TagPicList[0].Path" :msgPath="msgPath"></subscribeTicket>
 					</u-popup>
 				</view>
 			</view>
@@ -224,60 +234,61 @@
 				}], //日历高亮
 				showPop: false,
 				curTicketData: {},
-				showSubscribeTicketPop: false,//订单弹出层
-				TicketID:0,//门票id
-				TicketName:"",
-				otherDate:"其他日期",
-				msgPath:""
+				showSubscribeTicketPop: false, //订单弹出层
+				TicketID: 0, //门票id
+				TicketName: "",
+				otherDate: "其他日期",
+				msgPath: "",
+				up: ""
 			}
 		},
 		onShareTimeline() {
-		  // setTimeout(() => {
-		  //   console.log("分享朋友圈调用");
-		  //   this.getReceive();
-		  // }, 2500);
-		  let uid = uni.getStorageSync("mall_UserInfo")
-		    ? uni.getStorageSync("mall_UserInfo").UserId
-		    : 0;
-			  if(uid==0){
-			  	uid = uni.getStorageSync("pid")?uni.getStorageSync("pid").pid:0
-			  }
-			  let SmallShopId = uni.getStorageSync("mall_UserInfo")
-			    ? uni.getStorageSync("mall_UserInfo").SmallShopId
-			    : 0;
-				if(SmallShopId == 0){//如果微店id为0 去找所属微店id
-					SmallShopId = uni.getStorageSync("mall_UserInfo")
-					  ? uni.getStorageSync("mall_UserInfo").UserSmallShopId
-					  : 0;
-				}
-		  let title =this.details.Name?this.details.Name:'门票';
-		  let imageUrl =this.details.AllPicList[0].TagPicList[0].Path?this.details.AllPicList[0].TagPicList[0].Path:'';
-		  let id = this.ID;
-		  return {
-		    title: title,
-		    query: "id=" + this.id + "&user_id=" + uid+ "&SmallShopId=" + SmallShopId+ "&Up=" + this.Up,
-		    imageUrl: imageUrl,
-		  };
+			// setTimeout(() => {
+			//   console.log("分享朋友圈调用");
+			//   this.getReceive();
+			// }, 2500);
+			let uid = uni.getStorageSync("mall_UserInfo") ? uni.getStorageSync("mall_UserInfo").UserId : 0;
+			if (uid == 0) {
+				uid = uni.getStorageSync("pid") ? uni.getStorageSync("pid").pid : 0
+			}
+			let SmallShopId = uni.getStorageSync("mall_UserInfo") ?
+				uni.getStorageSync("mall_UserInfo").SmallShopId :
+				0;
+			if (SmallShopId == 0) { //如果微店id为0 去找所属微店id
+				SmallShopId = uni.getStorageSync("mall_UserInfo") ?
+					uni.getStorageSync("mall_UserInfo").UserSmallShopId : 0;
+			}
+			let title = this.details.Name ? this.details.Name : '门票';
+			let imageUrl = this.details.AllPicList[0].TagPicList[0].Path ? this.details.AllPicList[0].TagPicList[0].Path :
+				'';
+			let id = this.ID;
+			return {
+				title: title,
+				query: "id=" + this.id + "&user_id=" + uid + "&SmallShopId=" + SmallShopId + "&Up=" + this.Up,
+				imageUrl: imageUrl,
+			};
 		},
 		onShareAppMessage(res) {
-		  // setTimeout(() => {
-		  //   console.log("分享好友调用");
-		  //   this.getReceive();
-		  // }, 2500);
-		  let u = uni.getStorageSync("mall_UserInfo");
-		  let uid = u.UserId ? u.UserId : 0;
-			if(uid==0){
-				uid = uni.getStorageSync("pid")?uni.getStorageSync("pid").pid:0
+			// setTimeout(() => {
+			//   console.log("分享好友调用");
+			//   this.getReceive();
+			// }, 2500);
+			let u = uni.getStorageSync("mall_UserInfo");
+			let uid = u.UserId ? u.UserId : 0;
+			if (uid == 0) {
+				uid = uni.getStorageSync("pid") ? uni.getStorageSync("pid").pid : 0
 			}
-		  let SmallShopId = u.SmallShopId ? u.SmallShopId : 0;
-			if(SmallShopId == 0){//如果微店id为0 去找所属微店id
-				SmallShopId = u.UserSmallShopId? u.UserSmallShopId:0
+			let SmallShopId = u.SmallShopId ? u.SmallShopId : 0;
+			if (SmallShopId == 0) { //如果微店id为0 去找所属微店id
+				SmallShopId = u.UserSmallShopId ? u.UserSmallShopId : 0
 			}
-		  return {
-		    title:this.details.Name?this.details.Name:'门票',
-		    path: "/pages/index/index?id=" + this.ID + "&user_id=" + uid+ "&SmallShopId=" + SmallShopId+ "&Up=" + this.Up+'&JumpType=15',
-			imageUrl:this.details.AllPicList[0].TagPicList[0].Path?this.details.AllPicList[0].TagPicList[0].Path:''
-		  };
+			return {
+				title: this.details.Name ? this.details.Name : '门票',
+				path: "/pages/index/index?id=" + this.ID + "&user_id=" + uid + "&SmallShopId=" + SmallShopId + "&Up=" +
+					this.Up + '&JumpType=15',
+				imageUrl: this.details.AllPicList[0].TagPicList[0].Path ? this.details.AllPicList[0].TagPicList[0].Path :
+					''
+			};
 		},
 		onLoad(options) {
 			let that = this
@@ -285,7 +296,7 @@
 				this.ID = options.id
 				this.getDetail()
 			}
-			this.msgPath="/pages/ticketCoupons/detail?id="+options.id
+			this.msgPath = "/pages/ticketCoupons/detail?id=" + options.id
 			uni.getSystemInfo({
 				success(res) {
 					that.titleStyle = {
@@ -307,27 +318,27 @@
 			this.mainColor = this.$uiConfig.mainColor;
 
 			let d = new Date();
-			let year=d.getFullYear();
-			let month=d.getMonth()+1;
-			if(month<10){
-				month='0'+month
+			let year = d.getFullYear();
+			let month = d.getMonth() + 1;
+			if (month < 10) {
+				month = '0' + month
 			}
-			let day=d.getDate();
-			if(day<10){
-				day='0'+day
+			let day = d.getDate();
+			if (day < 10) {
+				day = '0' + day
 			}
-			let today = year+'-'+month+'-'+day
+			let today = year + '-' + month + '-' + day
 			this.Date = today
 			this.calendar.date = today
-			
+
 		},
-		
+
 		methods: {
 			//选择其他日期门票
 			confirm(e) {
 				this.Date = e.fulldate
 				this.calendar[0].date = e.fulldate
-				this.otherDate=e.fulldate
+				this.otherDate = e.fulldate
 				this.getDetailByDate();
 				this.$forceUpdate()
 			},
@@ -340,13 +351,16 @@
 					url: url + "?id=" + this.ID,
 				})
 			},
-			chooseSubscribeTicket(item){
-				this.showSubscribeTicketPop=true
-				this.TicketID=item.Id
-				this.TicketName=item.TicketSubName+item.TicketName
+			chooseSubscribeTicket(item) {
+				this.showSubscribeTicketPop = true
+				this.TicketID = item.Id
+				this.TicketName = item.TicketSubName + item.TicketName
 			},
 			//获取详情
 			getDetail() {
+				uni.showLoading({
+				    title: '加载中...'
+				});
 				this.request2({
 						url: '/api/AppletDining/GetTicketCouponsDetails',
 						data: {
@@ -354,11 +368,15 @@
 						}
 					},
 					res => {
+						uni.hideLoading();
 						if (res.resultCode == 1) {
 							res.data.ScenicSpotTag = res.data.ScenicSpotTag.split(',')
 							res.data.GeographicTag = res.data.GeographicTag.split(',')
 							this.details = res.data;
 						}
+					},
+					err=>{
+						uni.hideLoading();
 					}
 				);
 			},
@@ -381,7 +399,7 @@
 			changeHandler(i) {
 				this.active = i;
 			},
-		
+
 			scroll(e) {
 				this.titleStyle.opacity = ((e.detail.scrollTop - 100) < 0 ? 0 : Math.floor(e.detail.scrollTop - 100)) +
 					"%";
@@ -420,32 +438,32 @@
 				this.checkTicketNavIndex = i
 				if (i === 1) {
 					let d = new Date();
-					let year=d.getFullYear();
-					let month=d.getMonth()+1
-					if(month<10){
-						month='0'+month
+					let year = d.getFullYear();
+					let month = d.getMonth() + 1
+					if (month < 10) {
+						month = '0' + month
 					}
-					let day=d.getDate()
-					if(day<10){
-						day='0'+day
+					let day = d.getDate()
+					if (day < 10) {
+						day = '0' + day
 					}
-					let today = year+'-'+month+'-'+day
+					let today = year + '-' + month + '-' + day
 					this.Date = today
 					this.getDetailByDate()
 					this.$forceUpdate()
 				} else if (i === 2) {
 					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 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 day=nextDate.getDate()
-					if(day<10){
-						day='0'+day
+					let day = nextDate.getDate()
+					if (day < 10) {
+						day = '0' + day
 					}
-					let tomorrow = year+'-'+month+'-'+day
+					let tomorrow = year + '-' + month + '-' + day
 					this.Date = tomorrow
 					this.getDetailByDate()
 					this.$forceUpdate()
@@ -454,9 +472,9 @@
 				}
 
 			},
-			successBuyNotice(){
-				this.showPop=false
-				this.showSubscribeTicketPop=true
+			successBuyNotice() {
+				this.showPop = false
+				this.showSubscribeTicketPop = true
 			}
 		}
 
@@ -579,14 +597,16 @@
 		text-align: center;
 		font-size: 12rpx;
 	}
-	.no-data{
-		.no-data-img{
+
+	.no-data {
+		.no-data-img {
 			width: 180rpx;
 			height: 240rpx;
 			margin-left: 50%;
 			transform: translateX(-50%);
 		}
-		.zhanwu{
+
+		.zhanwu {
 			text-align: center;
 			font-size: 28rpx;
 			font-family: PingFang SC;
@@ -595,6 +615,7 @@
 			margin-top: 20rpx;
 		}
 	}
+
 	.baseinfo {
 		padding: 30rpx 45rpx;
 
@@ -611,20 +632,23 @@
 				color: #111111;
 				line-height: 44rpx;
 			}
-			.score-bg{
+
+			.score-bg {
 				position: relative;
 				width: 65rpx;
 				height: 65rpx;
 				background-color: #FFFFFF;
-				.pf-bg{
+
+				.pf-bg {
 					width: 65rpx;
 					height: 65rpx;
 					position: absolute;
 					left: 0;
 					top: 0;
 					z-index: 1;
-					}
+				}
 			}
+
 			.score {
 				width: 64rpx;
 				height: 54rpx;
@@ -941,12 +965,12 @@
 
 	.comment-box {
 		padding: 50rpx 45rpx;
-		
+
 		.score-box {
 			width: 235rpx;
 			display: flex;
-			
-			
+
+
 			.score {
 				font-size: 60rpx;
 				font-family: PingFang SC;

pages/ticketCoupons/fillOrder.vue

@@ -87,7 +87,6 @@
 		onLoad(options) {
 			let obj=JSON.parse(decodeURIComponent(options.data))
 			this.ticketdData=obj
-			console.log(this.ticketdData)
 			this.Final_Price=this.ticketdData.PeopleNumber*this.ticketdData.Unit_Price
 		},
 		
@@ -151,6 +150,12 @@
 									console.log('订阅失败',err)
 								},
 								complete(_res) {
+									if(that.Final_Price===0){
+										uni.redirectTo({
+											   url: '/pages/jiuzhai/allorderList'
+											});
+										return
+									}
 									that.queren(res.data.OrderId)
 								}
 							});