界面优化及各种逻辑调整

center/center.vue

@@ -116,7 +116,7 @@
 				let that = this;
 				console.log('item',item);
 				
-				if(item.name!=='在线客服'&&item.name!=='客服热线'){
+				if(item.name!=='在线客服'&&item.name!=='客服热线'&&item.name!=='实名认证'){
 					uni.showToast({
 						title:'开发中',
 						icon:"none"

center/factorauth.vue

@@ -92,7 +92,12 @@
 		},
 		methods: {
 			leftClick(){
-				
+				let pages = getCurrentPages();
+				if(pages.length==1){
+					uni.$u.route('/pages/index/index')
+				}else{
+					uni.navigateBack()
+				};
 			},
 			submit(){
 				// console.log('form',this.form);
@@ -115,6 +120,7 @@
 				})
 			},
 			getMemberInfo(){
+				let that = this;
 				this.$u.api.memberInfo({id:this.vuex_user_info.userid}).then(res=>{
 					this.$u.vuex('vuex_member_info', res.data);
 					uni.showToast({
@@ -124,12 +130,8 @@
 					setTimeout(()=>{
 						// console.log('this.backUrl',this.backUrl);
 						// uni.reLaunch({url: this.backUrl});
-						if(this.backUrl){
-							uni.$u.route(this.backUrl)
-						}else{
-							uni.navigateBack()
-						};
-					},2000)
+						that.leftClick();
+					},1000)
 					// console.log('memberInfo',this.memberInfo);
 					}).catch(err=>{
 					// console.log('memberInfo',err.data);

center/order.vue

@@ -104,6 +104,7 @@
 					commentNum:0,
 					refundNum:0,
 				},
+				templateIdList:[],//微信小程序订阅消息
 			}
 		},
 		computed: {
@@ -142,6 +143,8 @@
 			const index = this.tabsList.findIndex(item => item.status === status);
 			this.tabsCurrent = index>=0?index:0;
 			
+			this.getTemplateIdList();//获取模板列表
+			
 		},
 		onShow() {
 			setTimeout(()=>{
@@ -248,10 +251,23 @@
 				  funObj[fun](item);
 				}
 			},
+			getTemplateIdList(){
+				this.$u.api.templateIdList({templateLabel:'order_pay'}).then(res=>{
+					console.log('getTemplateIdList',res.data);
+					this.templateIdList = res.data.list.map(item=>{
+						return item.templateId
+					});
+					// if(this.templateIdList.length>0){
+					// 	this.templateEven();
+					// }
+				}).catch(err=>{
+					console.log('getTemplateIdList',err);
+				})
+			},
 			pay(item){
 				console.log('pay',item);
-				this.gotoPay(item.id);
-				
+				// this.gotoPay(item.id);
+				this.setTemplate(item.id);
 				// uni.$u.route('/shopping/pay', {
 				// 	orderId: item.id,
 				// 	// openid: that.vuex_wechatOpenid,
@@ -342,6 +358,25 @@
 					id: item.id
 				});
 			},
+			// 设置小程序订阅消息
+			setTemplate(orderId) {
+				let that = this;
+				console.log('templateIdList',this.templateIdList);
+				uni.requestSubscribeMessage({  
+					tmplIds: that.templateIdList,  
+					success (res) {  
+						// that.gotoPay();
+						console.log("success:",res);  
+					},  
+					fail (res) {  
+						console.log("fail:",res);  
+					},  
+					complete (res) {  
+						that.gotoPay(orderId);
+						console.log("complete:",res);  
+					}  
+				})  
+			},
 			gotoPay(orderId){
 				this.$u.api.gotoPay({orderId:orderId,openid:''}).then(res=>{
 					this.payResult = res.data.payInfo;
@@ -483,6 +518,8 @@ page{
 	box-shadow: 0rpx 2rpx 12rpx 0rpx rgba(221,221,221,0.5);
 	border-radius: 20rpx;
 	padding: 32rpx;
+	content-visibility: auto;
+	contain-intrinsic-size: 346rpx;
 	.top{
 		font-size: 24rpx;
 		font-weight: 400;

center/orderdetails.vue

@@ -15,7 +15,7 @@
 					</view>
 				</view>
 				<view class="status-item" v-else-if="orderDetails.status==3">
-					<view class="text"><text v-if="countdown!='已超期'">距离演出开始，还剩 </text>{{countdown}}</view>
+					<view class="text"><text v-if="countdown!='演出已开始'">距离演出开始，还剩 </text>{{countdown}}</view>
 				</view>
 				<view class="status-item" v-else>
 					<view class="text">{{orderDetails.status|filterOrderState}}</view>
@@ -50,7 +50,7 @@
 					<view class="img-wrap">
 						<!-- <image class="img" :src="orderDetails.performImg"></image> -->
 						<view class="ayQrcode" @click="refreshCode">
-							<ayQrcode ref="qrcode" :modal="modal_qr" :url="qrContent" @hideQrcode="hideQrcode" :height="180" :width="180" />
+							<ayQrcode v-show="!showSingleQR" ref="qrcode" :modal="modal_qr" :url="qrContent" @hideQrcode="hideQrcode" :height="180" :width="180" />
 						</view>
 						<image v-if="orderDetails.status==4" class="refund-ico" :src="staticUrl+'/img/refund-ico.png'"></image>
 					</view>
@@ -91,7 +91,7 @@
 				</view> -->
 			</view>
 		</view>
-		<u-popup :show="showSingleQR" @close="closeSingleQR" @open="openSingleQR" :round="10" mode="center">
+		<u-popup :show="showSingleQR" @close="closeSingleQR" @open="openSingleQR" @touchmove.stop.prevent="handleMoveQrcode" :round="10" mode="center">
 			<view class="singleQR-wrap">
 				<view class="title">
 					二维码
@@ -160,6 +160,7 @@
 				singleQrContent:{},
 				formerNotice:'',
 				countdownTimer:null,//订单倒计时
+				templateIdList:[],//微信小程序订阅消息
 				
 			}
 		},
@@ -170,6 +171,8 @@
 			console.log('page',page);
 			this.id = page.id;
 			this.getSystemInfo();
+			
+			this.getTemplateIdList();//获取模板列表
 
 		},
 		onUnload() {
@@ -183,9 +186,12 @@
 			  const now = new Date().getTime();
 			  const distance = this.deadline - now;
 			  // console.log('distance',distance);
-			  if(distance<0){
+			  if(this.orderDetails.status==0 && distance<0){
 				  this.countdown = '支付超期';
 				  return
+			  }else if(this.orderDetails.status==3 && distance<0){
+				  this.countdown = '演出已开始';
+				  return
 			  }
 		
 			  // 计算倒计时时间，可以根据需求自定义显示方式
@@ -207,6 +213,19 @@
 					uni.navigateBack()
 				};
 			},
+			getTemplateIdList(){
+				this.$u.api.templateIdList({templateLabel:'order_pay'}).then(res=>{
+					console.log('getTemplateIdList',res.data);
+					this.templateIdList = res.data.list.map(item=>{
+						return item.templateId
+					});
+					// if(this.templateIdList.length>0){
+					// 	this.templateEven();
+					// }
+				}).catch(err=>{
+					console.log('getTemplateIdList',err);
+				})
+			},
 			// 展示二维码
 			showQrcode() {
 				let _this = this;
@@ -241,6 +260,7 @@
 						this.deadline = new Date(`${res.data.performDateTime}`).getTime();
 					}
 					if(res.data.status==3){
+						this.qrContent = {};
 						this.qrContent.qrcode = res.data.parentQrcodeNo;
 						this.qrContent.time = Date.now();
 						this.qrContent = JSON.stringify(this.qrContent);
@@ -303,7 +323,8 @@
 				}
 			},
 			pay(item){
-				this.gotoPay(this.orderDetails.id);
+				// this.gotoPay(this.orderDetails.id);
+				this.setTemplate(this.orderDetails.id);
 				// console.log('pay',item);
 				// uni.$u.route('/center/pay', {
 				// 	orderId: item.id,
@@ -406,6 +427,25 @@
 					}
 				});
 			},
