1

package1/group/groupBuySingle.vue

@@ -294,9 +294,9 @@
 				<view class="car-close" @tap="$refs.pintuanPopup.close()">
 					<uni-icons type="close" size="30" color="#fff"></uni-icons>
 				</view>
-				<!-- <view class="popup-rally-title" v-if="isPintuan">
+				<view class="popup-rally-title" v-if="isPintuan">
 					<view class="popup-rally-main">拼团搭子哪里找-隔壁宿舍全是宝！</view>
-				</view> -->
+				</view>
 				<view class="goods-top popup-product-card">
 					<view class="goods-img">
 						<img :src="currentItem.productPicture" alt="" style="border-radius: 20rpx;">
@@ -361,7 +361,7 @@
 						</view>
 						<view style="padding-top: 10rpx;">
 							<view class="goods-num">
-								<view class="num-plus"
+								<view class="num-plus" style="background: #999;color: #fff;"
 									@tap="changeValue('minus')">
 									-
 								</view>
@@ -388,7 +388,7 @@
 							<view class="team11" style="margin-top:10rpx;">
 								{{spec.productName}}
 							</view>
-							<view class="jiaobiao" v-if="spec.isChecked && spec.quantity>0">
+							<view class="jiaobiao" v-if="spec.quantity>0">
 								{{spec.quantity ? spec.quantity : ''}}
 							</view>
 						</view>
@@ -403,7 +403,7 @@
 						<view style="color: #ff5722;" v-if="selectedCoupon">
 							-￥{{selectedCoupon.discountAmount.toFixed(2)}}
 						</view>
-						<view style="color: #ff7a1a;" v-else-if="availableCoupons.length > 0">
+						<view style="color: #0b9b73;" v-else-if="availableCoupons.length > 0">
 							有 {{availableCoupons.length}} 张可用
 						</view>
 						<view style="color: #999;" v-else>
@@ -417,12 +417,14 @@
 					<view v-if="isPintuan" class="pintuan1">
 						<template v-if="!groupId">
 							<view class="pintuan2"
+								style="border-bottom-left-radius: 100rpx;border-top-left-radius: 100rpx;"
 								@tap.stop="submitPintuan(true)">
 								面对面团
 							</view>
 							<view class="pintuan2"
+								style="background: rgba(0, 35, 28, 1);border-bottom-right-radius: 100rpx;border-top-right-radius: 100rpx;color: rgba(166, 255, 234, 1);"
 								@tap.stop="submitPintuan(false)">
-								发起拼团￥{{selectedGroupRule && selectedGroupRule.groupPrice? parseFloat(selectedGroupRule.groupPriceAndMore).toFixed(2) : '0.00'}}
+								发起拼团￥{{selectedGroupRule && selectedGroupRule.groupPrice ? parseFloat(selectedGroupRule.groupPriceAndMore).toFixed(2) : '0.00'}}
 							</view>
 						</template>
 						<template v-else>
