1

pages/restaurant/detail.vue

@@ -141,7 +141,7 @@
 						<recommed-restaurant></recommed-restaurant>
 					</view> -->
 				</view>
-				<u-popup v-model="showTimePopup" mode="bottom" border-radius="40" length="70%"
+				<u-popup v-model="showTimePopup" mode="bottom" border-radius="40"
 					:safe-area-inset-bottom="true">
 					<view class="" style="margin-top: 40rpx;">
 						<calendar ref="calendar" :insert="true" :selected="calendar" @change="changeDate"></calendar>

pages/restaurant/order.vue

@@ -219,9 +219,10 @@
 							title: "支付成功"
 						})
 						setTimeout(()=>{
+							let total=that.orderData.Unit_Price*that.order.BuyNum
 							uni.redirectTo({
-							    url: '/pages/jiuzhai/allorderList'
-							});
+							          url: '/pages/jiuzhai/paysuccess?PreferPrice='+total
+							      });
 						}, 100 )
 			
 					},
@@ -231,6 +232,11 @@
 							title: "支付失败",
 							icon:'none'
 						})
+						setTimeout(()=>{
+							uni.redirectTo({
+							    url: '/pages/jiuzhai/allorderList'
+							});
+						}, 100 )
 					}
 				});
 			},

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

@@ -6,7 +6,7 @@
 				<text class="font-small">{{nowMonth.year}}年</text>
 				<uni-icons type="arrowdown" size="10"></uni-icons>
 			</picker>
-			<text class="reset" @tap="reset">重置</text>
+			<!-- <text class="reset" @tap="reset">重置</text> -->
 		</view>
 		<scroll-view class="calenHead" scroll-x v-if="mode=='1'">
 			<view class="headItem" v-for="(date,index) in monthList" v-bind:key="index" :class="[current==index?'active':'']" @tap="headItemTap(index,date.getMonth()+1)">

pages/ticketCoupons/components/subscribeTicket.vue

@@ -35,6 +35,8 @@
 						<view class="">
 							客服
 						</view>
+						<button open-type="contact" :send-message-title="TicketName" :send-message-path="msgPath"
+							:send-message-img="TicketImg" :show-message-card="true"></button>
 					</view>
 
 					<view class="subscribe-btn" @click="nextStep">
@@ -71,7 +73,11 @@
 			TicketName: {
 				type: String,
 				default: ""
-			}
+			},
+			TicketImg: {
+				type: String,
+				default: ""
+			},
 		},
 		data() {
 			return {
@@ -83,6 +89,8 @@
 				peopleNum: 1,
 				showAuth: false,
 				u: {},
+				msgPath:"",
+				
 			}
 		},
 		watch: {
@@ -105,7 +113,25 @@
 				}
 			}
 		},