+			// 设置小程序订阅消息
+			setTemplate(orderId) {
+				let that = this;
+				console.log('templateIdList',this.templateIdList);
+				uni.requestSubscribeMessage({  
+					tmplIds: that.templateIdList,  
+					success (res) {  
+						// that.gotoPay();
+						console.log("success:",res);  
+					},  
+					fail (res) {  
+						console.log("fail:",res);  
+					},  
+					complete (res) {  
+						that.gotoPay(orderId);
+						console.log("complete:",res);  
+					}  
+				})  
+			},
 			gotoPay(orderId){
 				this.$u.api.gotoPay({orderId:orderId,openid:''}).then(res=>{
 					this.payResult = res.data.payInfo;
@@ -495,6 +535,10 @@
 					console.log('getPerformerNotice',err);
 				})
 			},
+			handleMoveQrcode(){
+				console.log('handleMoveQrcode');
+				return false
+			}
 			
 
 		}

center/people.vue

@@ -114,14 +114,12 @@
 		},
 		methods: {
 			leftClick() {
-			   let canNavBack = getCurrentPages();
-			     if(canNavBack && canNavBack.length>1) {  
-			       uni.navigateBack({  
-			         delta: 1  
-			       });  
-			     } else {  
-			       history.back();  
-			     }
+			   let pages = getCurrentPages();
+			   if(pages.length==1){
+			   	uni.$u.route('/pages/index/index')
+			   }else{
+			   	uni.navigateBack()
+			   };
 			},
 			submit() {
 				this.$refs.uForm.validate().then(res => {

center/refund.vue

@@ -2,7 +2,7 @@
 	<view class="pages">
 		<view class="" :style="{height: navHeight+'px' }"></view>
 		<view class="navbar-box">
-			<u-navbar title="开具发票" :safeAreaInsetTop="true" @leftClick="leftClick" :titleStyle="{color:'#fff'}" leftIconColor="#fff" bgColor="#EF1818"></u-navbar>
+			<u-navbar title="申请退款" :safeAreaInsetTop="true" @leftClick="leftClick" :titleStyle="{color:'#fff'}" leftIconColor="#fff" bgColor="#EF1818"></u-navbar>
 		</view>
 		<view class="page-wrap">
 			<view class="box base-info">
@@ -69,8 +69,10 @@
 			leftClick(e){
 				let pages = getCurrentPages();
 				if(pages.length==1){
+					console.log('1111');
 					uni.$u.route('/pages/index/index')
 				}else{
+					console.log('2222222');
 					uni.navigateBack()
 				};
 			},
@@ -97,7 +99,8 @@
 					uni.$u.toast('请选择原因')
 					return
 				}
-				this.templateEven();
+				// this.templateEven();
+				this.setTemplate();
 				
 			},
 			handleSubmit(){
@@ -152,13 +155,14 @@
 				wx.requestSubscribeMessage({  
 					tmplIds: this.templateIdList,  
 					success (res) {  
-						that.handleSubmit();
+						// that.handleSubmit();
 						console.log("success:",res);  
 					},  
 					fail (res) {  
 						console.log("fail:",res);  
 					},  
 					complete (res) {  
+						that.handleSubmit();
 						console.log("complete:",res);  
 					}  
 				})  

pages/bookticket.vue

@@ -33,7 +33,7 @@
 					<view class="name">购票人信息</view>
 					<!-- <text>用于入园身份验证</text> -->
 				</view>
-				<view class="" v-if="pageContent.purchaser.idcard">
+				<view class="" v-if="vuex_member_info.isAuth">
 					<view class="item">姓名：{{pageContent.purchaser.name}}</view>
 					<view class="item">手机号：{{pageContent.purchaser.mobile|hidePhoneNumber}}</view>
 					<view class="item">身份证：{{pageContent.purchaser.idcard|maskID}}</view>
@@ -155,14 +155,26 @@
 				performId:'',
 				performInfo:{},
 				pageData:{},//上个页面传过来的数据
-				pageContent:{purchaser:{},ticketNotice:'',viewerList:[]},//页面信息
-				ticketNotice:'aaa',
+				pageContent:{
+					performName:'',
+					goodsName:'',
+					timeDate:'',
+					timeWeek:'',
+					seatTypeName:'',
+					auditoriumName:'',
+					performTimeEnd:'',
+					performTimeStart:'',
+					purchaser:{mobile:'',idcard:''},
+					ticketNotice:'',
+					viewerList:[],
+				},//页面信息
+				ticketNotice:'',
 				cansubmit:true,
 				staticUrl:this.$commonConfig.staticUrl,
-				visitors:[],//游客
+				visitors:[],//确认的游客
 				visitorShow:false,//游客弹层
 				visitorList:[],//游客列表
-				selectedVisitor:[],//选中的游客
+				selectedVisitor:[],//选中的游客(id)
 				params:{},//要提交的数据
 				orderId:'',//订单提交获取
 				payResult:{},//gotoPay结果
@@ -228,10 +240,11 @@
 				this.$u.api.selectMemberAll({userid:userId}).then(res=>{
 					// console.log('getMemberAll',res.data);
 					this.visitorList =  res.data.list;
-					console.log('this.visitorList',this.visitorList);
 					// this.visitors = this.visitorList.filter(obj => obj.memberId==userId);
-					this.visitors = this.visitorList.filter(obj => that.selectedVisitor.includes(obj.id));
-					console.log('this.visitors',this.visitors);
+					this.visitors = this.visitorList.filter(obj => that.selectedVisitor.includes(obj.idcard));
+					// console.log('this.visitorList',this.visitorList);
+					// console.log('this.selectedVisitor',this.selectedVisitor);
+					// console.log('this.visitors',this.visitors);
 				}).catch(err=>{
 					console.log('getMemberAll',err);
 				})
@@ -247,7 +260,8 @@
 			},
 			delVisitor(visitor){
 				// console.log('delVisitor',visitor);
-				this.visitors = this.visitors.filter(obj => obj.id!=visitor.id );
+				// console.log('this.visitors',this.visitors);
+				this.visitors = this.visitors.filter(obj => obj.idcard!=visitor.idcard );
 			},
 			addVisitor(){
 				uni.$u.route('/center/people', {
@@ -299,15 +313,17 @@
 					viewerList:this.visitors
 				}
 				this.cansubmit = false;
-				console.log('pageData',this.pageData);
-				console.log('visitors',this.visitors);
-				console.log('params',params);
+				// console.log('pageData',this.pageData);
+				// console.log('visitors',this.visitors);
+				// console.log('params',params);
 				this.$u.api.submitOrder(params).then(res=>{
-					console.log('submitOrder',res.data);
+					// console.log('submitOrder',res.data);
 					this.orderId = res.data.orderId;
-					this.templateEven();
+					// this.templateEven()
+					this.setTemplate();
 					
 				}).catch(err=>{
+					this.cansubmit = true;
 					console.log('submitOrder',err);
 				})
 			},
@@ -350,13 +366,14 @@
 				uni.requestSubscribeMessage({  
 					tmplIds: that.templateIdList,  
 					success (res) {  
-						that.gotoPay();
+						// that.gotoPay();
 						console.log("success:",res);  
 					},  
 					fail (res) {  
 						console.log("fail:",res);  
 					},  
 					complete (res) {  
+						that.gotoPay();
 						console.log("complete:",res);  
 					}  
 				})  
@@ -373,8 +390,9 @@
 					// }
 					console.log('gotoPayres',res.data);
 				}).catch(err=>{
-					this.paypass = '';
-					this.checkPassShow = false;
+					this.cansubmit = true;
+					// this.paypass = '';
+					// this.checkPassShow = false;
 					console.log('gotoPay',err);
 				})				
 			},
