整体调整,订阅功能

center/orderdetails.vue

@@ -64,7 +64,7 @@
 				<view class="item u-flex u-row-around" v-for="(item,index) in orderDetails.viewersList" :key="index">
 					<text>观影人员{{index + 1}}</text>
 					<text>{{item.name}}</text>
-					<text>{{item.id}}</text>
+					<text>{{item.idcard|maskID}}</text>
 					<text v-if="orderDetails.status==3" @click="singleQR(item,index)" class="qrbtn">查看二维码</text>
 				</view>
 			</view>
@@ -99,7 +99,7 @@
 				</view>
 				<view class="single-info">
 					<view class="item">姓名：{{singleInfo.name}}</view>
-					<view class="item">身份证号码：{{singleInfo.idcard}}</view>
+					<view class="item">身份证号码：{{singleInfo.idcard|maskID}}</view>
 					<view class="item">座位：{{singleInfo.seatName}}</view>
 					<view class="item">状态：{{singleInfo.status|filterSingleState}}</view>
 				</view>
@@ -154,7 +154,7 @@
 				params:{
 					
 				},
-				singleInfo:{},//观影人信息
+				singleInfo:{idcard:''},//观影人信息
 				showSingleQR:false,//显示单人二维码
 				singleModalQr:false,
 				singleQrContent:{},

center/refund.vue

@@ -50,7 +50,8 @@
 				],
 				params:{
 					
-				}
+				},
+				templateIdList:[],//微信小程序订阅消息
 				
 			}
 		},
@@ -61,6 +62,7 @@
 			this.orderId = page.id;
 			this.realPrice = page.realPrice;
 			this.getSystemInfo();
+			this.getTemplateIdList();//获取模板列表
 
 		},
 		methods: {
@@ -72,6 +74,19 @@
 					uni.navigateBack()
 				};
 			},
+			getTemplateIdList(){
+				this.$u.api.templateIdList({templateLabel:'order_refund'}).then(res=>{
+					console.log('res',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);
+				})
+			},
 			confirmReason(e){
 				console.log('confirmReason',e.value[0]);
 				this.refundReason = e.value[0];
@@ -82,6 +97,10 @@
 					uni.$u.toast('请选择原因')
 					return
 				}
+				this.templateEven();
+				
+			},
+			handleSubmit(){
 				let params = {
 					orderId:this.orderId,
 					refundReason:this.refundReason
@@ -93,7 +112,57 @@
 				}).catch(err=>{
 					console.log('refundSubmit',err);
 				})
-			}
+			},
+			// 订阅消息
+			templateEven(){
+				let that = this
+				wx.showModal({
+					  title: '温馨提示',
+					  content: '为更好的促进与您的交流，服务号需要实时向您发送消息',
+					  confirmText:"同意",
+					  cancelText:"拒绝",
+					  success: function (res) {
+						  if (res.confirm) {
+							 //调用订阅消息
+							  console.log('用户点击确定');
+							  //调用订阅
+							  that.setTemplate();
+						  } else if (res.cancel) {
+							  console.log('用户点击取消');
+							  ///显示第二个弹说明一下
+							  wx.showModal({
+								title: '温馨提示',
+								content: '拒绝后您将无法获取实时的消息',
+								confirmText:"知道了",
+								showCancel:false,
+								success: function (res) {
+									that.handleSubmit();
+								  ///点击知道了的后续操作 
+								  ///如跳转首页面 
+								}
+							});
+						  }
+					  }
+				  });
+			},
+			// 设置小程序订阅消息
+			setTemplate() {
+				let that = this;
+				// console.log('templateIdList',this.templateIdList);
+				wx.requestSubscribeMessage({  
+					tmplIds: this.templateIdList,  
+					success (res) {  
+						that.handleSubmit();
+						console.log("success:",res);  
+					},  
+					fail (res) {  
+						console.log("fail:",res);  
+					},  
+					complete (res) {  
+						console.log("complete:",res);  
+					}  
+				})  
+			},
 
 		}
 	}

common/apiurl.js

@@ -157,6 +157,11 @@ const apiurl = {
 		url: '/order/orderInfo/cancel',
 		type: 'post'
 	},
