From 93b7f6597f794f97ba23938b61af253b46a964ba Mon Sep 17 00:00:00 2001
From: wangjiahai <1556608@qq.com>
Date: Tue, 5 Dec 2023 10:44:59 +0800
Subject: [PATCH] 111

---
 pages/card/card.vue | 77 +++++++++++++++++++++++++++++----------------
 1 file changed, 50 insertions(+), 27 deletions(-)

diff --git a/pages/card/card.vue b/pages/card/card.vue
index eb3b00b..1026301 100644
--- a/pages/card/card.vue
+++ b/pages/card/card.vue
@@ -8,7 +8,8 @@
 			</NavBar>
 			<view style="display: flex;flex-direction: column;align-items: center;">
 				<view class="btn" @click="bind">
-					<image src="https://supervise.yxtsoft.com/lpk/image/binding.png" style="width: 15px;height: 15px;"></image>
+					<image src="https://supervise.yxtsoft.com/lpk/image/binding.png" style="width: 15px;height: 15px;">
+					</image>
 					<text
 						style="height: 45px;line-height: 45px;font-size: 17px; text-align: center;color: #FE6B00;margin-left: 11px;">绑定新卡</text>
 				</view>
@@ -18,43 +19,59 @@
 		<view
 			style="display: flex;flex-direction: column;background-color: #fff;height: 50vh; border-top-left-radius: 25px;border-top-right-radius: 25px;margin-top: -9.06vw;">
 
-			<z-paging ref="paging" use-page-scroll  v-model="data" @query="queryList" :refresher-enabled="false">
+			<z-paging ref="paging" use-page-scroll v-model="data" @query="queryList" :refresher-enabled="false">
 
 				<view v-for="(item,index) in data" :key="index"
-					style="display: flex;flex-direction: column;align-items: center;margin-top: 14px; "
+					style="display: flex;flex-direction: column;align-items: center;margin-top: 14px;"
 					:class="item.showBtn==true?'oragin':'gray'" @click="detail(item)">
 
-					<view class="item" :class="{ item2: !item.showBtn }"
-						style="display: flex;flex-direction: row; padding: 16px;margin-left: 9px;margin-right: 9px;">
+					<view class="item" :class="{ item2: !item.showBtn }">
 
-						<view style="display: flex;flex-direction: row; align-items: center; flex: 1;">
+						<!-- 外边 18px 内边 32px = 50px -->
+						<view
+							style="padding: 16px;display: flex;flex-direction: row;width: 100%;box-sizing: border-box;">
 
-							<image src="https://supervise.yxtsoft.com/lpk/image/pack.png" mode="aspectFill" v-show="item.showBtn"
-								style="width: 50px;height: 50px;margin-right: 10px;" />
+							<!-- 礼包图标 总60px -->
+							<view style="flex-shrink: 0;">
+								<image src="https://supervise.yxtsoft.com/lpk/image/pack.png" mode="aspectFill"
+									v-show="item.showBtn" style="width: 50px;height: 50px;margin-right: 10px;" />
 
-							<image src="https://supervise.yxtsoft.com/lpk/image/pack2.png" mode="aspectFill" v-show="!item.showBtn"
-								style="width: 50px;height: 50px;margin-right: 10px;" />
+								<image src="https://supervise.yxtsoft.com/lpk/image/pack2.png" mode="aspectFill"
+									v-show="!item.showBtn" style="width: 50px;height: 50px;margin-right: 10px;" />
+							</view>
+
+							<view
+								style="flex: 1;display: flex;flex-direction: column;box-sizing: border-box;flex-wrap: nowrap;">
 
-							<view style="display: flex;flex-direction: column;padding-right: 10px;">
+								<view style="width: 100%;display: flex;flex-direction: row;">
 
-								<text style="font-size: 13px;color: #333;"> {{item.name}}</text>
-								<text style="font-size: 12px;color: #999;margin-top: 5px;"> {{item.time}}</text>
+									<view style="flex: 1;display: flex;flex-direction: column;">
+										<text class="_ellipsis"
+											style="font-size: 13px;color: #333;width: calc(100vw - 190px);">
+											{{item.name}}</text>
+										<text lass="_ellipsis"
+											style="font-size: 12px;color: #999;margin-top: 5px;width: calc(100vw - 182px);">
+											{{item.time}}</text>
+									</view>
+
+									<!-- 按钮 24 + 48 = 72px-->
+									<view :class="{ showBtn: !item.showBtn }" style="font-size: 12px;color:#fff;flex-shrink: 0;
+										border-radius: 15px; height: 30px;padding: 0px 12px;line-height: 30px;box-sizing: border-box;
+									 background: -webkit-linear-gradient(left,#FF7405,#FFAD6D);">预约提货</view>
+								</view>
 
+								<!-- 蔬菜礼包经典款+状态 -->
 								<view style="display: flex;flex-direction: row;align-items: center;margin-top: 5px;">
 									<text style="font-size: 15px;color: #FF7100;"> {{item.pname}}</text>
 									<text
-										style="border: 1px #FED4B3 solid;margin-left: 10px;border-radius: 15px;padding:  3px 10px; font-size: 12px; color: #FF6000;">
+										style="border: 1px #FED4B3 solid;margin-left: 10px;border-radius: 15px;padding:  3px 10px; font-size: 12px; color: #FF6000;flex-shrink: 0;">
 										{{item.state}}</text>
 								</view>
+
 							</view>
 
 						</view>
 
-						<view :class="{ showBtn: !item.showBtn }" 
-						style="font-size: 12px;color:#fff;flex-shrink: 0;
-							border-radius: 15px; height: 30px;padding: 0px 12px;line-height: 30px;
-						 background: -webkit-linear-gradient(left,#FF7405,#FFAD6D);">预约提货</view>
-
 					</view>
 
 				</view>
@@ -136,22 +153,26 @@
 
 			},
 			booking(item) {
-				
-				if(!item.notRese){
+
+				if (!item.notRese) {
 					this.shortToast("该卡商品已全部预约。")
 					return
-				}else{
+				} else {
 					uni.navigateTo({
 						url: '/pages/card/card_booking?sid=' + item.sid
 					})
 				}
-				
+
 			}
 		}
 	}
 </script>
 
 <style>
+	._ellipsis {
+		overflow-wrap: break-word;
+	}
+
 	.top {
 		width: 100vw;
 		/* height: 126.66vw; */
@@ -159,7 +180,7 @@
 		/* 加载背景图 */
 		background-image: url(https://supervise.yxtsoft.com/lpk/image/hmoe_bj.png);
 		/* 让背景图基于容器大小伸缩 */
-		background-size:100% 100%;
+		background-size: 100% 100%;
 	}
 
 	.btn {
@@ -179,6 +200,7 @@
 		background-image: url(https://supervise.yxtsoft.com/lpk/image/card_item.png);
 		/* 让背景图基于容器大小伸缩 */
 		background-size: 100% 100%;
+		width: calc(100% - 18px);
 	}
 
 	.item2 {
@@ -186,9 +208,10 @@
 		background-image: url(https://supervise.yxtsoft.com/lpk/image/card_item2.png);
 		/* 让背景图基于容器大小伸缩 */
 		background-size: 100% 100%;
+		width: calc(100% - 18px);
 	}
-	
-	.showBtn{
+
+	.showBtn {
 		visibility: hidden;
 	}
 
@@ -208,7 +231,7 @@
 		transition: filter 0.2s;
 	}
 
-	
+
 
 	.oragin {}