Merge branch 'main'

pages/goods/detail.vue

@@ -14,7 +14,7 @@
 			<view class="swiper">
 				<swiper class="swiper" :circular="true" autoplay @change="changeSwiper">
 					<swiper-item v-for="(item,index) in goods.goods_images1" :key="index" @click="previewImage(index)">
-						<image :src="item" class="goodsImg"></image>
+						<image :src="item" style="width: 100%;height: 100%;object-fit: cover" class="goodsImg"></image>
 					</swiper-item>
 				</swiper>
 				<view class="dots" v-if="goods.goods_images && goods.goods_images.length> 0">
@@ -407,7 +407,8 @@
 			</view>
 			<view class="shareWechat" v-if="shareType=='share'">
 				<view class="shareGoods">
-					<image :src="goods.goods_image" mode="heightFix" class="shareImg"></image>
+					<image :src="goods.goods_image"  class="shareImg">
+					</image>
 				</view>
 				<view class="shareInfo">
 					<view class="shareGoodsInfo">
@@ -688,7 +689,7 @@
 				let that = this
 				let params = {
 					goods_id: that.goods.goods_id,
-					sku_id: that.goods.skuList[0].id,
+					sku_id: that.goods.skuList[0] ? that.goods.skuList[0].id : '',
 					seckill_price: e.secondPrice,
 					sec_start_time: e.startTime,
 					sec_hour: e.sec_hour,
@@ -2280,10 +2281,12 @@
 				height: 382rpx;
 				border-radius: 0rpx 0rpx 0rpx 0rpx;
 				opacity: 1;
+				overflow: hidden;
 
 				image {
 					width: 100%;
 					height: 100%;
+					object-fit: cover;
 				}
 			}
 

pages/goods/seckillDetail.vue

@@ -14,7 +14,7 @@
 			<view class="swiper">
 				<swiper class="swiper" :circular="true" autoplay @change="changeSwiper">
 					<swiper-item v-for="(item,index) in goods.goods_images1" :key="index" @click="previewImage(index)">
-						<image :src="item" class="goodsImg"></image>
+						<image :src="item" style="width: 100%;height: 100%;object-fit: cover" class="goodsImg"></image>
 					</swiper-item>
 				</swiper>
 				<view class="dots" v-if="goods.goods_images && goods.goods_images.length> 0">
@@ -338,7 +338,7 @@
 			</view>
 			<view class="shareWechat" v-if="shareType=='share'">
 				<view class="shareGoods">
-					<image :src="goods.goods_image" mode="heightFix" class="shareImg"></image>
+					<image :src="goods.goods_image" class="shareImg"></image>
 				</view>
 				<view class="shareInfo">
 					<view class="shareGoodsInfo">
@@ -2185,6 +2185,7 @@
 				image {
 					width: 100%;
 					height: 100%;
+					object-fit: cover;
 				}
 			}