From 2bae7fdec825b292254895a49bb63a315a37734c Mon Sep 17 00:00:00 2001
From: wangzimeng <3297159934@qq.com>
Date: Fri, 25 Jul 2025 16:03:24 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=BE=85=E6=A0=B8=E9=94=80=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E9=99=90=E5=88=B6=E4=B8=80=E4=B8=8B=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E8=80=85=E5=90=8D=E7=A7=B0=E7=9A=84=E9=95=BF?=
 =?UTF-8?q?=E5=BA=A6=EF=BC=8C=E8=B6=85=E5=87=BA=E7=94=A8=E7=82=B9=E7=82=B9?=
 =?UTF-8?q?=E7=82=B9=202=E3=80=81=E5=85=B6=E4=BB=96=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E4=B8=8B=E7=9A=84=E8=AE=A2=E5=8D=95=E9=A1=B5=E9=9D=A2=E9=99=90?=
 =?UTF-8?q?=E5=88=B6=E4=B8=80=E4=B8=8B=E5=8F=91=E5=B8=83=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=E8=80=85=E5=90=8D=E7=A7=B0=E7=9A=84=E9=95=BF=E5=BA=A6=EF=BC=8C?=
 =?UTF-8?q?=E8=B6=85=E5=87=BA=E7=94=A8=E7=82=B9=E7=82=B9=E7=82=B9=203?=
 =?UTF-8?q?=E3=80=81=E6=B7=BB=E5=8A=A0=E6=8A=A5=E5=90=8D=E4=BA=BA=EF=BC=8C?=
 =?UTF-8?q?=E5=BA=95=E9=83=A8=E6=B7=BB=E5=8A=A0=E6=8A=A5=E5=90=8D=E4=BA=BA?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=20=E5=9C=A8=E9=A1=B5=E9=9D=A2=E5=9B=BA?=
 =?UTF-8?q?=E5=AE=9A=204=E3=80=81=E5=BE=85=E6=A0=B8=E9=94=80=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E9=A1=B5=E9=9D=A2=E7=9A=84=E4=BA=8C=E7=BB=B4=E7=A0=81?=
 =?UTF-8?q?=E4=BC=9A=E9=80=90=E6=B8=90=E5=81=8F=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packageA/my/pendinPayDetail.vue |  41 +++++-
 packageA/my/pendinPayStatus.vue |   2 +-
 packageA/qrcodeSwiper.vue       | 229 ++++++++++++++++++++++++--------
 packageB/team/index.vue         |  23 +++-
 4 files changed, 227 insertions(+), 68 deletions(-)

diff --git a/packageA/my/pendinPayDetail.vue b/packageA/my/pendinPayDetail.vue
index 224f49a..6562d46 100644
--- a/packageA/my/pendinPayDetail.vue
+++ b/packageA/my/pendinPayDetail.vue
@@ -14,7 +14,8 @@
 							<view class="first-image flex align-items" style="margin-top: 25rpx;">
 								<image :src="detailAny.user.avatar" mode=""
 									style="width: 36rpx;height: 36rpx;border-radius:50%;"></image>
-								<text style="color:#9C9C9C;margin-left: 10rpx;">{{ detailAny.user.nickname }}</text>
+								<text class="white-space"
+									style="color:#9C9C9C;margin-left: 10rpx;width: 210rpx;">{{ detailAny.user.nickname }}</text>
 								<text style="color:#9C9C9C;margin-left: 20rpx;">/</text>
 								<text style="color:#9C9C9C;margin-left: 20rpx;">{{ detailAny.join_info.people_number
 									}}人玩过</text>
@@ -52,7 +53,7 @@
 						<image class="icons" src="/static/detail/xiangqing.png"></image>
 					</view>
 				</view>
-				<view class="third-center">
+				<view class="thirdCrode-center">
 					<qrcode-swiper :images="qrimages" @onSwiperChanges="onSwiperChanges"> </qrcode-swiper>
 					<!-- <l-painter v-for="qrcodesurl in detailAny.ordercode">
 					<l-painter-view css="margin-top: 20rpx;margin-bottom: 20rpx;">