+		// onShareAppMessage(res) {
+		//   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 Up = uni.getStorageSync("mall_UserInfo")?uni.getStorageSync("mall_UserInfo").UserPageType:0;
+		//   return {
+		//     title:'个人资料',
+		//     path: "/pages/index/index?id=" + this.UserId + "&user_id=" + uid+ "&SmallShopId=" + SmallShopId+ "&Up=" + Up+'&JumpType=13',
+		//     imageUrl:'',
+		//   };
+		// },
 		mounted() {
+			this.msgPath="/pages/ticketCoupons/detail?id="+options.id+'&TicketID'+this.TicketID+'&date'+this.defaultSelect
 			let year = new Date().getFullYear(); //年
 			let month = new Date().getMonth() + 1; //月
 			if (month < 10) {
@@ -151,7 +177,8 @@
 			},
 			changeDate(data) { //选择日期事件  可以将data绑定到此页面以用来提交等操作 
 				this.defaultSelect = data.date;
-				this.price = data.price
+				this.price = data.price;
+				this.msgPath="/pages/ticketCoupons/detail?id="+options.id+'&TicketID'+this.TicketID+'&date'+this.defaultSelect
 				this.$forceUpdate()
 			},
 
@@ -207,7 +234,7 @@
 
 <style lang="scss" scoped>
 	.subscribeTicket {
-		height: 70vh;
+		// height: 1020rpx;
 		margin: 45rpx 0;
 		overflow-y: scroll;
 		overflow-x: hidden;
@@ -281,15 +308,29 @@
 
 					.icon-box {
 						width: 44rpx;
+						height: 52rpx;
 						font-size: 22rpx;
 						font-family: PingFang SC;
 						font-weight: 500;
 						color: #111111;
+						position: relative;
 
 						.kefu-iocn {
 							width: 44rpx;
+							
 							display: flex;
 							justify-content: center;
+
+
+						}
+
+						button {
+							width: 100%;
+							height: 100%;
+							position: absolute;
+							left: 0;
+							top: 0;
+							opacity: 0
 						}
 					}
 

pages/ticketCoupons/detail.vue

@@ -94,7 +94,7 @@
 							</view>
 							<view class="ticket-nav" :class="{'check-ticket-nav':checkTicketNavIndex===3}"
 								@click="changeCheckTicketNavIndex(3)">
-								其他日期
+								{{otherDate}}
 							</view>
 							<calendar ref="calendar" :insert="false" :selected="calendar" @confirm="confirm"></calendar>
 
@@ -185,8 +185,8 @@
 				</view>
 				<!-- 填写订单弹出层 -->
 				<view>
-					<u-popup v-model="showSubscribeTicketPop" mode="bottom" border-radius="40" :closeable="true" >
-						<subscribeTicket :dateStr="Date" :TicketID="TicketID" :TitekCounponId="ID" :TicketName="TicketName" @close="showSubscribeTicketPop=false"></subscribeTicket>
+					<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"></subscribeTicket>
 					</u-popup>
 				</view>
 			</view>
@@ -209,18 +209,7 @@
 			return {
 				ID: 0,
 				Date: "", //日期
-				details: {
-					
-				},
-				typeList: [{
-					Id: 0,
-					Name: '视频'
-				}, {
-					Id: 1,
-					Name: '图片'
-				}],
-				boxOption: 0,
-				navsOption: 0,
+				details: {},
 				titleStyle: {},
 				titleStyleFix: {},
 				active: 0,
@@ -238,6 +227,7 @@
 				showSubscribeTicketPop: false,//订单弹出层
 				TicketID:0,//门票id
 				TicketName:"",
+				otherDate:"其他日期"
 			}
 		},
 		onLoad(options) {
@@ -246,6 +236,7 @@
 				this.ID = options.id
 				this.getDetail()
 			}
+			
 			uni.getSystemInfo({
 				success(res) {
 					that.titleStyle = {
@@ -279,12 +270,19 @@
 			let today = year+'-'+month+'-'+day
 			this.Date = today
 			this.calendar.date = today
+			if(options.TicketID&&options.date){
+				this.TicketID=options.TicketID
+				this.Date=options.date
+				this.calendar.date=options.date
+				this.showSubscribeTicketPop=true
+			}
 		},
 		methods: {
 			//选择其他日期门票
 			confirm(e) {
 				this.Date = e.fulldate
 				this.calendar[0].date = e.fulldate
+				this.otherDate=e.fulldate
 				this.getDetailByDate();
 				this.$forceUpdate()
 			},
@@ -340,7 +338,6 @@
 			},
 		
 			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.tooltipShow = false

pages/ticketCoupons/policyDetail.vue

@@ -100,6 +100,9 @@
 			this.ID = options.id
 			this.getDetail()
 		},
+		onPageScroll(res){
+			console.log(res.scrollTop);//距离页面顶部距离
+		},
 		methods: {
 			changeHandler(i) {
 				this.active = i;
@@ -112,9 +115,11 @@
 					toID="#tip"
 				}
 				uni.pageScrollTo({
-				    // scrollTop: 0,
 					selector:toID,
-				    duration: 300
+				    duration: 300,
+					success:res=>{
+						
+					}
 				});
 			},
 			//获取详情