From 81f60ba8a1ea5bcb9387aaf7137df9a8b1f76549 Mon Sep 17 00:00:00 2001
From: THK3121 <thk121969318@163.com>
Date: Wed, 13 Sep 2023 16:38:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/mentioned.vue            | 262 +++++++++++++++-------------
 components/plantConSwiper/index.vue |  17 +-
 2 files changed, 153 insertions(+), 126 deletions(-)

diff --git a/components/mentioned.vue b/components/mentioned.vue
index b0a0814..12f0495 100644
--- a/components/mentioned.vue
+++ b/components/mentioned.vue
@@ -18,28 +18,33 @@
 									<view class="price">￥<text>{{item.spu && item.spu.price}}</text></view>
 									<view class="buy-btn">立即购买</view>
 								</view>
-								
+
 							</view>
 						</view>
-						
+
 					</view>
 				</scroll-view>
-				
-			</view>	
+
+			</view>
+		</view>
+		<view class='mask' style="height: 100vh;" catchtouchmove="true" :hidden='popup.show==false' @tap="closePopup">
 		</view>
-		<view class='mask' catchtouchmove="true" :hidden='popup.show==false' @tap="closePopup"></view>
 	</view>
-	
+
 </template>
 
 <script>
-	import { goShopDetail } from '@/libs/order.js'
-	import { mapGetters } from "vuex";
+	import {
+		goShopDetail
+	} from '@/libs/order.js'
+	import {
+		mapGetters
+	} from "vuex";
 	export default {
-		computed:{
+		computed: {
 			...mapGetters(['viewColor']),
 		},
-		props:{
+		props: {
 			list: {
 				type: Array,
 				default: []
@@ -50,9 +55,9 @@
 			isHome: {
 				type: Boolean,
 				default: false
-			}	
+			}
 		},
-		data() {			
+		data() {
 			return {
 				popup: {
 					show: false
@@ -63,11 +68,12 @@
 			// 点击关闭按钮
 			closePopup() {
 				this.$set(this.popup, 'show', false);
+				this.$emit("closes")
 			},
 			showPopup() {
 				this.$set(this.popup, 'show', true);
 			},
-			goDetail(item){
+			goDetail(item) {
 				if (item.product_type === 1) {
 					uni.navigateTo({
 						url: `/pages/activity/goods_seckill_details/index?id=${item.product_id}&time=${item.stop_time}&spid=${this.uid}`
@@ -79,130 +85,150 @@
 				} else if (item.product_type === 0) {
 					uni.navigateTo({
 						url: `/pages/goods_details/index?id=${item.product_id}&spid=${this.uid}`
-					})	
-				}else if (item.product_type === 4) {
+					})
+				} else if (item.product_type === 4) {
 					uni.navigateTo({
 						url: `/pages/activity/combination_details/index?id=${item.activity_id}&spid=${this.uid}`
 					})
-				}else if (item.product_type === 40) {
+				} else if (item.product_type === 40) {
 					uni.navigateTo({
 						url: `/pages/activity/combination_status/index?id=${item.activity_id}&spid=${this.uid}`
 					})
-				}	
+				}
 			}
 		}
 	}
 </script>
 <style lang="scss" scoped>
-.container{
-	position: fixed;
-	bottom: 0;
-	width: 100%;
-	left: 0;
-	background-color: #ffffff;
-	z-index: 77;
-	border-radius: 16rpx 16rpx 0 0;
-	transform: translate3d(0, 100%, 0);
-	transition: all .3s cubic-bezier(.25, .5, .5, .9);
-	max-height: 1000rpx;
-	&.on {
-		transform: translate3d(0, 0, 0);
-	}
-	.header{
-		position: relative;
-		padding: 40rpx 30rpx;
-		.title{
-			color: #282828;
-			font-size: 30rpx;
+	.container {
+		position: fixed;
+		bottom: 0;
+		width: 100%;
+		left: 0;
+		background-color: #ffffff;
+		z-index: 77;
+		border-radius: 16rpx 16rpx 0 0;
+		transform: translate3d(0, 100%, 0);
+		transition: all .3s cubic-bezier(.25, .5, .5, .9);
+		max-height: 1000rpx;
+
+		&.on {
+			transform: translate3d(0, 0, 0);
 		}
-		.iconfont{
-			color: #8A8A8A;
-			font-size: 28rpx;
-			position: absolute;
-			top: 0;
-			right: 0;
-		}
-		.icon-guanbi5 {
-			right: 20rpx;
-			color: #8a8a8a;
-			font-size: 30rpx;
-			line-height: 30rpx;
-			top: 20rpx;
-			background-color: transparent;
-			font-weight: normal;
-		}
-	}
-	scroll-view{
-		max-height: 800rpx;
-	}
-	.main_count{
-		padding: 0 30rpx 30rpx;
-		max-height: 800rpx;
-		overflow-y: scroll;
-		/* #ifndef MP */
-		&.mb90{
-			margin-bottom: 90rpx;
-		}	
-		/* #endif */
-		.list{
-			margin-bottom: 40rpx;
-			height: auto;
-			flex-direction: row;
-			&:last-child{
-				margin-bottom: 0;
+
+		.header {
+			position: relative;
+			padding: 40rpx 30rpx;
+
+			.title {
+				color: #282828;
+				font-size: 30rpx;
+			}
+
+			.iconfont {
+				color: #8A8A8A;
+				font-size: 28rpx;
+				position: absolute;
+				top: 0;
+				right: 0;
+			}
+
+			.icon-guanbi5 {
+				right: 20rpx;
+				color: #8a8a8a;
+				font-size: 30rpx;
+				line-height: 30rpx;
+				top: 20rpx;
+				background-color: transparent;
+				font-weight: normal;
 			}
 		}
-		.pro_list{
-			display: flex;
-			flex-direction: row;
-			.picture,.image,uni-image{
-				width: 200rpx;
-				height: 200rpx;
-				border-radius: 16rpx;
+
+		scroll-view {
+			max-height: 800rpx;
+		}
+
+		.main_count {
+			padding: 0 30rpx 30rpx;
+			max-height: 800rpx;
+			overflow-y: scroll;
+
+			/* #ifndef MP */
+			&.mb90 {
+				margin-bottom: 90rpx;
 			}
-			.info{
-				margin-left: 30rpx;
-				position: relative;	
-				.bottom{
-					display: flex;
-					justify-content: space-between;
-					align-items: center;
-					width: 460rpx;
-					position: absolute;
-					left: 0;
-					bottom: 10rpx;
-					flex-direction: row;
+
+			/* #endif */
+			.list {
+				margin-bottom: 40rpx;
+				height: auto;
+				flex-direction: row;
+
+				&:last-child {
+					margin-bottom: 0;
 				}
-				.name{
-					color: #282828;
-					font-size: 30rpx;
-					line-height: 45rpx;		
-					display: -webkit-box;
-					width: 460rpx;
+			}
+
+			.pro_list {
+				display: flex;
+				flex-direction: row;
+
+				.picture,
+				.image,
+				uni-image {
+					width: 200rpx;
+					height: 200rpx;
+					border-radius: 16rpx;
 				}
-				.price{
-					color: var(--view-priceColor);
-					font-size: 26rpx;
-					font-weight: bold;
-					flex-direction: row;
-					align-items: flex-end;
-					text{
-						font-size: 34rpx;	
+
+				.info {
+					margin-left: 30rpx;
+					position: relative;
+
+					.bottom {
+						display: flex;
+						justify-content: space-between;
+						align-items: center;
+						width: 460rpx;
+						position: absolute;
+						left: 0;
+						bottom: 10rpx;
+						flex-direction: row;
+					}
+
+					.name {
+						color: #282828;
+						font-size: 30rpx;
+						line-height: 45rpx;
+						display: -webkit-box;
+						width: 460rpx;
+					}
+
+					.price {
+						color: var(--view-priceColor);
+						font-size: 26rpx;
+						font-weight: bold;
+						flex-direction: row;
+						align-items: flex-end;
+
+						text {
+							font-size: 34rpx;
+						}
+					}
+
+					.buy-btn {
+						color: #fff;
+						background: var(--view-theme);
+						border-radius: 28.04rpx 28.04rpx 28.04rpx 28.04rpx;
+						width: 154.21rpx;
+						height: 57.83rpx;
+						display: flex;
+						align-items: center;
+						justify-content: center;
+						font-size: 22rpx;
 					}
 				}
-				.buy-btn{
-					color: #fff;
-					background: var(--view-theme);
-					border-radius: 26rpx;
-					width: 140rpx;
-					height: 48rpx;
-					display: flex;
-					align-items: center;
-					justify-content: center;
-					font-size: 22rpx;
-				}
 			}
 		}
 	}
-}
-</style>
+</style>
\ No newline at end of file
diff --git a/components/plantConSwiper/index.vue b/components/plantConSwiper/index.vue
index ea15751..b1a9da0 100644
--- a/components/plantConSwiper/index.vue
+++ b/components/plantConSwiper/index.vue
@@ -1,8 +1,8 @@
 <template>
 	<view class='product-bg'>
 		<swiper :indicator-dots="indicatorDots" indicator-active-color="#e93323" :circular="circular"
-		 :interval="interval" :duration="duration">
-		 
+			:interval="interval" :duration="duration">
+
 			<block v-for="(item,index) in imgUrls" :key='index'>
 				<swiper-item>
 					<image :src="item" class="slide-image" mode="aspectFit" />
@@ -12,7 +12,7 @@
 				</swiper-item>
 			</block>
 		</swiper>
-		
+
 	</view>
 </template>
 
@@ -56,8 +56,7 @@
 				videoContext: ''
 			};
 		},
-		created() {
-		},
+		created() {},
 		watch: {
 
 		},
@@ -83,7 +82,7 @@
 				// #ifdef APP-PLUS
 				this.isPlay = false
 				this.videoContext = uni.createVideoContext('myVideo', this);
-				this.$nextTick(()=>{
+				this.$nextTick(() => {
 					this.videoContext.play();
 				})
 				// #endif
@@ -102,13 +101,15 @@
 		height: 710rpx;
 		position: relative;
 	}
+
 	.product-bg swiper {
 		width: 100%;
 		height: 100%;
 		position: relative;
 	}
+
 	.product-bg .slide-image {
-		width: 100%;
+		width: 100vw;
 		height: 100%;
 		border-radius: 16rpx;
 	}
@@ -166,4 +167,4 @@
 		width: 100%;
 		height: 100%;
 	}
-</style>
+</style>
\ No newline at end of file