修改下啦

pages/guide/index.vue

@@ -13,7 +13,7 @@
 						<u-icon v-if="item.shownotice" size="16" name="arrow-up"></u-icon>
 					</view>
 					<view class="content_info" v-if="item.shownotice">
-						<rich-text style="text-indent: 2em;" :nodes="item.content"></rich-text>
+						<rich-text style="text-indent: 2em;font-size: 28rpx;" :nodes="item.content"></rich-text>
 					</view>
 				</view>
 			</block>

pages/index/index.vue

@@ -185,6 +185,9 @@
 			// 如果需要兼容微信小程序的话，需要用此写法
 			this.$refs.calendar.setFormatter(this.formatter)
 		},
+		onHide() {
+		   this.showBook=false;	
+		},
 		methods: {
 			closePhone() {
 				this.showAuthorization = false

pages/order/visitorderinfo.vue

@@ -9,13 +9,11 @@
 				<view class="orderBoxInfo flex-col">
 					<view class="orderBoxInfoRow flex-row">
 						<text class="iconfont icon-shijian"></text>
-						<text
-							class="orderBoxInfoRowTxt">参观日期：{{timeFormat(info.date, 'MM月DD日')}}</text>
+						<text class="orderBoxInfoRowTxt">参观日期：{{timeFormat(info.date, 'MM月DD日')}}</text>
 					</view>
 					<view class="orderBoxInfoRow flex-row">
 						<text class="iconfont icon-shijian"></text>
-						<text
-							class="orderBoxInfoRowTxt">参观时段：{{info.time||""}}</text>
+						<text class="orderBoxInfoRowTxt">参观时段：{{info.time||""}}</text>
 					</view>
 					<view class="orderBoxInfoRow flex-row">
 						<text class="iconfont icon-renshu"></text>
@@ -35,7 +33,7 @@
 				<view v-if="info.type==1" class="orderBoxInfo flex-col ewmcode">
 					<text>入馆码：{{info.code}}-0</text>
 					<view>
-						<view class="imgs" >
+						<view class="imgs">
 							<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=""> -->
@@ -49,32 +47,37 @@
 					</view>
 					<!-- <text class="ewminfo">{{isuse?'已使用':'请前往现场核销订单二维码'}}</text> -->
 				</view>
-				<view v-if="info.type==2" class="orderBoxInfo flex-col ewmcode" :key='index' v-for="(item,index) in detailsinfo">
+				<block v-if="info.type==2">
+					<view class="orderBoxInfo flex-col ewmcode" :key='index' v-for="(item,index) in detailsinfo">
 						<text>入馆码：{{info.code}}-{{item.code}}</text>
 						<view>
-						<view class="imgs" >
+							<view class="imgs">
 								<view :class="item.status!=1?'isuse':''">
-								<cover-image v-if="info.status==2"  src="../../static/img/used.png" alt=""></cover-image>
+									<cover-image v-if="info.status==2" src="../../static/img/used.png" alt="">
+									</cover-image>
 
 									<!-- <img v-if="item.status!=1"  src="../../static/img/used.png" alt=""> -->
-								<canvas :canvas-id="'qrcode'+index" style="width: 360rpx;height:350rpx;margin: 0 auto;">
+									<canvas :canvas-id="'qrcode'+index"
+										style="width: 360rpx;height:350rpx;margin: 0 auto;">
 										<cover-view v-if="showview">
 										</cover-view>
 									</canvas>
 								</view>
 								<view class="imgsname">
 									<text class="orderBoxTitleTxt">{{item.name}}</text>
-								<text class="orderBoxTitleTxt" style="font-size: 28rpx;" v-if="item.is_open==1">
-									可使用身份证
-								</text>
-								<text style="font-size: 28rpx;" class="orderBoxTitleTxt" v-if="item.is_open==0">
-									不可使用身份证
-								</text>
 								</view>
 							</view>
+
+							<view class="orderBoxTitleTxt" style="font-size: 28rpx;" v-if="item.is_open==1">
+								可凭二维码或者身份证入场馆
+							</view>
+							<view style="font-size: 28rpx;" class="orderBoxTitleTxt" v-if="item.is_open==0">
+								可凭二维码入场馆
+							</view>
 						</view>
 						<!-- <text class="ewminfo">{{isuse?'已使用':'请前往现场核销订单二维码'}}</text> -->
 					</view>
+				</block>
 			</view>
 		</view>
 		<!-- <view class="orderBoxList p0">
@@ -121,7 +124,7 @@
 				<text class="orderBoxTitleTxt">参观须知</text>
 			</view>
 			<view class="flex-row" style="margin-top: 10rpx;">
-				<text class="orderBoxInfoRowTxt">{{info.type==1?vinfo.person_notice:vinfo.team_notice}}</text>
+				<view class="orderBoxInfoRowTxt" v-html="info.type==1?vinfo.person_notice:vinfo.team_notice"></view>
 			</view>
 		</view>
 	</view>
@@ -134,11 +137,11 @@
 			return {
 				info: {},
 				vinfo: {},
-				detailsinfo:[],
-				showview:false,
-				timer:null,
-				optionid:"",
-				timer:null
+				detailsinfo: [],
+				showview: false,
+				timer: null,
+				optionid: "",
+				timer: null
 			}
 		},
 		onLoad(options) {
@@ -151,9 +154,9 @@
 
 		onShow() {
 			var that = this
-			this.timer = setInterval(function(){
+			this.timer = setInterval(function() {
 				that.loadInfo(that.optionid);
-			},4000)
+			}, 4000)
 		},
 
 		onHide() {
@@ -165,9 +168,9 @@
 		},
 
 		methods: {
-			qrFun: function(text,qrcode) {
+			qrFun: function(text, qrcode) {
 				var id = "qrcode";
-				if(qrcode){
+				if (qrcode) {
 					id = qrcode
 				}
 				uQRCode.make({
@@ -211,23 +214,23 @@
 					utilSuccess: function(res) {
 						that.info = res;
 						that.detailsinfo = res.details;
-						if(res.status!=1){
+						if (res.status != 1) {
 							clearInterval(that.timer)
 						}
-						if(res.type==1){
-							that.qrFun(res.code+"-"+"0");
-							setTimeout(function(){
+						if (res.type == 1) {
+							that.qrFun(res.code + "-" + "0");
+							setTimeout(function() {
 								that.showview = true
-							},500)
+							}, 500)
 
 						}
-						if(res.type==2){
-							for(var i=0;i<res.details.length;i++){
-								that.qrFun(res.code+"-"+res.details[i].code,'qrcode'+i);
+						if (res.type == 2) {
+							for (var i = 0; i < res.details.length; i++) {
+								that.qrFun(res.code + "-" + res.details[i].code, 'qrcode' + i);
 							}
-							setTimeout(function(){
+							setTimeout(function() {
 								that.showview = true
-							},500)
+							}, 500)
 						}
 					},
 					utilFail: function(res) {
@@ -281,13 +284,15 @@
 		background: #fff;
 		border-radius: 20rpx;
 	}
-	.orderBoxListTip{
+
+	.orderBoxListTip {
 		background: none;
 		border-radius: 0rpx;
 		padding: 26rpx 10rpx;
 	}
-	.orderBoxListTip .orderBoxTitle{
-		padding-bottom:10rpx
+
+	.orderBoxListTip .orderBoxTitle {
+		padding-bottom: 10rpx
 	}
 
 	.content_box {
@@ -307,7 +312,7 @@
 
 	.orderBoxInfoRow {
 		align-items: center;
-		margin:10rpx
+		margin: 10rpx
 	}
 
 	.orderBoxTitleTxt {
@@ -334,7 +339,7 @@
 
 
 	.orderBoxInfoRowTxt {
-		font-size: 30rpx!important;
+		font-size: 30rpx !important;
 		font-family: PingFang SC;
 		color: #828282;
 	}
@@ -348,7 +353,7 @@
 
 	.p0 {
 		padding-top: 0;
-		border-left:32rpx solid #ef9525
+		border-left: 32rpx solid #ef9525
 	}
 
 	.ewmcode {
@@ -357,20 +362,22 @@
 		text-align: left;
 		font-size: 28rpx;
 		margin-left: 18rpx;
-		padding-bottom:0;
+		padding-bottom: 0;
 		padding-top: 30rpx;
 	}
-.imgs {
+
+	.imgs {
 		margin: 30rpx 0 0rpx 0;
 		font-size: 0;
 		display: inline-block;
 	}
 
-	.imgs view{
+	.imgs view {
 		position: relative;
 		display: inline-block;
 		margin-bottom: 20rpx;
 	}
+
 	.imgs cover-image {
 		position: absolute;
 		width: 200rpx;
@@ -380,23 +387,28 @@
 		right: 0rpx;
 		bottom: 0rpx;
 	}
-	.imgs canvas{
+
+	.imgs canvas {
 		display: inline-block;
 		vertical-align: middle;
 	}
-	.imgsname{
+
+	.imgsname {
 		display: inline-block;
 		text-align: center;
 		margin-left: 15rpx;
+		flex: 1;
 	}
-	.imgs text{
+
+	.imgs text {
 		display: block;
 		/* margin-left: 40rpx; */
 	}
-	.imgs .isuse cover-view{
-		background-color: rgba(255,255,255,0.6);
+
+	.imgs .isuse cover-view {
+		background-color: rgba(255, 255, 255, 0.6);
 		width: 360rpx;
-		height:350rpx;
+		height: 350rpx;
 	}
 
 

pages/visit/book.vue

@@ -320,7 +320,7 @@
 					content: "预约须知的内容"
 				}, {
 					title: "批量上传帮助",
-					content: "<p>1.批量上传EXCEL的以xlsx结尾</p><p>2.第一列为标题列 姓名	手机号	证件号</p><p>3.文件是从微信聊天记录中选取或者微信文件传输助手</p><img src='@host@/export.png' style='width:100%'/>"
+					content: "<p>1.批量上传EXCEL的以xlsx结尾</p><p>2.第一列为标题列 姓名	手机号	证件号 行动不便者</p><p>3.文件是从微信聊天记录中选取或者微信文件传输助手</p><img src='@host@/export.png?v=1.1' style='width:100%'/>"
 				}],
 				specialtype:false,
 				specialid:0,