订单调整，切换appid后真机调试，并调整内容

center/factorauth.vue

@@ -87,7 +87,8 @@
 		},
 		onLoad(page) {
 			console.log('page',page);
-			this.backUrl =  decodeURIComponent(page.backUrl)||'/center/center'
+			this.backUrl =  decodeURIComponent(page.backUrl)||'/center/center';
+			console.log('this.backUrl',this.backUrl);
 		},
 		methods: {
 			leftClick(){
@@ -121,8 +122,13 @@
 						icon:'success'
 					})
 					setTimeout(()=>{
-						console.log('this.backUrl',this.backUrl);
-						uni.reLaunch({url: this.backUrl});
+						// console.log('this.backUrl',this.backUrl);
+						// uni.reLaunch({url: this.backUrl});
+						if(this.backUrl){
+							uni.$u.route(this.backUrl)
+						}else{
+							uni.navigateBack()
+						};
 					},2000)
 					// console.log('memberInfo',this.memberInfo);
 					}).catch(err=>{

center/orderdetails.vue

@@ -8,14 +8,14 @@
 		<view class="page-wrap">
 			<view class="status-content">
 				<view class="status-item" v-if="orderDetails.status==0">
-					<view class="text">请尽快完成付款，还剩 {{countdown}}</view>
-					<view class="btn-wrap u-flex u-row-center">
+					<view class="text"><text v-if="countdown!='支付超期'"> 请尽快完成付款，还剩 </text>{{countdown}}</view>
+					<view class="btn-wrap u-flex u-row-center" v-if="countdown!='支付超期'">
 						<view class="btn cancel" @click="cancelOrder">取消订单</view>
 						<view class="btn" @click="gotoPay(orderDetails.id)">立即支付</view>
 					</view>
 				</view>
 				<view class="status-item" v-else-if="orderDetails.status==3">
-					<view class="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>
@@ -130,17 +130,20 @@
 				loadingPage:true,
 				staticUrl:this.$commonConfig.staticUrl,
 				orderDetails:{},
-				deadline: new Date("2023-12-01").getTime(), // 设置截止时间为某个日期的时间戳
+				deadline: null, // 设置截止时间为某个日期的时间戳
 				countdown: '', // 用于显示倒计时时间
+				// 状态(0待支付，2超时取消，3支付完成，待使用，4退款中，5己退款，6退款失败，7己使用，8己超期）
 				orderInfo:{
 					0:[{name:'需付金额',key:'realPrice'},{name:'订单编号',key:'orderNum'},{name:'下单时间',key:'createTime'}],
 					1:[{name:'订单编号',key:'orderNum'},{name:'下单时间',key:'createTime'},{name:'支付方式',key:'payWay'},{name:'支付时间',key:'payTime'}],
 					2:[{name:'订单编号',key:'orderNum'},{name:'下单时间',key:'createTime'},{name:'支付方式',key:'payWay'},{name:'支付时间',key:'payTime'}],
-					3:[{name:'订单编号',key:'orderNum'},{name:'下单时间',key:'createTime'},{name:'支付方式',key:'payWay'},{name:'支付时间',key:'payTime'}],
+					3:[{name:'订单金额',key:'realPrice'},{name:'订单编号',key:'orderNum'},{name:'下单时间',key:'createTime'},{name:'支付方式',key:'payWay'},{name:'支付时间',key:'payTime'}],
 					4:[{name:'订单编号',key:'orderNum'},{name:'下单时间',key:'createTime'},{name:'支付方式',key:'payWay'},{name:'支付时间',key:'payTime'}],
-					5:[{name:'订单编号',key:'orderNum'},{name:'下单时间',key:'createTime'},{name:'支付方式',key:'payWay'},{name:'支付时间',key:'payTime'}],
-					6:[{name:'订单编号',key:'orderNum'},{name:'下单时间',key:'createTime'},{name:'支付方式',key:'payWay'},{name:'支付时间',key:'payTime'}],
+					5:[{name:'订单编号',key:'orderNum'},{name:'下单时间',key:'createTime'},{name:'支付方式',key:'payWay'},{name:'支付时间',key:'payTime'},{name:'备注信息',key:'remark'}],
+					6:[{name:'订单编号',key:'orderNum'},{name:'下单时间',key:'createTime'},{name:'支付方式',key:'payWay'},{name:'支付时间',key:'payTime'},{name:'备注信息',key:'remark'}],
 					7:[{name:'订单编号',key:'orderNum'},{name:'下单时间',key:'createTime'},{name:'支付方式',key:'payWay'},{name:'支付时间',key:'payTime'}],
+					8:[{name:'订单金额',key:'realPrice'},{name:'订单编号',key:'orderNum'},{name:'下单时间',key:'createTime'},{name:'备注信息',key:'remark'}],
+					9:[{name:'订单金额',key:'realPrice'},{name:'订单编号',key:'orderNum'},{name:'下单时间',key:'createTime'},{name:'备注信息',key:'remark'}],
 				},
 				tipsArr:[
 					'1.请提前到达影院现场，找到自助取票机，打印纸质电影票，完成取票',
@@ -156,6 +159,7 @@
 				singleModalQr:false,
 				singleQrContent:{},
 				formerNotice:'',
+				countdownTimer:null,//订单倒计时
 				
 			}
 		},
@@ -171,12 +175,18 @@
 		onUnload() {
 		    // 页面离开时停止计时器
 		    // clearInterval(this.timer)
+			clearInterval(this.countdownTimer)
 		},
 		mounted() {
 			// 每秒更新倒计时时间
-			setInterval(() => {
+			this.countdownTimer = setInterval(() => {
 			  const now = new Date().getTime();
 			  const distance = this.deadline - now;
+			  // console.log('distance',distance);
+			  if(distance<0){
+				  this.countdown = '支付超期';
+				  return
+			  }
 		
 			  // 计算倒计时时间，可以根据需求自定义显示方式
 			  const days = Math.floor(distance / (1000 * 60 * 60 * 24));
@@ -225,7 +235,11 @@
 				this.$u.api.orderDetails({id:id}).then(res=>{
 					this.loadingPage = false;
 					this.orderDetails = res.data
-					this.deadline = new Date(`${res.data.performDate} ${res.data.performTimeStart}`).getTime();
+					if(res.data.status==0){//待支付
+						this.deadline = new Date(`${res.data.cancelDateTime}`).getTime();
+					}else if(res.data.status==3){//待使用
+						this.deadline = new Date(`${res.data.performDateTime}`).getTime();
+					}
 					if(res.data.status==3){
 						this.qrContent.qrcode = res.data.parentQrcodeNo;
 						this.qrContent.time = Date.now();
@@ -239,6 +253,8 @@
 					// console.log('this.deadline',this.deadline);
 					// console.log('orderDetails',JSON.parse(JSON.stringify(res.data)));
 				}).catch(err=>{
+					uni.$u.toast('获取数据失败,!请重试')
+					uni.navigateBack();
 					console.log('getOrderDetails',err);
 				})
 			},

components/tabbar.vue

@@ -8,8 +8,8 @@
 			:border="false"
 			inactiveColor="#666"
 			activeColor="#EE0808"
-			:customStyle="{'padding-top':'5px','padding-bottom':'5px','z-index':'30','bottom':'40rpx','margin':'0 48rpx','border-radius':'50rpx','box-shadow':'rgba(100, 100, 111, 0.2) 0px 7px 29px 0px'}"
-			:safeAreaInsetBottom="true"
+			:customStyle="{'padding-top':'5px','padding-bottom':'5px','z-index':'30','margin':'0 48rpx 40rpx','border-radius':'50rpx','box-shadow':'rgba(100, 100, 111, 0.2) 0px 7px 29px 0px'}"
+			:safeAreaInsetBottom="false"
 		>
 			<u-tabbar-item text="购票" >
 				<image
@@ -125,4 +125,7 @@ export default {
 		transform: scale(1.5) translateY(-0.5em);
 	}
 }
+.tabbar /deep/ .u-tabbar-item{
+	height: 100rpx;
+}
 </style>

manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "scenic_mobileui",
-    "appid" : "__UNI__BC58C1C",
+    "appid" : "__UNI__19294A5",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",
@@ -50,21 +50,20 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx00de87c85a9a0a42",
+        "appid" : "wx1a07584f15abf1ff",
         "setting" : {
             "urlCheck" : false,
             "minified" : true,
             "postcss" : true
         },
         "usingComponents" : true,
-        "permission" : {
-            // "scope.userLocation" : {
-            //     "desc" : "你的位置信息将用于小程序位置接口的效果展示"
-            // },
-            // "scope.writePhotosAlbum" : {
-            //     "desc" : "保存图片到相册"
-            // }
-        },
+        "permission" : {},
+        // "scope.userLocation" : {
+        //     "desc" : "你的位置信息将用于小程序位置接口的效果展示"
+        // },
+        // "scope.writePhotosAlbum" : {
+        //     "desc" : "保存图片到相册"
+        // }
         "requiredPrivateInfos" : [ "getLocation", "chooseLocation" ],
         "lazyCodeLoading" : "requiredComponents"
     },

pages/index/index.vue

@@ -124,7 +124,8 @@
 				shareShow:false,
 				posterShow:false,
 				posterStyle:{},
-				posterSrc:''
+				posterSrc:'',
+				templateIdList:[],//微信小程序订阅消息
 				
 				
 			}
@@ -146,6 +147,8 @@
 			// console.log('navHeight',this.navHeight);
 			// console.log('vuex_member_info=======',this.vuex_member_info);
 			this.getClientIndex();
+			
+			this.getTemplateIdList();
 
 		},
 		onReady() {
@@ -285,7 +288,64 @@
 					id: item.id,
 					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);  
+					}  
+				})  
+			},
 		}
 	}
 </script>