@@ -92,7 +93,7 @@
 					<view class="flex w-100 space-between hui align-items" style="margin-top: 40rpx;">
 						<text>付款时间</text>
 						<text style="color: #323232;">{{ formattime(detailAny.paytime) }}</text>
-						
+
 					</view>
 				</view>
 			</view>
@@ -493,7 +494,7 @@
 						// this.qrList = res.data.detail.ordercode;
 						this.qrimages = res.data.detail.ordercode;
 						this.detailAny = res.data.detail;
-						console.log('{{detailAny.status}}',detailAny.status,detailAny);
+						console.log('{{detailAny.status}}', detailAny.status, detailAny);
 						this.generateAllQRCodes()
 					} else {
 						uni.showToast({
@@ -607,7 +608,7 @@
 					}
 				});
 			},
-			
+
 
 			close() {
 				this.type = 0
@@ -1042,6 +1043,33 @@
 			}
 		}
 
+		.thirdCrode-center {
+			/* 其他样式保持不变 */
+			min-height: 400rpx;
+			/* 确保有足够空间 */
+			position: relative;
+
+			.swiper-box {
+				width: 100%;
+				height: 350rpx;
+				/* 与组件内高度一致 */
+			}
+			
+			.bottom {
+				width: 100%;
+				margin-bottom: 10rpx;
+				font-family: PingFang SC, PingFang SC;
+				font-weight: 400;
+				font-size: 26rpx;
+				color: #9C9C9C;
+				text-align: center;
+				font-style: normal;
+				text-transform: none;
+			}
+			
+		}
+
+
 		.third-center {
 			padding: 30rpx;
 			position: relative;
@@ -1125,7 +1153,8 @@
 		background-size: 100% 100%;
 		background-repeat: no-repeat;
 		border-radius: 44rpx;
-    padding-bottom: 30rpx;
+		padding-bottom: 30rpx;
+
 		.pop-header {
 			width: 100%;
 
diff --git a/packageA/my/pendinPayStatus.vue b/packageA/my/pendinPayStatus.vue
index cbd89d8..311061e 100644
--- a/packageA/my/pendinPayStatus.vue
+++ b/packageA/my/pendinPayStatus.vue
@@ -18,7 +18,7 @@
 							<view class="first-image flex align-items white-space" style="margin-top: 25rpx;">
 								<image :src="detailAny.user.avatar" mode=""
 									style="width: 36rpx;height: 36rpx;border-radius: 50%;"></image>
-								<span style="color:#9C9C9C;margin-left: 10rpx;">{{ detailAny.user.nickname }}</span>
+								<span class="white-space" style="color:#9C9C9C;margin-left: 10rpx;width: 210rpx;">{{ detailAny.user.nickname }}</span>
 								<text style="color:#9C9C9C;margin-left: 20rpx;">/</text>
 								<span
 									style="color:#9C9C9C;margin-left: 20rpx;">{{ detailAny.join_info.people_number }}人玩过</span>
diff --git a/packageA/qrcodeSwiper.vue b/packageA/qrcodeSwiper.vue
index 34422da..b470a5b 100644
--- a/packageA/qrcodeSwiper.vue
+++ b/packageA/qrcodeSwiper.vue
@@ -1,15 +1,19 @@
 <template>
 	<view class="carousel-container">
 		<!-- 轮播主体 -->
-		<swiper class="swiper-box" :current="currentIndex" @change="onSwiperChange" circular>
+		<swiper class="swiper-box" :current="currentIndex" @change="onSwiperChange" circular
+			:style="{height: swiperHeight + 'rpx'}">
 			<swiper-item v-for="(item, index) in images" :key="index" class="swiper-item">
-				<view style="border: 1px solid #9C9C9C;width: 280rpx;height: 280rpx;margin: 0 auto;border-radius: 8rpx;">
-					<image :src="item.codeimage" class="swiper-image" mode="aspectFill" />
+				<view
+					style="border: 1px solid #9C9C9C;width: 280rpx;height: 280rpx;margin: 0 auto;border-radius: 8rpx;">
+					<image :src="item.codeimage" class="swiper-image" mode="widthFix" @load="onImageLoad"/>
 				</view>
-				<view v-if="item.status==6" style="border: 1px solid #9C9C9C;width: 280rpx;height: 284rpx;margin: 0 auto;border-radius: 8rpx;    position: absolute;top: 0;left: 0;right: 0;">
-					<image src="/static/qrcode_yes.png" class="swiper-image" mode="aspectFill" />
+				<view v-if="item.status==6"
+					style="border: 1px solid #9C9C9C;width: 280rpx;height: 284rpx;margin: 0 auto;border-radius: 8rpx;    position: absolute;top: 0;left: 0;right: 0;">
+					<image src="/static/qrcode_yes.png" class="swiper-image" mode="widthFix" />
+				</view>
+				<view style="text-align: center;font-size: 28rpx;margin-top: 15rpx;font-weight: 600;">{{item.name}}
 				</view>
-				<view style="text-align: center;font-size: 28rpx;margin-top: 15rpx;font-weight: 600;">{{item.name}}</view>
 			</swiper-item>
 		</swiper>
 
@@ -44,7 +48,8 @@
 		},
 		data() {
 			return {
-				currentIndex: 0
+				currentIndex: 0,
+				swiperHeight: 350 // 默认高度
 			};
 		},
 		methods: {
@@ -62,74 +67,180 @@
 				else if (newIndex >= total) newIndex = 0; // 循环向后
 
 				this.currentIndex = newIndex;
+			},
+			onImageLoad(e) {
+				// 动态计算图片高度
+				const {
+					width,
+					height
+				} = e.detail;
+				const ratio = height / width;
+				const calculatedHeight = 280 * ratio; // 280rpx是固定宽度
+				if (calculatedHeight > this.swiperHeight) {
+					this.swiperHeight = calculatedHeight + 60; // 60rpx为文字区域预留空间
+				}
 			}
+
 		}
 	};
 </script>
 <style lang="scss" scoped>
 	.carousel-container {
-		position: relative;
-		height: 350rpx;
+	  position: relative;
+	  width: 100%;
+	  margin: 0 auto;
 	}
