up

pages/activity/book.vue

@@ -240,7 +240,7 @@
 					content: "预约须知的内容"
 				}, {
 					title: "批量上传帮助",
-					content: "<p>1.批量上传EXCEL的以xlsx结尾</p><p>2.第一列为标题列 姓名	手机号	证件号</p><p>3.文件是从微信聊天记录中选取或者微信文件传输助手</p><img src='../../static/img/export.png' style='width:100%'/>"
+					content: "<p>1.批量上传EXCEL的以xlsx结尾</p><p>2.第一列为标题列 姓名	手机号	证件号</p><p>3.文件是从微信聊天记录中选取或者微信文件传输助手</p><img src='@host@/export.png' style='width:100%'/>"
 				}]
 			}
 		},
@@ -292,6 +292,7 @@
 			},
 			openNoticeInfo(type) {
 				this.showInfo = true;
+				this.notice[type].content = this.notice[type].content.replace("@host@", this.util.HOST);
 				this.currentNotice = this.notice[type];
 			},
 			handleAddUser() {
@@ -457,7 +458,7 @@
 							icon: "none",
 							title: "下单成功",
 							complete() {
-								uni.reLaunch({
+								uni.redirectTo({
 									url: "/pages/success/success?from=activity&id=" + res.id
 								})
 							}

pages/order/activityorder.vue

@@ -65,7 +65,7 @@
 					name: '已参加',
 					idx: "2"
 				}, {
-					name: '取消预约',
+					name: '已预约',
 					idx: "0"
 				}],
 				current: 0,

pages/order/activityorderinfo.vue

@@ -7,10 +7,14 @@
 				</view>
 
 				<view class="orderBoxInfo flex-col">
-					<view class="orderBoxInfoRow flex-row" >
+					<view class="orderBoxInfoRow flex-row">
 						<text class="iconfont icon-youkexuzhi"></text>
 						<text
-							class="orderBoxInfoRowTxt">订单信息：{{$u.timeFormat(new Date(info.activity.start_time), 'mm月dd日')}}{{getHm(info.activity.start_time)}}-{{getHm(info.activity.end_time)}}丨{{info.total}}位人员</text>
+							class="orderBoxInfoRowTxt">活动时间：{{timeFormat(info.activity.start_time, 'MM月DD日')}}{{getHm(info.activity.start_time)}}-{{getHm(info.activity.end_time)}}</text>
+					</view>
+					<view class="orderBoxInfoRow flex-row" style="margin-top: 20rpx;">
+						<text class="iconfont icon-youkexuzhi"></text>
+						<text class="orderBoxInfoRowTxt">活动人数：{{info.total}}位人员</text>
 					</view>
 					<view class="orderBoxInfoRow flex-row" v-if="info.type==1" style="margin-top: 20rpx;">
 						<text class="iconfont icon-iconfontgerenzhongxin"></text>
@@ -120,6 +124,9 @@
 				if (val) {
 					return this.$moment(val).format("hh:MM")
 				} else return "";
+			},
+			timeFormat(time, format) {
+				return this.$moment(time).format(format)
 			}
 		}
 	}

pages/order/visitorderinfo.vue

@@ -10,8 +10,13 @@
 					<view class="orderBoxInfoRow flex-row">
 						<text class="iconfont icon-youkexuzhi"></text>
 						<text
-							class="orderBoxInfoRowTxt">订单信息：{{$u.timeFormat(new Date(info.date), 'mm月dd日')}}{{info.time||""}}丨{{info.total||0}}位观众</text></text>
+							class="orderBoxInfoRowTxt">参观时间：{{timeFormat(info.date, 'MM月DD日')}}{{info.time||""}}</text>
 					</view>
+					<view class="orderBoxInfoRow flex-row">
+						<text class="iconfont icon-youkexuzhi"></text>
+						<text class="orderBoxInfoRowTxt">参观人数：{{info.total||0}}位观众</text></text>
+					</view>
+
 					<view class="orderBoxInfoRow flex-row" v-if="info.type==1" style="margin-top: 20rpx;">
 						<text class="iconfont icon-iconfontgerenzhongxin"></text>
 						<text class="orderBoxInfoRowTxt">领队：{{info.leader||""}}丨 {{info.mobile||""}}</text>
@@ -122,6 +127,9 @@
 				})
 
 			},
+			timeFormat(time, format) {
+				return this.$moment(time).format(format);
+			},
 			loadInfo(id) {
 				var that = this;
 				this.util.request({

pages/park/book.vue

@@ -316,7 +316,7 @@
 							icon: "none",
 							title: "下单成功",
 							complete() {
-								uni.reLaunch({
+								uni.redirectTo({
 									url: "/pages/success/success?from=park&id=" + res.id
 								})
 							}

pages/success/success.vue

@@ -52,7 +52,7 @@
 							that.time = that.time - 1;
 					}, 1000)
 					setTimeout(function() {
-						uni.reLaunch({
+						uni.redirectTo({
 							url: url
 						})
 						clearInterval(t);

pages/visit/book.vue

@@ -233,7 +233,7 @@
 					content: "预约须知的内容"
 				}, {
 					title: "批量上传帮助",
-					content: "<p>1.批量上传EXCEL的以xlsx结尾</p><p>2.第一列为标题列 姓名	手机号	证件号</p><p>3.文件是从微信聊天记录中选取或者微信文件传输助手</p><img src='../../static/img/export.png' style='width:100%'/>"
+					content: "<p>1.批量上传EXCEL的以xlsx结尾</p><p>2.第一列为标题列 姓名	手机号	证件号</p><p>3.文件是从微信聊天记录中选取或者微信文件传输助手</p><img src='@host@/export.png' style='width:100%'/>"
 				}],
 				form: {
 					date: "",
@@ -378,6 +378,7 @@
 			},
 			openNoticeInfo(type) {
 				this.showInfo = true;
+				this.notice[type].content = this.notice[type].content.replace("@host@", this.util.HOST);
 				this.currentNotice = this.notice[type];
 			},
 			submitOrder() {
@@ -459,7 +460,7 @@
 							icon: "none",
 							title: "下单成功",
 							complete() {
-								uni.reLaunch({
+								uni.redirectTo({
 									url: "/pages/success/success?from=visit&id=" + res.id
 								})
 							}