@@ -454,7 +514,7 @@ $pagegap:32rpx;
 				font-size: 24rpx;
 				font-weight: 400;
 				color: #6B6B6B;
-				line-height: 22rpx;
+				// line-height: 22rpx;
 				margin-bottom: 20rpx;
 			}
 			.time{

pages/news.vue

@@ -29,7 +29,7 @@
 					<view v-for="(item,index) in dataList" class="item u-flex" :class="{ show: show }" @click="itemClick(item)" :key="item.id">
 						<view class="text">
 							<view class="title u-line-1">{{ item.title }}</view>
-							<view class="con u-line-2">{{ item.centent }}</view>
+							<view class="con u-line-2" v-html="item.centent"></view>
 							<view class="time">{{ $u.timeFormat(item.onlineTime, 'yyyy-mm-dd') }}</view>
 						</view>
 						<image class="img" :src="item.mainImg||staticUrl+'/img/newsdetails-banner.png'" mode=""></image>

pages/ticketlist.vue

@@ -10,10 +10,25 @@
 				<view class="share" @click="openShare(item)">
 					<image class="icon" :src="staticUrl+'/img/share-ico.png'" ></image>
 				</view>
+			</view>
+		</view>
+		<view class="base-info">
+			<view class="inner">
 				<view class="name">{{theatre.name}}</view>
 				<view class="addr u-flex u-row-between">
-					<view class="text">{{theatre.address}}</view>
-					<u-icon name="arrow-right" color="#ffffff" size="36rpx" @click="goMap"></u-icon>
+					<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>
+							<text>导航</text>
+						</view>
+						<view class="item"  @click="phoneCall">
+							<image class="icon" :src="staticUrl+'/img/phone-call-ico.png'" ></image>
+							<text>电话</text>
+						</view>
+					<!-- 	<u-icon name="arrow-right" color="#ffffff" size="36rpx" @click="goMap"></u-icon>
+						<u-icon name="arrow-right" color="#ffffff" size="36rpx" @click="goMap"></u-icon> -->
+					</view>
 				</view>
 			</view>
 		</view>
@@ -72,7 +87,7 @@
 					<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>
-							<view class="prices">¥ {{item.salePrice}}</view>
+							<view class="prices">¥ {{item.salePrice}} 起</view>
 						</view>
 						<!-- <view class="ishave">
 							<text class="text">{{(item.quantity>0&&sessionList.length>=1)?'有票':'无票'}}</text>
@@ -196,6 +211,7 @@
 				shareShow:false,
 				posterShow:false,
 				posterSrc:'',
+				posterSrcType:null,
 				performInfo:{},//节目详情
 				formerNotice:{},//节目观影须知
 				performDateList:[],//有票的日期
@@ -388,6 +404,7 @@
 							canvasId: 'canvas',
 							success: res3 => {
 							  this.posterSrc = res3.tempFilePath;
+							  this.posterSrcType = 'local';
 							},
 							fail: err => {
 							  console.error(err);
@@ -423,54 +440,18 @@
 					uni.showLoading({
 						title: '保存中'
 					});
+					if(this.posterSrcType == 'local'){
+						let params = {
+							tempFilePath:that.posterSrc
+						}
+						that.saveImageToPhotosAlbum(params);
+						return
+					}
 			      uni.downloadFile({
 			        url: this.posterSrc,
 			        success(res) {
 			          if (res.statusCode === 200) {
-			            uni.saveImageToPhotosAlbum({
-			              filePath: res.tempFilePath,
-			              success() {
-			                uni.showToast({
-			                  title: '保存到相册成功',
-			                  icon: 'success'
-			                });
-			              },
-			              fail(err) {
-							  console.log('保存图片失败',err);
-			                if (err.errMsg === 'saveImageToPhotosAlbum:fail auth deny') {
-								uni.getSetting({
-								  success(res) {
-									if (!res.authSetting['scope.writePhotosAlbum']) {
-									  uni.showModal({
-										title: '提示',
-										content: '您还没有授权访问相册，请前往设置页面打开权限。',
-										confirmText: '去设置',
-										success(res) {
-										  if (res.confirm) {
-											uni.openSetting();
-										  }
-										}
-									  });
-									} else {
-									  uni.showToast({
-										title: '保存图片失败',
-										icon: 'none'
-									  });
-									}
-								  }
-								});
-							  } else {
-								uni.showToast({
-								  title: '保存图片失败',
-								  icon: 'none'
-								});
-							}
-			              },
-						  complete() {
-						  	uni.hideLoading();
-							that.posterShow = false;
-						  }
-			            });
+						  that.saveImageToPhotosAlbum(res)
 			          } else {
 			            uni.showToast({
 			              title: '下载图片失败',
@@ -478,7 +459,9 @@
 			            });
 			          }
 			        },
-			        fail() {
+			        fail(e) {
+						console.log('下载图片失败', e);
+						console.log('posterSrc',that.posterSrc);
 			          uni.showToast({
 			            title: '下载图片失败',
 			            icon: 'none'
@@ -486,6 +469,53 @@
 			        }
 			      });
 			    },
+				saveImageToPhotosAlbum(res){
+					let that = this;
+					uni.saveImageToPhotosAlbum({
+					  filePath: res.tempFilePath,
+					  success() {
+					    uni.showToast({
+					      title: '保存到相册成功',
+					      icon: 'success'
+					    });
+					  },
+					  fail(err) {
+						  console.log('保存图片失败',err);
+					    if (err.errMsg === 'saveImageToPhotosAlbum:fail auth deny') {
+							uni.getSetting({
+							  success(res) {
+								if (!res.authSetting['scope.writePhotosAlbum']) {
+								  uni.showModal({
+									title: '提示',
+									content: '您还没有授权访问相册，请前往设置页面打开权限。',
+									confirmText: '去设置',
+									success(res) {
+									  if (res.confirm) {
+										uni.openSetting();
+									  }
+									}
+								  });
+								} else {
+								  uni.showToast({
+									title: '保存图片失败',
+									icon: 'none'
+								  });
+								}
+							  }
+							});
+						  } else {
+							uni.showToast({
+							  title: '保存图片失败',
+							  icon: 'none'
+							});
+						}
+					  },
+					  complete() {
+					  	uni.hideLoading();
+						that.posterShow = false;
+					  }
+					});					
+				},
 			// 海报相关结束
 			goMap(){
 				uni.openLocation({
@@ -496,6 +526,18 @@
 				  address: this.theatre.address	//导航详细地址
 				})
 			},
+			phoneCall(){
+				// console.log('this.theatre',this.theatre);
+				uni.makePhoneCall({
+					phoneNumber: this.theatre.contactMobile,
+					success() {
+						console.log('success');
+					},
+					fail() {
+						console.log('fail');
+					}
+				});
+			}
 
 		}
 	}
@@ -515,7 +557,7 @@
 		box-sizing: border-box;
 		padding: 0 32rpx;
 		left: 0;
-		bottom: 100rpx;
+		bottom: 200rpx;
 	}
 	.share{
 		overflow: hidden;
@@ -530,18 +572,43 @@
 			background-color: rgba(0,0,0,0.4);
 		}
 	}
