From be6cd4fb23aa70aee95257cb1e10a3ed6671caba Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Mon, 27 Jun 2022 09:31:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/activityorderinfo.vue | 10 +++++-----
 pages/order/visitorderinfo.vue    | 27 ++++++++++++++-------------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/pages/order/activityorderinfo.vue b/pages/order/activityorderinfo.vue
index b8d5b94..a1ac2f5 100644
--- a/pages/order/activityorderinfo.vue
+++ b/pages/order/activityorderinfo.vue
@@ -34,7 +34,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: 360rpx;height:350rpx;margin: 0 auto;">
+								<canvas canvas-id='qrcode' style="width: 170rpx;height:170rpx;margin: 0 auto;">
 									<cover-view v-if="showview">
 									</cover-view>
 								</canvas>
@@ -52,7 +52,7 @@
 								
 								<!-- <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: 170px;height:170px;margin: 0 auto;">
 										<cover-view v-if="showview">
 										</cover-view>
 									</canvas>
@@ -156,7 +156,7 @@
 					canvasId: id,
 					componentInstance: this,
 					text: text,
-					size: 200,
+					size: 170,
 					// margin: 10,
 					backgroundColor: '#ffffff',
 					foregroundColor: '#000000',
@@ -369,8 +369,8 @@
 	.imgs .isuse cover-view{
 		/* opacity: .4; */
 		background-color: rgba(255,255,255,0.6);
-		width: 360rpx;
-		height:350rpx;
+		width: 170px;
+		height:170px;
 	}
 
 	.ewminfo {
diff --git a/pages/order/visitorderinfo.vue b/pages/order/visitorderinfo.vue
index 2129940..eaa3501 100644
--- a/pages/order/visitorderinfo.vue
+++ b/pages/order/visitorderinfo.vue
@@ -37,7 +37,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: 360rpx;height:350rpx;margin: 0 auto;">
+								<canvas canvas-id='qrcode' style="width: 170px;height:170px;margin: 0 auto;">
 									<cover-view v-if="showview">
 									</cover-view>
 								</canvas>
@@ -58,22 +58,23 @@
 
 									<!-- <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;">
+										style="width: 170px;height:170px;margin: 0 auto;">
 										<cover-view v-if="showview">
 										</cover-view>
 									</canvas>
 								</view>
 								<view class="imgsname">
-									<text class="orderBoxTitleTxt">{{item.name}}</text>
+									<text class="orderBoxTitleTxt">{{item.name}}</text>
+									<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>
 							</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>
@@ -124,7 +125,7 @@
 				<text class="orderBoxTitleTxt">参观须知</text>
 			</view>
 			<view class="flex-row" style="margin-top: 10rpx;">
-				<view class="orderBoxInfoRowTxt" v-html="info.type==1?vinfo.person_notice:vinfo.team_notice"></view>
+				<view style="text-indent: 2em;" class="orderBoxInfoRowTxt" v-html="info.type==1?vinfo.person_notice:vinfo.team_notice"></view>
 			</view>
 		</view>
 	</view>
@@ -177,7 +178,7 @@
 					canvasId: id,
 					componentInstance: this,
 					text: text,
-					size: 200,
+					size: 170,
 					// margin: 10,
 					backgroundColor: '#ffffff',
 					foregroundColor: '#000000',
@@ -407,8 +408,8 @@
 
 	.imgs .isuse cover-view {
 		background-color: rgba(255, 255, 255, 0.6);
-		width: 360rpx;
-		height: 350rpx;
+		width: 170px;
+		height: 170px;
 	}