up

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>
@@ -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="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>
@@ -281,11 +284,13 @@
 		background: #fff;
 		border-radius: 20rpx;
 	}
+
 	.orderBoxListTip {
 		background: none;
 		border-radius: 0rpx;
 		padding: 26rpx 10rpx;
 	}
+
 	.orderBoxListTip .orderBoxTitle {
 		padding-bottom: 10rpx
 	}
@@ -360,6 +365,7 @@
 		padding-bottom: 0;
 		padding-top: 30rpx;
 	}
+
 	.imgs {
 		margin: 30rpx 0 0rpx 0;
 		font-size: 0;
@@ -371,6 +377,7 @@
 		display: inline-block;
 		margin-bottom: 20rpx;
 	}
+
 	.imgs cover-image {
 		position: absolute;
 		width: 200rpx;
@@ -380,19 +387,24 @@
 		right: 0rpx;
 		bottom: 0rpx;
 	}
+
 	.imgs canvas {
 		display: inline-block;
 		vertical-align: middle;
 	}
+
 	.imgsname {
 		display: inline-block;
 		text-align: center;
 		margin-left: 15rpx;
+		flex: 1;
 	}
+
 	.imgs text {
 		display: block;
 		/* margin-left: 40rpx; */
 	}
+
 	.imgs .isuse cover-view {
 		background-color: rgba(255, 255, 255, 0.6);
 		width: 360rpx;