+}
+.base-info{
+	position: relative;
+	// margin-bottom: 54rpx;
+	.inner{
+		position: relative;
+		padding: 50rpx 38rpx 58rpx 40rpx;
+		background-color: #FFFFFF;
+		border-radius: 32rpx 32rpx 0rpx 0rpx;
+		margin-top: -30px;
+		border-bottom: 12rpx solid #F7F8F9;
+	}
 	.name{
-		font-size: 44rpx;
+		font-size: 40rpx;
 		font-weight: 800;
-		color: #FFFFFF;
-		line-height: 66rpx;
-		margin-bottom: 38rpx;
+		color: #2D2D2D;
+		margin-bottom: 26rpx;
 	}
 	.addr{
-		font-size: 24rpx;
+		font-size: 26rpx;
 		font-weight: 400;
-		color: #FFFFFF;
-		line-height: 36rpx;
+		color: #606060;
+	}
+	.menu{
+		.item{
+			margin-left: 18rpx;
+			font-size: 18rpx;
+			font-weight: 400;
+			color: #999999;
+			text-align: center;
+		}
+		.icon{
+			width: 62rpx;
+			height: 64rpx;
+			display: block;
+			margin-bottom: 4rpx;
+		}
 	}
 }
 .tabs-wrap{
@@ -559,11 +626,11 @@
 	}
 	.inner{
 		position: relative;
-		padding-top: 50rpx;
+		padding-top: 48rpx;
 		background-color: #FFFFFF;
-		border-radius: 32rpx 32rpx 0rpx 0rpx;
+		// border-radius: 32rpx 32rpx 0rpx 0rpx;
 		height: 46rpx;
-		margin-top: -30px;
+		// margin-top: -30px;
 	}
 }
 .date-block{