From bc283f3277c5da93684864e8fbd9f3aee262ca7a Mon Sep 17 00:00:00 2001
From: wk
Date: 星期六, 29 六月 2024 13:49:25 +0800
Subject: [PATCH] feta:临时入场

---
 pages/public-page/faYunstatisticsDetails/faYunstatisticsDetails.vue |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/pages/public-page/faYunstatisticsDetails/faYunstatisticsDetails.vue b/pages/public-page/faYunstatisticsDetails/faYunstatisticsDetails.vue
index c14eadc..0be84c2 100644
--- a/pages/public-page/faYunstatisticsDetails/faYunstatisticsDetails.vue
+++ b/pages/public-page/faYunstatisticsDetails/faYunstatisticsDetails.vue
@@ -10,7 +10,7 @@
 				</view>
 				<view class="body-container">
 					<view class="container-block">
-						<view class="">鎻愮叅鍗曠姸鎬�</view>
+						<view class="">鏀跺彂鍗曠姸鎬�</view>
 						<view class="">{{ coalStatus[faYunDetailobj.status] }}</view>
 					</view>
 				</view>
@@ -40,17 +40,25 @@
 				</view>
 				<view class="body-container">
 					<view class="container-block">
+						<view class="">鎶樺惃</view>
+						<view class="">{{ faYunDetailobj.discount || '' }}</view>
+					</view>
+				</view>
+				<view class="body-container"
+					v-if="!isSpecial">
+					<view class="container-block">
 						<view class="">璁㈠崟鍓╀綑閲�</view>
 						<view class="">{{ faYunDetailobj.allowance || '' }}</view>
 					</view>
 				</view>
 				<view class="body-container">
 					<view class="container-block">
-						<view class="">鎻愮叅鍗曠紪鍙�</view>
+						<view class="">鏀跺彂鍗曠紪鍙�</view>
 						<view class="">{{ faYunDetailobj.code || '' }}</view>
 					</view>
 				</view>
-				<view class="body-container last">
+				<view class="body-container last"
+					v-if="!isSpecial">
 					<view class="container-block">
 						<view class="">璁㈠崟缂栧彿</view>
 						<view class="">{{ faYunDetailobj.orderCode || '' }}</view>
@@ -95,7 +103,8 @@
 				faYunDetailobj: {},
 				coalStatus: ['棰嗗彇', '棰勭害', '绛惧埌', '鍏ュ満', '绉扮毊', '绉版瘺', '绂诲満', '鍏ョ鎴�', '鍑虹鎴�', '鍏ョ叅浠�', '鍑虹叅浠�', '鏀剧┖', '浣滃簾', '鍏ュ満鐢宠',
 					'杩涘叆鍦洪櫌', '寮傚父瀹℃牳涓�', '鎵撳嵃涓�', '鎵撳嵃涓�', '濉啓'
-				]
+				],
+				isSpecial: null //1 鏄壒娈� 0涓嶆槸鐗规畩
 			};
 		},
 		methods: {},
@@ -106,6 +115,7 @@
 			this.$reqGet('getTakeCoal', { takeCoalId: this.id }).then(res => {
 				if (res.code == 0) {
 					this.faYunDetailobj = res.data;
+					this.isSpecial = res.data.isSpecial
 				} else {
 					this.$u.toast('鑾峰彇鏁版嵁澶辫触');
 				}
@@ -130,7 +140,7 @@
 
 		.main-body {
 			width: 690rpx;
-			height: 1062rpx;
+			height: 1200rpx;
 			background: #ffffff;
 			box-shadow: 0rpx 0rpx 14rpx 0rpx rgba(73, 120, 240, 0.14), 0rpx 7rpx 45rpx 0rpx rgba(73, 120, 240, 0.12);
 			border-radius: 20rpx;

--
Gitblit v1.9.1