-
+	
 	.swiper-box {
-		width: 100%;
-		height: 100%;
+	  width: 100%;
 	}
-
+	
 	.swiper-item {
-		text-align: center;
-		padding: 3rpx;
+	  display: flex;
+	  flex-direction: column;
+	  align-items: center;
+	  justify-content: center;
+	  height: 100%;
+	  box-sizing: border-box;
+	  padding: 20rpx 0;
 	}
-
+	
+	.qrcode-container {
+	  position: relative;
+	  width: 280rpx;
+	  height: 280rpx;
+	  border: 1px solid #9C9C9C;
+	  border-radius: 8rpx;
+	  margin: 0 auto;
+	  overflow: hidden;
+	}
+	
 	.swiper-image {
-		width: 100%;
-		height: 100%;
-		border-radius: 8rpx;
-		
-		/* 内边距为边框宽度 */
-		box-sizing: border-box;
-		/* 内边距和边框计入总尺寸 */
+	  width: 100%;
+	  height: 100%;
+	  display: block;
 	}
-
+	
+	.used-overlay {
+	  position: absolute;
+	  top: 0;
+	  left: 0;
+	  width: 100%;
+	  height: 100%;
+	  background-color: rgba(0,0,0,0.5);
+	  display: flex;
+	  align-items: center;
+	  justify-content: center;
+	  
+	  image {
+	    width: 80%;
+	    height: 80%;
+	  }
+	}
+	
+	.qrcode-name {
+	  text-align: center;
+	  font-size: 28rpx;
+	  margin-top: 15rpx;
+	  font-weight: 600;
+	  width: 100%;
+	  white-space: nowrap;
+	  overflow: hidden;
+	  text-overflow: ellipsis;
+	}
+	
 	.nav-buttons {
-		position: absolute;
-		top: 50%;
-		transform: translateY(-50%);
-		width: 100%;
-		display: flex;
-		justify-content: space-between;
-
-		.btn {
-			width: 60rpx;
-			height: 60rpx;
-			// border-radius: 50%;
-			// background: rgba(0,0,0,0.3);
-			color: white;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-		}
+	  position: absolute;
+	  top: 50%;
+	  left: 0;
+	  right: 0;
+	  transform: translateY(-50%);
+	  display: flex;
+	  justify-content: space-between;
+	  pointer-events: none; // 防止按钮阻挡滑动
+	  
+	  .btn {
+	    pointer-events: auto;
+	    width: 60rpx;
+	    height: 60rpx;
+	    display: flex;
+	    align-items: center;
+	    justify-content: center;
+	    
+	    image {
+	      width: 50rpx;
+	      height: 50rpx;
+	    }
+	  }
 	}