@@ -396,6 +414,7 @@
 						that.payQuery();
 					},
 				    fail(e) {
+						uni.$u.route('/center/order',{status:0});
 						console.log('wxPayfail',e);
 					},
 					complete(){
@@ -430,7 +449,8 @@
 							// 0-未支付 1-已支付 2-支付中 3-支付失败 4-支付退款
 							let payStatus = res.data.payStatus;
 							if(payStatus===1){
-								uni.$u.route('/center/paysuccess');
+								uni.$u.route('/center/order',{status:3});
+								// uni.$u.route('/center/paysuccess');
 							}else if(payStatus===0||payStatus===2){
 								this.payQuery()
 							}else if(payStatus===3){
@@ -624,12 +644,12 @@
 	}
 	.add-btn{
 		margin-bottom: 28rpx;
-		background: #E5F0FF;
+		background: #ffdee1;
 		border-radius: 44rpx;
 		padding: 26rpx;
 		font-size: 24rpx;
 		font-weight: 400;
-		color: #1677FF;
+		color: #ff1616;
 		.img{
 			width: 28rpx;
 			height: 36rpx;

pages/chosenposition.vue

@@ -12,7 +12,7 @@
 					<text>{{pageData.performTimeStart}} - {{pageData.performTimeEnd}}</text>
 				</view>
 			</view>
-			<view class="position-wrap u-flex u-row-center">
+			<view class="position-wrap">
 				<view class="item" :class="{active:positionIndex==index}" :style="{color:positionIndex==index?'#fff':item.seatColor,borderColor:item.seatColor,backgroundColor:positionIndex==index?item.seatColor:'#fff'}" @click="positionClick(index)" v-for="(item,index) in positionArr" :key="index">
 					<!-- <image class="icon" :src="item.icon" ></image> -->
 					<view>{{item.seatTypeName}}</view>
@@ -134,12 +134,18 @@ page{
 	}
 }
 .position-wrap{
-	margin-bottom: 80rpx;
+	margin-bottom: 30rpx;
+	display: grid;
+	grid-template-columns: repeat(3, 1fr);
+	gap: 14rpx;
 	.item{
-		padding: 20rpx 40rpx 14rpx;
+		// padding: 20rpx 40rpx 14rpx;
+		padding: 20rpx 0;
+		box-sizing: border-box;
+		// flex: 1;
 		border-radius: 8rpx;
 		border: 2rpx solid #D9D9D9;
-		margin: 0 24rpx;
+		// margin: 0 24rpx 24rpx;
 		font-size: 24rpx;
 		font-weight: 500;
 		color: #EF1D1E;

pages/index/index.vue

@@ -62,7 +62,7 @@
 			<view class="news">
 				<u-scroll-list :indicator="false">
 					<view class="item" v-for="(item, index) in newsList" @click="newsClick(item)" :key="index">
-						<image class="img" :src="item.showImg||staticUrl+'/img/newsdetails-banner.png'"></image>
+						<image class="img" :src="item.mainImg"></image>
 						<view class="text">
 							<view class="name u-line-1">{{item.title}}</view>
 							<view class="con u-line-1" v-html="item.centent"></view>

pages/ticketlist.vue

@@ -16,7 +16,7 @@
 			<view class="inner">
 				<view class="name">{{theatre.name}}</view>
 				<view class="addr u-flex u-row-between">
-					<view class="text">演出地址：{{theatre.address}}</view>
+					<view class="text">演出地址：{{theatre.address||''}}</view>
 					<view class="menu u-flex">
 						<view class="item" @click="goMap">
 							<image class="icon" :src="staticUrl+'/img/map-ico.png'" ></image>
@@ -58,8 +58,12 @@
 				<view class="date-block">
 					<view class="title">演出日期</view>
 					<view class="date-list u-flex">
-						<view class="date-item" :class="{active:dateIndex==index}" @click="dateClick(index)" v-for="(date,index) in dateList" :key="index">
-							<view class="name">{{ date.name || ' ' }}</view>
+						<view class="date-item" 
+						:class="{active:dateIndex==index,dot:performDateList.find(item => item.performDate === `${date.year}-${date.month}-${date.day}`) !== undefined}" 
+						@click="dateClick(index)" 
+						v-for="(date,index) in dateList" :key="index">
+							<!-- <view class="name">{{ date.name || ' ' }}</view> -->
+							<view class="name">{{ performDateList.find(item => item.performDate === `${date.year}-${date.month}-${date.day}`) !== undefined?'有演出':'无演出' }}</view>
 							<view class="date">{{ date.month }} - {{ date.day }}</view>
 						</view>
 						<view class="date-item more-date u-flex u-row-center" @click="calendarShow = true">
@@ -96,12 +100,12 @@
 							<text class="text">{{(item.quantity>0&&sessionList.length>=1)?'有票':'无票'}}</text>
 						</view> -->
 						<view class="bottom u-flex u-row-between">
-							<view class="left u-flex">
+							<view class="left u-flex" v-html="item.goodsSnapshot||''">
 								<!-- 购票须知
 								<u-icon name="arrow-right" color="#7F7F7F" size="24rpx"></u-icon> -->
-								{{item.goodsSnapshot||''}}
+								<!-- {{item.goodsSnapshot||''}} -->
 							</view>
-							<view class="btn" @click="book(item)" v-if="item.quantity>0&&sessionList.length>=1">预定</view>
+							<view class="btn" @click="book(item)" v-if="item.quantity!==0&&sessionList.length>=1">预定</view>
 							<view class="btn disabled" v-else>无票</view>
 						</view>
 					</view>
@@ -290,7 +294,7 @@
 				// console.log('param',param);
 				this.$u.api.getAuditoriumTimes(param).then(res=>{
 					// console.log('getTimes',res.data);
-					// this.performDateList = res.data.performDateList;
+					this.performDateList = res.data.performDateList||[];
 					this.sessionList = res.data.list.map(item=>{
 						item.performTimeStart = item.performTimeStart;
 						item.performTimeEnd = item.performTimeEnd;

static/css/common.scss

@@ -126,6 +126,15 @@ $pagegap:32rpx;
 			}
 			
 		}
+		&.dot::after{
+			content: '';
+			width: 4px;
+			height: 4px;
+			border-radius: 50%;
+			background-color: #ED0000;
+			position: absolute;
+			right: 10rpx;
+			top: 5px;		}
 		.name{
 			padding-top: 26rpx;
 			margin-bottom: 12rpx;