From 89f92ee837c21dd5d2992bca4d05ab117e4f4cd0 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Thu, 16 Jun 2022 18:43:53 +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 | 26 ++++++++++++++------------
 pages/order/visitorder.vue        |  2 +-
 pages/order/visitorderinfo.vue    | 18 ++++++++++--------
 3 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/pages/order/activityorderinfo.vue b/pages/order/activityorderinfo.vue
index 38d87e1..9a4a255 100644
--- a/pages/order/activityorderinfo.vue
+++ b/pages/order/activityorderinfo.vue
@@ -22,30 +22,30 @@
 			</view>
 		</view>
 		<view class="orderBoxTitle flex-row">
-			<text style="padding-top:25rpx" class="orderBoxTitleTxt">可扫“入馆码”入馆</text>
+			<text style="padding-top:25rpx" class="orderBoxTitleTxt">可扫“活动码”入场</text>
 		</view>
 		<view class="orderBoxList p0">
 			<view class="orderBox">
 				
 				<view v-if="info.type==1"  class="orderBoxInfo flex-col ewmcode">
-					<text>入馆码：{{info.code}}-0</text>
+					<text>入场码：{{info.code}}-0</text>
 					<view>
 						<view class="imgs" >
 							<view :class="info.status!=1?'isuse':''">
 								<img v-if="info.status!=1"  src="../../static/img/used.png" alt="">
-								<canvas canvas-id="qrcode" style="width: 300rpx;margin: 0 auto;" />
+								<canvas canvas-id="qrcode" style="width: 360rpx;height:350rpx;margin: 0 auto;" />
 							</view>
 						</view>
 					</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">
-					<text>入馆码：{{info.code}}-{{item.code}}</text>
+					<text>入场码：{{info.code}}-{{item.code}}</text>
 					<view>
 						<view class="imgs" >
 							<view :class="item.status!=1?'isuse':''">
-								<img v-if="item.status!=1"  src="../../static/img/used.png" alt="">
-								<canvas :canvas-id="'qrcode'+index" style="width: 300rpx;margin: 0 auto;" />
+								<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;" />
 							</view>
 							
 							<text class="orderBoxTitleTxt">{{item.name}}</text>
@@ -118,8 +118,8 @@
 					canvasId: id,
 					componentInstance: this,
 					text: text,
-					size: 140,
-					margin: 10,
+					size: 200,
+					// margin: 10,
 					backgroundColor: '#ffffff',
 					foregroundColor: '#000000',
 					fileType: 'jpg',
@@ -292,15 +292,16 @@
 	.imgs view{
 		    position: relative;
 		    display: inline-block;
+			margin-bottom: 20rpx;
 	}
 	.imgs image {
 		position: absolute;
-		    width: 120rpx;
-		    height: 120rpx;
+		    width: 200rpx;
+		    height: 200rpx;
 		    z-index: 999;
 		    opacity: 1;
-		    right: 67rpx;
-		    bottom: 39rpx;
+		    right: 0rpx;
+		    bottom: 0rpx;
 	}
 	.imgs canvas{
 		display: inline-block;
@@ -308,6 +309,7 @@
 	}
 	.imgs text{
 		display: inline-block;
+		margin-left: 40rpx;
 	}
 	.imgs .isuse canvas{
 		opacity: .4;
diff --git a/pages/order/visitorder.vue b/pages/order/visitorder.vue
index 26498ab..640e83b 100644
--- a/pages/order/visitorder.vue
+++ b/pages/order/visitorder.vue
@@ -10,7 +10,7 @@
 				<view class="orderBox" :class="{'cancelBox':item.status==0}" @click="toinfo(item.id)">
 					<view class="orderBoxTitle flex-row">
 						<text class="orderBoxTitleTxt">{{item.type==1?"团队预约":"个人预约"}}</text>
-						<view class="orderBoxStatus" :class="{'cancelStatus':item.status==0}">{{item.status_name}}
+						<view :class="item.status==2?'orderBoxStatus cancelStatus':'orderBoxStatus'">{{item.status_name}}
 						</view>
 					</view>
 
diff --git a/pages/order/visitorderinfo.vue b/pages/order/visitorderinfo.vue
index d81429a..980cf98 100644
--- a/pages/order/visitorderinfo.vue
+++ b/pages/order/visitorderinfo.vue
@@ -38,7 +38,7 @@
 						<view class="imgs" >
 							<view :class="info.status!=1?'isuse':''">
 								<img v-if="info.status!=1"  src="../../static/img/used.png" alt="">
-								<canvas canvas-id="qrcode" style="width: 300rpx;margin: 0 auto;" />
+								<canvas canvas-id="qrcode" style="width: 360rpx;height:350rpx;margin: 0 auto;" />
 							</view>
 						</view>
 					</view>
@@ -50,7 +50,7 @@
 						<view class="imgs" >
 							<view :class="item.status!=1?'isuse':''">
 								<img v-if="item.status!=1"  src="../../static/img/used.png" alt="">
-								<canvas :canvas-id="'qrcode'+index" style="width: 300rpx;margin: 0 auto;" />
+								<canvas :canvas-id="'qrcode'+index" style="width: 360rpx;height:350rpx;margin: 0 auto;" />
 							</view>
 							
 							<text class="orderBoxTitleTxt">{{item.name}}</text>
@@ -134,8 +134,8 @@
 					canvasId: id,
 					componentInstance: this,
 					text: text,
-					size: 140,
-					margin: 10,
+					size: 200,
+					// margin: 10,
 					backgroundColor: '#ffffff',
 					foregroundColor: '#000000',
 					fileType: 'jpg',
@@ -319,15 +319,16 @@
 	.imgs view{
 		    position: relative;
 		    display: inline-block;
+			margin-bottom: 20rpx;
 	}
 	.imgs image {
 		position: absolute;
-		    width: 120rpx;
-		    height: 120rpx;
+		    width: 200rpx;
+		    height: 200rpx;
 		    z-index: 999;
 		    opacity: 1;
-		    right: 67rpx;
-		    bottom: 39rpx;
+		    right: 0rpx;
+		    bottom: 0rpx;
 	}
 	.imgs canvas{
 		display: inline-block;
@@ -335,6 +336,7 @@
 	}
 	.imgs text{
 		display: inline-block;
+		margin-left: 40rpx;
 	}
 	.imgs .isuse canvas{
 		opacity: .4;