From 4e023185fb0c189334740a79398505b2bfbd9186 Mon Sep 17 00:00:00 2001
From: wangjiahai <1556608@qq.com>
Date: Tue, 9 Jan 2024 11:20:04 +0800
Subject: [PATCH] 111

---
 pages/home/pickUpCard.vue | 96 +++++++++++++++++++++++----------------
 1 file changed, 57 insertions(+), 39 deletions(-)

diff --git a/pages/home/pickUpCard.vue b/pages/home/pickUpCard.vue
index eef88f2..990d23a 100644
--- a/pages/home/pickUpCard.vue
+++ b/pages/home/pickUpCard.vue
@@ -14,10 +14,10 @@
 						style="height: 45px;line-height: 45px;font-size: 17px;font-weight: 600; text-align: center;color: #FF7100;margin-left: 11px;">绑定新卡</text>
 				</view> -->
 				<view style="flex: 1;"></view>
-				<text style="color: #fff;margin-top: 60vw; margin-right: 25px;"  @click="bind">绑定新卡</text>
+				<text style="color: #fff;margin-top: 60vw; margin-right: 25px;" @click="bind">绑定新卡</text>
 			</view>
-			
-			
+
+
 		</view>
 
 		<!-- <view
@@ -29,7 +29,7 @@
 				:class="item.showBtn==true?'oragin':'gray'" @click="detail(item)">
 
 				<!-- 家庭卡-->
-				<view v-show="item.type=='1'" >
+				<view v-show="item.type=='1'">
 
 					<view class="item" :class="{ item2: !item.showBtn }">
 
@@ -41,9 +41,10 @@
 							<view style="flex-shrink: 0;">
 								<image src="https://supervise.yxtsoft.com/lpk/image/home_family.png" mode="aspectFill"
 									v-show="item.showBtn" style="width: 50px;height: 50px;margin-right: 10px;" />
-							
-								<image src="https://supervise.yxtsoft.com/lpk/image/home_notFamily.png" mode="aspectFill"
-									v-show="!item.showBtn" style="width: 50px;height: 50px;margin-right: 10px;" />
+
+								<image src="https://supervise.yxtsoft.com/lpk/image/home_notFamily.png"
+									mode="aspectFill" v-show="!item.showBtn"
+									style="width: 50px;height: 50px;margin-right: 10px;" />
 							</view>
 
 							<view
@@ -73,6 +74,20 @@
 										{{item.state}}</text>
 								</view>
 
+								<view style="height: 10px;"></view>
+
+								<view v-for="(item,index) in 1"
+									style="display: flex;flex-direction: row;align-items: center;width: calc(100vw - 120px);padding-top: 5px;">
+									<image src="../../static/tck_mx_icon.png" style="width: 9px;height: 9px;"></image>
+									<view
+										style="font-size: 11px;color: #E99D42;padding-left: 5px;flex: 1;overflow: hidden;text-overflow: ellipsis;white-space: nowrap">
+										东北大白菜东北大白菜东北大白菜东北大白菜</view>
+									<view style="font-size: 11px;color: #E99D42;flex-shrink: 0;margin-left: 23px;">
+										剩余4份/共10份</view>
+									<view style="font-size: 11px;color: #E99D42;flex-shrink: 0;margin-left: 23px;">5斤/份
+									</view>
+								</view>
+
 							</view>
 
 						</view>
@@ -92,11 +107,13 @@
 
 							<!-- 礼包图标 总60px -->
 							<view style="flex-shrink: 0;">
-								<image src="https://supervise.yxtsoft.com/lpk/image/home_affection.png" mode="aspectFill"
-									v-show="item.showBtn" style="width: 50px;height: 50px;margin-right: 10px;" />
-							
-								<image src="https://supervise.yxtsoft.com/lpk/image/home_notAffection.png" mode="aspectFill"
-									v-show="!item.showBtn" style="width: 50px;height: 50px;margin-right: 10px;" />
+								<image src="https://supervise.yxtsoft.com/lpk/image/home_affection.png"
+									mode="aspectFill" v-show="item.showBtn"
+									style="width: 50px;height: 50px;margin-right: 10px;" />
+
+								<image src="https://supervise.yxtsoft.com/lpk/image/home_notAffection.png"
+									mode="aspectFill" v-show="!item.showBtn"
+									style="width: 50px;height: 50px;margin-right: 10px;" />
 							</view>
 
 							<view