+	
+	
+	// .carousel-container {
+	// 	position: relative;
+	// 	height: 350rpx;
+	// }
 
-	.dots {
-		position: absolute;
-		bottom: 20rpx;
-		width: 100%;
-		display: flex;
-		justify-content: center;
+	// .swiper-box {
+	// 	width: 100%;
+	// 	height: 100%;
+	// }
 
-		.dot {
-			width: 12rpx;
-			height: 12rpx;
-			border-radius: 50%;
-			background: rgba(255, 255, 255, 0.5);
-			margin: 0 8rpx;
+	// .swiper-item {
+	// 	display: block;
+	// 	text-align: center;
+	// 	align-items: center;
+	// 	justify-content: center;
+	// 	padding: 3rpx;
+	// }
 
-			&.active {
-				background: #007AFF;
-				transform: scale(1.2);
-			}
-		}
-	}
+	// .swiper-image {
+	// 	width: 100%;
+	// 	height: 100%;
+	// 	border-radius: 8rpx;
+
+	// 	/* 内边距为边框宽度 */
+	// 	box-sizing: border-box;
+	// 	/* 内边距和边框计入总尺寸 */
+	// }
+
+	// .nav-buttons {
+	// 	position: absolute;
+	// 	top: 50%;
+	// 	transform: translateY(-50%);
+	// 	width: 100%;
+	// 	display: flex;
+	// 	justify-content: space-between;
+
+	// 	.btn {
+	// 		width: 60rpx;
+	// 		height: 60rpx;
+	// 		// border-radius: 50%;
+	// 		// background: rgba(0,0,0,0.3);
+	// 		color: white;
+	// 		display: flex;
+	// 		align-items: center;
+	// 		justify-content: center;
+	// 	}
+	// }
+
+	// .dots {
+	// 	position: absolute;
+	// 	bottom: 20rpx;
+	// 	width: 100%;
+	// 	display: flex;
+	// 	justify-content: center;
+
+	// 	.dot {
+	// 		width: 12rpx;
+	// 		height: 12rpx;
+	// 		border-radius: 50%;
+	// 		background: rgba(255, 255, 255, 0.5);
+	// 		margin: 0 8rpx;
+
+	// 		&.active {
+	// 			background: #007AFF;
+	// 			transform: scale(1.2);
+	// 		}
+	// 	}
+	// }
 </style>
\ No newline at end of file
diff --git a/packageB/team/index.vue b/packageB/team/index.vue
index 3829667..b2c43ab 100644
--- a/packageB/team/index.vue
+++ b/packageB/team/index.vue
@@ -16,8 +16,9 @@
 			</view>
 			<view style="height: 1px;background-color: #F0F0F0;width: 100%;margin: 30rpx 0px;"></view>
 		</view>
-		<view style="padding: 30rpx;">
-			<view class="btn_1" @click="show = true;isAdd = 1;">
+		<view style="width: 100%;height: 200rpx;"></view>
+		<view style="padding: 30rpx;position: fixed;bottom: 0rpx;left: 0;width: 92%;z-index: 10;background-color: #ffffff;">
+			<view class="btn_2" @click="show = true;isAdd = 1;">
 				<view>
 					<u-icon name="plus" color="#BBFC5B" size="15"></u-icon>
 				</view>
@@ -206,6 +207,24 @@ export default {
 	padding-top: 20rpx;
 }
 
+.btn_2 {
+	width: 95%;
+	height: 90rpx;
+	background: #323232;
+	border-radius: 198rpx 198rpx 198rpx 198rpx;
+	font-family: YouSheBiaoTiHei, YouSheBiaoTiHei;
+	font-weight: 400;
+	font-size: 32rpx;
+	color: #BBFC5B;
+	line-height: 90rpx;
+	text-align: center;
+	margin: 0 auto;
+	margin-top: 30rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
 .btn_1 {
 	width: 95%;
 	height: 90rpx;