From c74a6ccd15dbcf806b7635bd95ea2d80e8d8cd34 Mon Sep 17 00:00:00 2001
From: Enzo <1284707383@qq.com>
Date: Wed, 1 Sep 2021 14:21:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/activityList/index.vue  | 4 ++--
 pages/message/detail.vue      | 2 +-
 pages/notice/article.vue      | 2 +-
 pages/notice/notice.vue       | 2 +-
 pages/order/order_details.vue | 6 +++---
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pages/activityList/index.vue b/pages/activityList/index.vue
index 78a4f74..81a4c87 100644
--- a/pages/activityList/index.vue
+++ b/pages/activityList/index.vue
@@ -13,8 +13,8 @@
 					<image :src="item.picture" class="lf-w-100 lf-h-100" mode="aspectFill"></image>
 				</view>
 				<view style="width: 420rpx;">
-					<view class="lf-font-28 lf-color-333 lf-line-2" style="height: 78rpx;">{{item.title}}</view>
-					<view class="lf-font-24 lf-color-gray lf-line-2" style="height: 64rpx;">本套票只包含两个成人不可带小孩本套票只包含两个成人不可带小孩本套票只包含两个成人不可带小孩</view>
+					<view class="lf-font-28 lf-color-333 lf-line-2">{{item.title}}</view>
+					<view class="lf-font-24 lf-color-gray lf-line-2" style="min-height: 64rpx;">本套票只包含两个成人不可带小孩本套票只包含两个成人不可带小孩本套票只包含两个成人不可带小孩</view>
 					<view class="lf-flex lf-m-t-25">
 						<lf-price :price="item.price"></lf-price>
 						<text class="lf-font-24 lf-color-gray lf-line-through lf-m-l-15">¥{{item.original_price}}</text>
diff --git a/pages/message/detail.vue b/pages/message/detail.vue
index 46e300b..950b102 100644
--- a/pages/message/detail.vue
+++ b/pages/message/detail.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="lf-m-l-32 lf-m-r-32">
 		<view>
-			<view class="lf-font-32 lf-color-333 lf-row-center lf-m-t-30 lf-m-b-20">
+			<view class="lf-font-32 lf-color-333 lf-m-t-30 lf-m-b-20">
 				{{title_content.title}}
 			</view>
 			<view class="lf-flex lf-m-b-24">
diff --git a/pages/notice/article.vue b/pages/notice/article.vue
index 5f6b867..cbf7d58 100644
--- a/pages/notice/article.vue
+++ b/pages/notice/article.vue
@@ -2,7 +2,7 @@
 	<view>
 		<view class="lf-m-l-32 lf-m-r-32">
 			<view>
-				<view class="lf-font-32 lf-color-333 lf-row-center lf-m-t-30 lf-m-b-20">
+				<view class="lf-font-32 lf-color-333 lf-m-t-30 lf-m-b-20">
 					{{title_content.title}}
 				</view>
 				<view class="lf-flex lf-m-b-24">
diff --git a/pages/notice/notice.vue b/pages/notice/notice.vue
index a9d28c5..18f6ed1 100644
--- a/pages/notice/notice.vue
+++ b/pages/notice/notice.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="lf-m-l-32 lf-m-r-32">
 		<view>
-			<view class="lf-font-32 lf-color-333 lf-row-center lf-m-t-30 lf-m-b-20">
+			<view class="lf-font-32 lf-color-333 lf-m-t-30 lf-m-b-20">
 				{{title_content.title}}
 			</view>
 			<view class="lf-flex lf-m-b-24">
diff --git a/pages/order/order_details.vue b/pages/order/order_details.vue
index 8cf7126..9cfa08a 100644
--- a/pages/order/order_details.vue
+++ b/pages/order/order_details.vue
@@ -69,7 +69,7 @@
 					<view>
 						<!-- <tki-qrcode ref="qrcode" @result="qrR" :val="checkArea" :size="115" unit="px" background="#fff"
 							foreground="#000" pdground="#000" :onval="true" :loadMake="true" /> -->
-							<image src="../../static/defult_code.png" mode="aspectFill" style="width: 300rpx;height: 300rpx;"></image>
+							<image v-if="orderDetails.verify_code" src="../../static/defult_code.png" mode="aspectFill" style="width: 300rpx;height: 300rpx;"></image>
 					</view>
 					<view class="lf-m-t-10">
 						<view class="lf-font-28 text-black1">
@@ -79,8 +79,8 @@
 					</view>
 					<view v-if="checkArea">
 						<view class="lf-color-green lf-font-28 lf-flex lf-m-t-10">
-							<text v-if="orderDetails.status == 3">待使用</text>
-							<text v-else>{{orderDetails.status_text}}</text>
+							<text v-if="orderDetails.verify_code && orderDetails.status != 16">待使用</text>
+							<text v-if="orderDetails.verify_code && orderDetails.status == 16">已使用</text>
 							<!-- <text class="lf-iconfont lf-icon-shuaxin1 lf-font-40"
 								style="color: #999;position: relative;left: 84rpx;top: -42rpx;display: inherit;"
 								@tap="refreshCode()"></text> -->