+	// 获取模板列表
+	templateIdList: {
+		url: '/system/wxTemplateInfo/templateList',
+		type: 'get'
+	},
 	
 }
 

pages.json

@@ -31,7 +31,7 @@
 		{
 			"path": "pages/ticketlist",
 			"style": {
-				"navigationBarTitleText": "订单详情",
+				"navigationBarTitleText": "票务购买",
 				"navigationStyle": "custom"
 			}
 		},

pages/bookticket.vue

@@ -167,6 +167,7 @@
 				orderId:'',//订单提交获取
 				payResult:{},//gotoPay结果
 				paysuccess:false,//支付结果
+				templateIdList:[],//微信小程序订阅消息
 				
 			}
 		},
@@ -200,6 +201,8 @@
 			this.getSystemInfo();
 			this.getSettlement();
 			
+			this.getTemplateIdList();//获取模板列表
+			
 		},
 		methods: {
 			leftClick(e){
@@ -262,6 +265,19 @@
 					idcard:item.idcard,
 				});
 			},
+			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);
+				})
+			},
 			submitorder(){
 				let params = {
 					performId:this.pageContent.performId,
@@ -289,11 +305,62 @@
 				this.$u.api.submitOrder(params).then(res=>{
 					console.log('submitOrder',res.data);
 					this.orderId = res.data.orderId;
-					this.gotoPay();
+					this.templateEven();
+					
 				}).catch(err=>{
 					console.log('submitOrder',err);
 				})
 			},
+			// 订阅消息
+			templateEven(){
+				let that = this
+				wx.showModal({
+					  title: '温馨提示',
+					  content: '为更好的促进与您的交流，服务号需要实时向您发送消息',
+					  confirmText:"同意",
+					  cancelText:"拒绝",
+					  success: function (res) {
+						  if (res.confirm) {
+							 //调用订阅消息
+							  console.log('用户点击确定');
+							  //调用订阅
+							  that.setTemplate();
+						  } else if (res.cancel) {
+							  console.log('用户点击取消');
+							  ///显示第二个弹说明一下
+							  wx.showModal({
+								title: '温馨提示',
+								content: '拒绝后您将无法获取实时的消息',
+								confirmText:"知道了",
+								showCancel:false,
+								success: function (res) {
+									that.gotoPay();
+								  ///点击知道了的后续操作 
+								  ///如跳转首页面 
+								}
+							});
+						  }
+					  }
+				  });
+			},
+			// 设置小程序订阅消息
+			setTemplate() {
+				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) {  
+						console.log("complete:",res);  
+					}  
+				})  
+			},
 			gotoPay(){
 				this.$u.api.gotoPay({orderId:this.orderId,openid:''}).then(res=>{
 					this.payResult = res.data.payInfo;

pages/chosenposition.vue

@@ -13,9 +13,9 @@
 				</view>
 			</view>
 			<view class="position-wrap u-flex u-row-center">
-				<view class="u-flex 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">
+				<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> -->
-					<text style="margin-right: 5px;">{{item.seatTypeName}}</text>
+					<view>{{item.seatTypeName}}</view>
 					<text>¥ {{item.salePrice}}</text>
 				</view>
 			</view>
@@ -136,13 +136,14 @@ page{
 .position-wrap{
 	margin-bottom: 80rpx;
 	.item{
-		padding: 20rpx 24rpx 14rpx;
+		padding: 20rpx 40rpx 14rpx;
 		border-radius: 8rpx;
 		border: 2rpx solid #D9D9D9;
 		margin: 0 24rpx;
 		font-size: 24rpx;
 		font-weight: 500;
 		color: #EF1D1E;
+		text-align: center;
 		.icon{
 			display: block;
 			width: 36rpx;

pages/index/index.vue

@@ -12,6 +12,7 @@
 				radius="0"
 				indicator
 				circular
+				@click="bannerClick"
 			></u-swiper>
 		</view>
 		<!-- 占位 banner -->
@@ -64,7 +65,7 @@
 						<image class="img" :src="item.showImg||staticUrl+'/img/newsdetails-banner.png'"></image>
 						<view class="text">
 							<view class="name u-line-1">{{item.title}}</view>
-							<view class="con u-line-1">{{item.centent}}</view>
+							<view class="con u-line-1" v-html="item.centent"></view>
 							<view class="time u-flex u-row-between">
 								<view class="left">{{$u.timeFormat(item.onlineTime, 'yyyy-mm-dd')}}</view>
 								<image class="icon" :src="staticUrl+'/img/arrow-right-ico.png'" ></image>
@@ -125,7 +126,7 @@
 				posterShow:false,
 				posterStyle:{},
 				posterSrc:'',
-				templateIdList:[],//微信小程序订阅消息
+				
 				
 				
 			}
@@ -147,8 +148,6 @@
 			// console.log('navHeight',this.navHeight);
 			// console.log('vuex_member_info=======',this.vuex_member_info);
 			this.getClientIndex();
-			
-			this.getTemplateIdList();
 
 		},
 		onReady() {
@@ -289,63 +288,16 @@
 					type:'news'
 				});
 			},
-			getTemplateIdList(){
-				this.$u.api.templateIdList().then(res=>{
-					console.log('res',res.data);
-					if(this.templateIdList.length>0){
-						this.templateEven();
-					}
-				}).catch(err=>{
-					console.log('getTemplateIdList',err);
-				})
-			},
-			// 订阅消息
-			templateEven(){
-				let that = this
-				wx.showModal({
-					  title: '温馨提示',
-					  content: '为更好的促进与您的交流，服务号需要实时向您发送消息',
-					  confirmText:"同意",
-					  cancelText:"拒绝",
-					  success: function (res) {
-						  if (res.confirm) {
-							 //调用订阅消息
-							  console.log('用户点击确定');
-							  //调用订阅
-							  that.setTemplate();
-						  } else if (res.cancel) {
-							  console.log('用户点击取消');
-							  ///显示第二个弹说明一下
-							  wx.showModal({
-								title: '温馨提示',
-								content: '拒绝后您将无法获取实时的消息',
-								confirmText:"知道了",
-								showCancel:false,
-								success: function (res) {
-								  ///点击知道了的后续操作 
-								  ///如跳转首页面 
-								}
-							});
-						  }
-					  }
-				  });
-			},
-			// 设置小程序订阅消息
-			setTemplate() {
-				// console.log('templateIdList',this.templateIdList);
-				wx.requestSubscribeMessage({  
-					tmplIds: this.templateIdList,  
-					success (res) {  
-						console.log("success:",res);  
-					},  
-					fail (res) {  
-						console.log("fail:",res);  
-					},  
-					complete (res) {  
-						console.log("complete:",res);  
-					}  
-				})  
-			},
+			bannerClick(e){
+				let item = this.bannerList[e];
+				// console.log('bannerClick',this.bannerList[e]);
+				uni.$u.route('/pages/newsdetails', {
+					id: item.id,
+					type:'swiperDetail'
+				});
+			}
+			
+			
 		}
 	}
 </script>
@@ -422,7 +374,8 @@ $pagegap:32rpx;
 		position: relative;
 		border-radius: 30rpx;
 		overflow: hidden;
-		background: radial-gradient(circle at -26rpx 230rpx, transparent 10%, #fff 4%) left, radial-gradient(circle at calc( 100% + 26rpx ) 232rpx, transparent 10%, #fff 4%) right;
+		// background: radial-gradient(circle at -26rpx 230rpx, transparent 10%, #fff 4%) left, radial-gradient(circle at calc( 100% + 26rpx ) 232rpx, transparent 10%, #fff 4%) right;
+		background-color: #fff;
 		background-size: 50% 100%;
 		background-repeat: no-repeat;
 		.img{
@@ -432,15 +385,16 @@ $pagegap:32rpx;
 		}
 		.text{
 			position: relative;
-			&:before{
-				content: '';
-				width: calc( 100% - 32rpx );
-				height: 1px;
-				position: absolute;
-				left: 20rpx;
-				top: -2rpx;
-				border-top: 4rpx dashed #931E0C;
-			}
+			// &:before{
+			// 	content: '';
+			// 	// width: calc( 100% - 32rpx );
+			// 	width: 100%;
+			// 	height: 1px;
+			// 	position: absolute;
+			// 	left: 0;
+			// 	top: -2rpx;
+			// 	border-top: 4rpx dashed #931E0C;
+			// }
 			
 			padding: 32rpx 30rpx;
 			.name{

pages/newsdetails.vue

@@ -34,10 +34,18 @@
 			let that = this;
 			this.getSystemInfo();
 			this.id = page.id;
-			this.getDetails();
-			setTimeout(()=>{
-				that.addReadRecord()
-			},2000);
+			this.type = page.type;
+			if(this.type=='swiperDetail'){
+				// console.log('this.id',this.id);
+				this.getSwiperDetails(this.id);
+			}else{
+				this.getDetails(this.id);
+				setTimeout(()=>{
+					that.addReadRecord()
+				},2000);
+			}
+			// this.getDetails();
+			
 
 		},
 		methods: {
@@ -49,6 +57,14 @@
 					uni.navigateBack()
 				};
 			},
+			getSwiperDetails(id){
+				this.$u.api.swiperDetails({id:id}).then(res=>{
+					this.swiperDetails = res.data;
+					// console.log('res',res);
+					}).catch(err=>{
+					console.log('getSwiperDetails',err.data);
+				})
+			},
 			getDetails(){
 				this.$u.api.newsdetails({id:this.id}).then(res=>{
 					this.details = res.data;

pages/ticketlist.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="pages">
 		<view class="navbar-box">
-			<u-navbar title="订单详情" :safeAreaInsetTop="true" @leftClick="leftClick" :titleStyle="{color:'#fff'}" leftIconColor="#fff" bgColor="transparent"></u-navbar>
+			<u-navbar title="票务购买" :safeAreaInsetTop="true" @leftClick="leftClick" :titleStyle="{color:'#fff'}" leftIconColor="#fff" bgColor="transparent"></u-navbar>
 		</view>
 		<view class="banner">
 			<!-- <image class="img" :src="staticUrl+'/img/bookticket-banner.png'" alt=""> -->
@@ -84,6 +84,9 @@
 				</view>
 				<view class="date-block ticket-type">
 					<view class="title">门票</view>
+					<view class="empty" v-if="ticketTypeList.length<1">
+						暂无门票
+					</view>
 					<view class="type-item" :class="{active:sessionIndex==index}" v-for="(item,index) in  ticketTypeList" :key="index">
 						<view class="name-price u-flex u-row-between">
 							<view class="name">{{item.goodsName}}</view>
@@ -275,6 +278,7 @@
 				})
 			},
 			getTimes(){
+				uni.showLoading();
 				let auditoriumId= this.auditoriumList[this.auditoriumIndex]?.id;
 				if(!auditoriumId){return}
 				let dateOBJ = this.dateList[this.dateIndex];
@@ -286,11 +290,13 @@
 				// console.log('param',param);
 				this.$u.api.getAuditoriumTimes(param).then(res=>{
 					// console.log('getTimes',res.data);
+					// this.performDateList = res.data.performDateList;
 					this.sessionList = res.data.list.map(item=>{
 						item.performTimeStart = item.performTimeStart;
 						item.performTimeEnd = item.performTimeEnd;
 						return item
 					});
+					uni.hideLoading();
 				}).catch(err=>{
 					console.log('getPoster',err);
 				})
@@ -337,6 +343,7 @@
 			},
 			auditoriumClick(index){
 				this.auditoriumIndex = index;
+				this.getTimes();
 			},
 			confirmCalendar(e){
 				// console.log('confirmCalendar',e);
@@ -643,14 +650,15 @@
 	line-height: 48rpx;
 	margin-bottom: 38rpx;
 }
-.session-wrap{
-	.empty{
+.empty{
 		background-color: #636363;
 		color: #979797;
 		border-radius: 8rpx;
 		padding: 24rpx;
 		text-align: center;
 	}
+.session-wrap{
+	
 }
 .session{
 	 display: grid;

static/css/common.scss

@@ -68,7 +68,7 @@ $pagegap:32rpx;
 	padding: 30rpx 20rpx;
 }
 .full-btn{
-	background-color: #1677FF;
+	background-color: #F01414;
 	color: #fff;
 	border-radius: 44rpx;
 	padding: 22rpx 0;