@@ -146,11 +163,13 @@
 
 							<!-- 礼包图标 总60px -->
 							<view style="flex-shrink: 0;">
-								<image src="https://supervise.yxtsoft.com/lpk/image/home_enterprise.png" mode="aspectFill"
-									v-show="item.showBtn" style="width: 50px;height: 50px;margin-right: 10px;" />
+								<image src="https://supervise.yxtsoft.com/lpk/image/home_enterprise.png"
+									mode="aspectFill" v-show="item.showBtn"
+									style="width: 50px;height: 50px;margin-right: 10px;" />
 
-								<image src="https://supervise.yxtsoft.com/lpk/image/home_notEnterprise.png" mode="aspectFill"
-									v-show="!item.showBtn" style="width: 50px;height: 50px;margin-right: 10px;" />
+								<image src="https://supervise.yxtsoft.com/lpk/image/home_notEnterprise.png"
+									mode="aspectFill" v-show="!item.showBtn"
+									style="width: 50px;height: 50px;margin-right: 10px;" />
 							</view>
 
 							<view
@@ -262,52 +281,52 @@
 				})
 			},
 			detail(item) {
-				console.log("aaa",item);
+				console.log("aaa", item);
 				if (item.showBtn) {
 					// 正常
-					
-					if(item.type=='1'){
-							console.log("111",item);
+
+					if (item.type == '1') {
+						console.log("111", item);
 						// 家庭卡
 						uni.navigateTo({
 							url: '/pages/detail/detail_family?sid=' + item.sid
 						})
 					}
-					
-					if(item.type=='2'){
-							console.log("222",item);
+
+					if (item.type == '2') {
+						console.log("222", item);
 						// 亲情卡
 						uni.navigateTo({
 							url: '/pages/detail/detail_affeection?sid=' + item.sid
 						})
 					}
-					
-					if(item.type=='3'){
-							console.log("333",item);
+
+					if (item.type == '3') {
+						console.log("333", item);
 						// 企业卡
 						uni.navigateTo({
 							url: '/pages/detail/detail_enterprise?sid=' + item.sid
 						})
 					}
-					
-					
+
+
 				} else {
 					// 过期 已完成
-					if(item.type=='1'){
+					if (item.type == '1') {
 						// 家庭卡
 						uni.navigateTo({
 							url: '/pages/detail/detail_family2?sid=' + item.sid
 						})
 					}
-					
-					if(item.type=='2'){
+
+					if (item.type == '2') {
 						// 亲情卡
 						uni.navigateTo({
 							url: '/pages/detail/detail_affeection2?sid=' + item.sid
 						})
 					}
-					
-					if(item.type=='3'){
+
+					if (item.type == '3') {
 						// 企业卡
 						uni.navigateTo({
 							url: '/pages/detail/detail_enterprise2?sid=' + item.sid
@@ -353,12 +372,11 @@
 	}
 
 	.item {
-		/* 加载背景图 */
-		background-image: url(https://supervise.yxtsoft.com/lpk/image/home_itemBj_family.png);
-		/* 让背景图基于容器大小伸缩 */
-		background-size: 100% 100%;
 		width: calc(100% - 5px);
-	
+		border-radius: 8px;
+		background-color: rgba(255, 251, 248, 1);
+		color: rgba(16, 16, 16, 1);
+		box-shadow: 2px 3px 6px 0px rgba(238, 117, 47, 0.15);
 	}
 
 	.item2 {
@@ -383,7 +401,7 @@
 		/* 让背景图基于容器大小伸缩 */
 		background-size: 100% 100%;
 		width: calc(100% - 5px);
-	
+
 	}