修改

pages/card/index/index.vue

@@ -6,6 +6,8 @@
       :current="current"
       @change="change"
       :active-color="mainColor"
+	  bar-height='4'
+	   height="100"
       
     ></u-tabs>
     <u-empty v-if="g.length == 0" text="暂无相关卡券" mode="order"></u-empty>

pages/coupon/index/index.vue

@@ -6,6 +6,7 @@
       :current="msg.UseState"
       @change="change"
       :active-color="mainColor"
+	  height="100"
     ></u-tabs>
     <u-empty v-if="g.length == 0" text="暂无相关优惠券" mode="coupon"></u-empty>
 		

pages/guidecar/bookaCarList.vue

@@ -602,7 +602,7 @@
 		},
 		methods: {
 			getscroll(e){
-				console.log(e.detail.scrollLeft)
+				// console.log(e.detail.scrollLeft)
 			},
 			yuding(x){
 				this.u = uni.getStorageSync("mall_UserInfo");

pages/hotel/order.vue

@@ -253,9 +253,13 @@
 					return;
 				}
 				var tempObj = uni.getStorageSync('basedata').mall.wechatmessage;	
-				var tmplIds = '';
+				var tmplIds = [];
 				if(tempObj&&tempObj.length>0){
-				    tmplIds = tempObj[0].MessageId;
+					tempObj.forEach(x=>{
+						if(x.Name=='下单成功提醒'||x.Name=='订单取消提醒'){
+							tmplIds.push(x.MessageId)
+						}
+					})
 				}
 				uni.requestSubscribeMessage({
 					tmplIds: tmplIds,

pages/jiuzhai/jz_MyOrder.vue

@@ -33,7 +33,7 @@
 		font-size: 32rpx;
 		font-weight: bold;
 		width: 70%;
-		height: 25px;
+		height: 24px;
 		overflow: hidden;
 	}
 
@@ -94,7 +94,7 @@
 		<template v-else>
 			<view class="jz_MyOrderMain" style="height: calc(100vh - 44px);overflow: hidden;">
 				<scroll-view :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" @scrolltolower="lower" :style="{ height: '100%' }">
-					<view class="jz_OrderList" v-for="(item,index) in dataList" :key="index">
+					<view class="jz_OrderList" v-for="(item,index) in dataList" :key="index" @click="goOrderDetail(item)">
 						<view class="jz_OrderTop">
 							<view class="jz_Oleft" :class="{'isShowAll':!item.isShowHalf}">
 								{{item.title}}
@@ -190,6 +190,11 @@
 			
 		},
 		methods: {
+			goOrderDetail(item){
+				uni.redirectTo({
+					url: "/pages/jiuzhai/jz_SureOrder?orderData="+encodeURIComponent(JSON.stringify(item))
+				});
+			},
 			change(i) {
 				this.current = i;
 				this.msg.orderState = this.list[i].Id;

pages/jiuzhai/jz_Reserve.vue

@@ -239,9 +239,6 @@
 		line-height: 40rpx;
 		margin-right: 24rpx;
 	}
-	.jz_ReserveDisBtn{
-		background-color: gray;
-	}
 </style>
 <template>
 	<view class="jz_Reserve">
@@ -382,7 +379,10 @@
 					<text style="color:#6E6E6E;font-size:24rpx;">共计{{total}}人</text>
 				</view>
 				<view style="display:flex;margin-top:-2px;">
-					<view class="jz_OrderReNow" :class="{'jz_ReserveDisBtn':!isSubmit}" @click="goPay()">立即支付</view>
+					<view class="jz_OrderReNow" @click="goPay()">
+						<text v-if="!submit">立即支付</text>
+						<u-loading v-if="submit" size="32" color="#f5f5f5"></u-loading>
+					</view>
 				</view>
 			</view>
 		</view>
@@ -396,6 +396,7 @@
 		},
 		data() {
 			return {
+				submit:false,
 				pageTitle: '订单填写',
 				orderMsg: {
 					ManNum: 0, //成人
@@ -416,8 +417,8 @@
 				tips:"",
 				contactMobile:"",
 				contactName:"",
-				//防止重复提交
-				isSubmit: true,
+				orderInfo:{},
+				orderData:""
 			};
 		},
 		created() {
@@ -512,6 +513,7 @@
 						icon: 'none'
 					});
 				}else{
+					this.submit=true
 					this.userInfo = uni.getStorageSync('mall_UserInfo');
 					this.basedataObj = uni.getStorageSync('basedata').mall;
 					var CustomerId = 0;
@@ -576,33 +578,76 @@
 						OrderSource: 2,
 						MiniAppUserId:this.userInfo.UserId
 					}