@@ -1499,9 +1501,9 @@
 			},
 			goDetail(type) {
 				if (type == 'goodsDetail') {
-					// uni.navigateTo({
+					uni.navigateTo({
-					// 	url: '/package1/goods/goodsDetail'
+						url: '/package1/goods/goodsDetail'
-					// })
+					})
 				} else if (type == 'shopDetail') {
 					uni.navigateTo({
 						url: '/package1/group/groupBuyDetail?item=' + JSON.stringify(this.shopItem)
@@ -2261,22 +2263,19 @@
 		text-align: center;
 		margin-right: 20px;
 		padding: 10px 10px 0;
+		position: relative;
 	}
 
 	.team-check1 {
 		width: 190rpx;
 		height: 270rpx;
 		background: rgba(166, 255, 234, 1);
-		border-radius: 20rpx;
+		border-radius: 10px;
-		font-size: 26rpx;
-		text-align: center;
-		line-height: 30rpx;
 		float: left;
-		margin-right: 40rpx;
+		text-align: center;
-		position: relative;
+		margin-right: 20px;
 		padding: 10px 10px 0;
-		font-weight: 700;
+		position: relative;
-		margin-top: 10px;
 	}
 
 	.team-check {
@@ -2858,21 +2857,6 @@
 			linear-gradient(180deg, #ffffff 0%, #f7fffb 100%);
 	}
 
-	.group-order-popup {
-		background: #fff;
-	}
-
-	.group-order-popup .goods-name,
-	.group-order-popup .spec11,
-	.group-order-popup .team11,
-	.group-order-popup .num {
-		color: #2f2f2f;
-	}
-
-	.group-order-popup .goods-deal1 {
-		color: #9a8f8a;
-	}
-
 	.popup-rally-title,
 	.join-popup-title {
 		padding: 8rpx 20rpx 22rpx;
@@ -2887,10 +2871,6 @@
 		line-height: 34rpx;
 	}
 
-	.group-order-popup .popup-rally-main {
-		color: #ff5f45;
-	}
-
 	.popup-rally-sub,
 	.join-popup-sub {
 		margin-top: 6rpx;
@@ -2908,12 +2888,6 @@
 		box-shadow: 0 12rpx 26rpx rgba(0, 35, 28, 0.06);
 	}
 
-	.group-order-popup .popup-product-card {
-		background: rgba(255, 255, 255, 0.96);
-		border-color: rgba(255, 180, 100, 0.28);
-		box-shadow: 0 14rpx 32rpx rgba(200, 100, 40, 0.07);
-	}
-
 	.popup-origin-price {
 		color: #ff4d38;
 		font-weight: 900;
@@ -2930,30 +2904,6 @@
 		animation: cardPulse 1.8s ease-in-out infinite;
 	}
 
-	.group-order-popup .spec222,
-	.group-order-popup .team1,
-	.group-order-popup .team2 {
-		background: #fff;
-		color: #7a5a42;
-		border: 1px solid rgba(255, 170, 80, 0.28);
-		box-shadow: none;
-	}
-
-	.group-order-popup .spec-check,
-	.group-order-popup .team-check,
-	.group-order-popup .team-check1,
-	.group-order-popup .team-check.team-rule-card {
-		background: linear-gradient(135deg, #ffe8b0 0%, #ffc77d 100%);
-		color: #7a3c00;
-		border-color: rgba(255, 170, 80, 0.45);
-		box-shadow: 0 10rpx 22rpx rgba(255, 170, 80, 0.2);
-	}
-
-	.group-order-popup .num-plus {
-		background: linear-gradient(135deg, #ffe8b0 0%, #ffc77d 100%);
-		color: #7a3c00;
-	}
-
 	.coupon-row {
 		margin-top: 28rpx !important;
 		padding: 0 18rpx;
@@ -2962,53 +2912,11 @@
 		background: rgba(255, 248, 224, 0.64);
 	}
 
-	.group-order-popup .coupon-row {
-		border-color: rgba(255, 170, 80, 0.38) !important;
-		background: rgba(255, 252, 244, 0.95);
-	}
-
 	.popup-bottom-bar {
 		background: rgba(255, 255, 255, 0.98);
 		box-shadow: 0 -12rpx 28rpx rgba(0, 35, 28, 0.1);
 	}
 
-	.group-order-popup .popup-bottom-bar {
-		background: rgba(255, 255, 255, 0.96);
-		box-shadow: 0 -10rpx 30rpx rgba(120, 60, 0, 0.07);
-	}
-
-	.group-order-popup .pintuan1 {
-		justify-content: space-between;
-	}
-
-	.group-order-popup .pintuan2 + .pintuan2 {
-		margin-left: 20rpx;
-	}
-
-	.group-order-popup .pintuan0 {
-		background: linear-gradient(90deg, #ffbe70 0%, #ff8c55 100%);
-		color: #fff;
-		box-shadow: 0 12rpx 26rpx rgba(255, 140, 66, 0.25);
-	}
-
-	.group-order-popup .pintuan2 {
-		border-radius: 999rpx;
-		box-shadow: 0 10rpx 24rpx rgba(255, 117, 61, 0.16);
-		overflow: hidden;
-	}
-
-	.group-order-popup .pintuan2:first-child {
-		background: #fff8ee;
-		border: 1px solid rgba(255, 170, 80, 0.5);
-		color: #b06000;
-	}
-
-	.group-order-popup .pintuan2:last-child {
-		background: linear-gradient(90deg, #ffbe70 0%, #ff8c55 100%);
-		border: 0;
-		color: #fff;
-	}
-
 	.popup-bottom-bar .pintuan2 {
 		transition: transform 0.18s ease;
 	}
@@ -3018,10 +2926,6 @@
 		animation: ctaBreath 1.9s ease-in-out infinite;
 	}
 
-	.group-order-popup .popup-bottom-bar .pintuan2:last-child {
-		box-shadow: 0 12rpx 28rpx rgba(255, 140, 66, 0.28);
-	}
-
 	.team-wait-card {
 		height: 156rpx;
 		border-radius: 30rpx;