From e695ab97b46b6cfd984a8234bdc9de950b82e2ec Mon Sep 17 00:00:00 2001
From: zhangxiaoxu123 <819527061@qq.com>
Date: 星期五, 29 七月 2022 11:59:20 +0800
Subject: [PATCH] '首页添加日发运计划'

---
 pages/home/home.vue                                     |  105 ++++++++++++++++++++++++++++++++++++++--------------
 components/common/combination-card/combination-card.vue |    4 +-
 2 files changed, 79 insertions(+), 30 deletions(-)

diff --git a/components/common/combination-card/combination-card.vue b/components/common/combination-card/combination-card.vue
index 019b21c..7c167d4 100644
--- a/components/common/combination-card/combination-card.vue
+++ b/components/common/combination-card/combination-card.vue
@@ -2,7 +2,7 @@
 	<!-- 缁勫悎鍗$墖 -->
 	<view class="combination-card">
 		<view class="combination-card_wrapper">
-			<view class="combination-card_top" v-show="showTop">
+			<view class="combination-card_top" v-if="showTop">
 				<view class="combination-card_top__content">
 					<slot name="top"></slot>
 				</view>
@@ -10,7 +10,7 @@
 			<view class="combination-card_content">
 				<slot name="center"></slot>
 			</view>
-			<view class="combination-card_bottom" v-show="showBottom">
+			<view class="combination-card_bottom" v-if="showTop">
 				<slot name="bottom" a="$slots.name"></slot>
 			</view>
 		</view>
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 03973df..dd5db5d 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -199,32 +199,32 @@
 			</template>
 		</combination-card>
 		<combined-title title="鏃ュ彂杩愯鍒�" detailsPath="/pages/jihua/jihua"></combined-title>
-		<combination-card :showTop="false">
-			<template v-slot:top></template>
-			<template v-slot:center>
-				<view class="main-block-box" v-for="(item,index) in fyData" :key="item.id">
-					<view class="jihua-main-line">
-						<view class="name">瀹㈡埛鍚嶇О锛歿{item.customerName || ''}}</view>
-					</view>
-					<view class="jihua-main-line">
-						<view class="main-flex">
-							<view>鐓ょ锛歿{item.order.coalName || ''}}</view>
-							<view>鍓╀綑閲忥細{{item.order.executiveSurplus || ''}}</view>
-						</view>
-					</view>
-					<view class="jihua-main-line">
-						<view class="main-flex">
-							<view class="carNum-box">
-								<view>璁″垝杞︽暟锛�</view>
-								<u--input placeholder="璇疯緭鍏ュ彂杩愯溅鏁�" border="surround" v-model="item.numPlan"
-									@change="inputTotalChange(item)"></u--input>
-							</view>
-							<view>瀹為檯鍙戣溅鏁帮細{{item.order.numReal || ''}}</view>
-						</view>
-					</view>
-				</view>
-			</template>
-		    <template v-slot:bottom></template>
+		<combination-card :showTop="false"  v-for="(item,index) in fyData" :key="item.id">
+			  <template v-slot:top></template>
+			  <template v-slot:center>
+			  	<view class="main-block-box">
+			  		<view class="jihua-main-line">
+			  			<view class="name">瀹㈡埛鍚嶇О锛歿{item.customerName || ''}}</view>
+			  		</view>
+			  		<view class="jihua-main-line">
+			  			<view class="main-flex">
+			  				<view>鐓ょ锛歿{item.order.coalName || ''}}</view>
+			  				<view>鍓╀綑閲忥細{{item.order.executiveSurplus || ''}}</view>
+			  			</view>
+			  		</view>
+			  		<view class="jihua-main-line">
+			  			<view class="main-flex">
+			  				<view class="carNum-box">
+			  					<view>璁″垝杞︽暟锛�</view>
+			  					<u--input placeholder="璇疯緭鍏ュ彂杩愯溅鏁�" border="surround" :disabled="true" v-model="item.numPlan"
+			  						@change="inputTotalChange(item)"></u--input>
+			  				</view>
+			  				<view>瀹為檯鍙戣溅鏁帮細{{item.order.numReal || ''}}</view>
+			  			</view>
+			  		</view>
+			  	</view>
+			  </template>
+			  <template v-slot:bottom></template>
 		</combination-card>
 
 		<!-- 鎾ゅ洖妯℃�佹 -->
@@ -680,8 +680,10 @@
 
 <style lang="scss" scoped>
 ::v-deep.home {
-	height: 100%;
 	width: 100%;
+	display: flex;
+	flex-direction: column;
+	padding-bottom: vww(20);
 	.home_swipe {
 	  width: 100%;
 	  .u-swiper {
@@ -698,7 +700,10 @@
 	   }
 	  }
 	 }
-
+	.u-input {
+		height: vww(16);
+		width: vww(100);
+	}
 	// 鍗$墖涓棿
 	.center-container {
 		display: flex;
@@ -849,5 +854,49 @@
 			}
 		}
 	}
+    
+	//鏃ュ彂杩愯鍒�
+	.main-block-box {
+		// box-shadow: 0px 0px 8px 0px rgba(216,218,238,0.80); 
+		height: vww(80);
+		// padding: vww(10);
+		box-sizing: border-box;
+		margin-top: vww(12);
+		border-radius: vww(8);
+	    &:first-child{
+			margin-top: vww(5);
+		}
+		.jihua-main-line {
+			width: 100%;
+			display: flex;
+	
+			view {
+				font-size: vww(14);
+			}
+	
+			.name {
+				font-weight: 600 !important;
+			}
+	
+			.main-flex {
+				width: 100%;
+				display: flex;
+				justify-content: space-between;
+	            view{
+					font-size: vww(14);
+					line-height: vww(32);
+				}
+				.carNum-box {
+					display: flex;
+	                view {
+	                	font-size: vww(14);
+	                    line-height: vww(32);
+	                }
+					
+				}
+			}
+		}
+	
+	}
 }
 </style>

--
Gitblit v1.9.1