-					if(this.isSubmit){
-						this.isSubmit=false;
-						uni.showLoading({
-						  title: '下单中...'
-						})
-						this.apipost("sellorder_post_SetOrderInfoForB2B", msg,
-							res => {
-								uni.hideLoading();
-								this.isSubmit=true;
-								if (res.resultCode == 1) {
-									let data = res.data;
-									data.CoverImg = this.currentPriceInfo.CoverImg;
-									let myData = JSON.stringify(data);
-									uni.navigateTo({
-										url: "/pages/jiuzhai/jz_SureOrder?orderData="+encodeURIComponent(myData)
-									});
-								} else {
-									
-								}
-							},
-							err =>{
-								uni.hideLoading();
-								this.isSubmit=true;
+					this.apipost("sellorder_post_SetOrderInfoForB2B", msg,
+						res => {
+							if (res.resultCode == 1) {
+								let data = res.data;
+								data.CoverImg = this.currentPriceInfo.CoverImg;
+								let myData = JSON.stringify(data);
+								this.orderData=encodeURIComponent(myData)
+								this.queren(data.OrderId)
+							} else {
+
 							}
-						);
-					}
+							this.submit=false
+						},
+						e=>{
+							this.submit=false
+						}
+					);
 				}
+			},
+			queren(OrderId){
+				let url='/api/WeChatPay/GetTravlePayInfo'
+				let GoodsName = this.currentPriceInfo.title;
+					GoodsName = GoodsName.slice(0, 10)
+				this.request2({
+						url: url,
+						data: {
+							OrderId:OrderId,
+							GoodsName:GoodsName,
+							OrderPayType:1,
+							OpenId:uni.getStorageSync('mall_UserInfo').OpenId,
+						}
+					},
+					res => {
+						this.orderInfo = JSON.parse(res.data);
+						this.Pay()
+					}
+				);
+			},
+			Pay(){
+				let that=this;
+				uni.requestPayment({
+					provider: 'wxpay',
+					timeStamp: this.orderInfo.timeStamp,
+					nonceStr: this.orderInfo.nonceStr,
+					package: this.orderInfo.package,
+					signType: this.orderInfo.signType,
+					paySign: this.orderInfo.sign,
+					success: function(res) {
+						console.log('success', res);
+						uni.showToast({
+							title: "支付成功"
+						})
+						setTimeout(()=>{
+							uni.redirectTo({
+							  url: '/pages/jiuzhai/paysuccess?PreferPrice='+price
+							});
+						}, 100 )
+					},
+					fail: function(err) {
+						console.log('fail:', err);
+						uni.showToast({
+							title: "支付失败"
+						})
+						setTimeout(()=>{
+							uni.redirectTo({
+								url: "/pages/jiuzhai/jz_SureOrder?orderData="+this.orderData
+							});
+						}, 100 )
+					}
+				});
 			}
 		}
 

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=>{
+						
+					}
 				});
 			},
 			//获取详情

pages/user-center/integral-detail/integral-detail.vue

 <template>
 	<view class="integralDStyle" :style="{ height: contentHeight }">
-		<u-tabs :list="list" :is-scroll="false" :current="current" @change="change" :active-color="mainColor"></u-tabs>
+		<u-tabs :list="list" :is-scroll="false" :current="current" @change="change" :active-color="mainColor" height="100"></u-tabs>
 		<u-empty v-if="g.length == 0" text="暂无积分明细" mode="list"></u-empty>
 		<view v-if="g.length > 0" style="height: calc(100vh - 50px);width: calc(100vw);overflow: hidden; ">
 			<scroll-view :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" @scrolltolower="lower" :style="{ height: '100%' }">

pages/user-center/user-center.vue

@@ -70,10 +70,10 @@
 							<text>{{couponsObj.name}}</text>
 						</view>
 					</view>
-					<view class="ReceiptAdder" v-if="IsEducation!=1&&setting.is_show_korea!=undefined&&setting.is_show_korea==0" @click="goUrl('/pages/address/address')" :style="{top:modelstype==0?'160rpx':(modelstype==1?'180rpx':'160rpx')}">
+					<!-- <view class="ReceiptAdder" v-if="IsEducation!=1&&setting.is_show_korea!=undefined&&setting.is_show_korea==0" @click="goUrl('/pages/address/address')" :style="{top:modelstype==0?'160rpx':(modelstype==1?'180rpx':'160rpx')}">
 						<u-icon name="location" color="#fff" size="23"></u-icon>
 						<Text style="color: #fff;font-size: 12px;margin-left: 20rpx;">收货地址</Text>
-					</view>
+					</view> -->
 					<view class="Receiptbalance" v-if="meueData.user_center&&meueData.user_center.is_account_status == 1">
 						<view class="Receiptbalance_item" v-for="(item, index) in meueData.user_center.account" :key="index" v-if="item.link_url == '/pages/balance/balance'"
 						 @click="goUrl(item.link_url)">