From 741be74404d34f1215edde634bec5b3937201c4b Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期六, 23 九月 2023 16:04:52 +0800
Subject: [PATCH] #

---
 Monitor-APP/pages/home/home.vue |   21 ++++++++++++++++++---
 1 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index c344f78..1a6ebe3 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -220,11 +220,11 @@
 									<view>宸ヤ綔鍙�: {{infoText.workNo}}</view>
 									<view>婧愬簱浣�: {{infoText.sourceLocNo}}</view>
 									<view>鐩爣绔�: {{infoText.staNo}}</view>
-									<view v-show="infoText.ctnNo" style="color: red;">閿佺爜鐗╂枡</view>
+									<view v-show="infoText.ctnNo" style="color: red">閿佺爜鐗╂枡</view>
 									<!-- <view style="width: 10%;">鏁伴噺</view> -->
 								</view>
 								<!-- body -->
-								<view class="swiper-body">
+								<view class="swiper-body" :class="textred" >
 									<!-- swiper 涓�浜涜鏄�
 									circular 鏄惁閲囩敤琛旀帴婊戝姩锛屽嵆鎾斁鍒版湯灏惧悗閲嶆柊鍥炲埌寮�澶�
 									vertical 婊戝姩鏂瑰悜鏄惁涓虹旱鍚� 
@@ -236,12 +236,16 @@
 											<view>
 												<view>鏂欏彿锛歿{infoText.matnr}}</view>
 												<view class="swiper-margin">瑙勬牸锛歿{infoText.specs}}</view>
+												<view v-show="!infoText.orderNo" class="swiper-margin">绠卞彿锛歿{infoText.barcode}}</view>
 											</view>
 											<view>
 												<view>鎵规锛歿{infoText.batch}}</view>
 												<view class="swiper-margin">鍑哄簱鏁伴噺锛歿{infoText.count}}</view>
 											</view>
 										</swiper-item>
+										<!-- <swiper-item class="swiper-item" v-show="!infoText.orderNo">
+											
+										</swiper-item> -->
 										<swiper-item class="swiper-item" v-show="infoText.orderNo">
 											<view>
 												<view>璁㈠崟鍙凤細{{infoText.orderNo}}</view>
@@ -407,7 +411,8 @@
 				swiperList: [],
 				timeOut: false,
 				times: 0,
-				currDate: ''
+				currDate: '',
+				textred: 'textred'
 			}
 		},
 		onShow() {
@@ -486,8 +491,10 @@
 					that.infoText.ctnNo = res.data[0].ctnNo
 					if (res.data[0].ctnNo) {
 						that.infoText.orderNo = ''
+						that.textred = 'textred'
 					} else {
 						that.infoText.orderNo = res.data[0].orderNo
+						that.textred = ''
 					}
 					that.swiperList = res.data[0].matDtos
 					that.infoText.matnr = res.data[0].matDtos[0].matnr
@@ -570,8 +577,10 @@
 							that.infoText.ctnNo = res.data[0].ctnNo
 							if (res.data[0].ctnNo) {
 								that.infoText.orderNo = ''
+								that.textred = 'textred'
 							} else {
 								that.infoText.orderNo = res.data[0].orderNo
+								that.textred = ''
 							}
 							that.infoText.matnr = res.data[0].matDtos[0].matnr
 							that.infoText.barcode = res.data[0].barcode
@@ -992,6 +1001,9 @@
 		width: 3.5vw;
 		height: 3.5vw;
 	}
+	.red{
+		color: red
+	}
 	
 	
 	
@@ -1164,4 +1176,7 @@
 		justify-content: center;
 		white-space: pre-line;
 	}
+	.textred{
+		color: red;
+	}
 </style>
\ No newline at end of file

--
Gitblit v1.9.1