From 518b4379584ce2561b929b54063b04ac68820877 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=BF=94=E5=AE=87-=E6=97=85=E7=AE=A1=E5=AE=B6?=
 <153298343@qq.com>
Date: Tue, 18 Oct 2022 13:19:09 +0800
Subject: [PATCH] up

---
 pages.json                        |  8 ++++++++
 pages/activity/info.vue           | 13 +++++++------
 pages/order/activityorderinfo.vue |  2 +-
 pages/park/index.vue              |  6 ++++--
 pages/vr/vrpage.vue               |  9 +++++++++
 5 files changed, 29 insertions(+), 9 deletions(-)
 create mode 100644 pages/vr/vrpage.vue

diff --git a/pages.json b/pages.json
index f7cedda..047d9d3 100644
--- a/pages.json
+++ b/pages.json
@@ -10,6 +10,14 @@
 				"navigationStyle": "custom",
 				"enablePullDownRefresh": false
 
+			}
+		},{
+			"path": "pages/vr/vrpage",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom",
+				"enablePullDownRefresh": false
+
 			}
 		}, {
 			"path": "pages/guide/index",
diff --git a/pages/activity/info.vue b/pages/activity/info.vue
index d25cbe3..15d979f 100644
--- a/pages/activity/info.vue
+++ b/pages/activity/info.vue
@@ -24,7 +24,8 @@
 
 					<view class="activityBox-row">
 						<text class="icon-shijian iconfont"></text>
-						<text>活动时间：{{timeFormat(list.start_time,"yyyy年MM月DD日")}} {{getHm(list.start_time)}}-{{getHm(list.end_time)}}</text>
+						<text>活动时间：{{timeFormat(list.start_time,"yyyy年MM月DD日")}}
+							{{getHm(list.start_time)}}-{{getHm(list.end_time)}}</text>
 
 					</view>
 					<!-- <view class="activityBox-row">
@@ -60,14 +61,14 @@
 					<text class="infoBox-titletxt">活动详情</text>
 				</view>
 				<view class="infoBox-content">
-					<rich-text  style="text-indent: 2em;font-size: 28rpx;" :nodes="list.content"></rich-text>
+					<rich-text style="text-indent: 2em;font-size: 28rpx;" :nodes="list.content"></rich-text>
 				</view>
 			</view>
 			<view class="infofooter flex-row" v-if="list.isCanBook&&list.total!=list.orders_total">
-				<view style="margin-right: 14rpx;flex: 1;">
+				<view style="margin-right: 14rpx;flex: 1;" v-if="list.join_type==1||list.join_type==0">
 					<u-button type="primary" @click="tobook('team')">团体预约</u-button>
 				</view>
-				<view style="margin-left: 14rpx;flex: 1;">
+				<view style="margin-left: 14rpx;flex: 1;" v-if="list.join_type==2||list.join_type==0">
 					<u-button type="primary" @click="tobook('user')">个人预约</u-button>
 				</view>
 			</view>
@@ -173,7 +174,7 @@
 	.infoBox {
 		box-sizing: border-box;
 		padding: 40rpx 0rpx;
-		background: #FFFFFF;
+		background: #FFFFFF;
 		margin-bottom: 40rpx;
 	}
 
@@ -191,7 +192,7 @@
 		padding: 37rpx 26rpx;
 		box-sizing: border-box;
 		font-size: 24rpx;
-		color: #828282;
+		color: #828282;
 		margin-bottom: 100rpx;
 	}
 
diff --git a/pages/order/activityorderinfo.vue b/pages/order/activityorderinfo.vue
index 970ca09..c39e87b 100644
--- a/pages/order/activityorderinfo.vue
+++ b/pages/order/activityorderinfo.vue
@@ -38,7 +38,7 @@
 							<view :class="info.status!=1?'isuse':''">
 								<cover-image v-if="info.status==2" src="../../static/img/used.png" alt=""></cover-image>
 								<!-- <img v-if="info.status!=1"  src="../../static/img/used.png" alt=""> -->
-								<canvas canvas-id='qrcode' style="width: 170rpx;height:170rpx;margin: 0 auto;">
+								<canvas canvas-id='qrcode' style="width: 170px;height:170px;margin: 0 auto;">
 									<cover-view v-if="showview">
 									</cover-view>
 								</canvas>
diff --git a/pages/park/index.vue b/pages/park/index.vue
index a53ddfa..a5c61e0 100644
--- a/pages/park/index.vue
+++ b/pages/park/index.vue
@@ -246,7 +246,8 @@
 				this.util.request({
 					api: '/api/mobile/user/my-visit-order',
 					data: {
-						status: 1
+						status: 1,
+						not_expire:1
 					},
 					utilSuccess: function(res) {
 						for (var mod of res) {
@@ -265,7 +266,8 @@
 				this.util.request({
 					api: '/api/mobile/user/my-activity-order',
 					data: {
-						status: 1
+						status: 1,
+						not_expire:1
 					},
 					utilSuccess: function(res) {
 						for (var mod of res) {
diff --git a/pages/vr/vrpage.vue b/pages/vr/vrpage.vue
new file mode 100644
index 0000000..91c70c2
--- /dev/null
+++ b/pages/vr/vrpage.vue
@@ -0,0 +1,9 @@
+<template>
+	<web-view src="https://suzhvr.chsvision.com/su-zhou-hundred-year-vr-wx/index.html?v=1.0"></web-view>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>
\ No newline at end of file