Merge remote-tracking branch 'origin/master'

pages/Shopping-cart/productmain/testproductmain.vue

@@ -468,8 +468,14 @@
 						'cookie': wx.getStorageSync('cookie')
 					}
 				})
+				if(res.data.code === 5000) {
+					uni.showToast({
+						icon: 'error',
+						title: res.data.message
+					})
+				}
 				res.data.data.length > 0 ? errorArr.value = res.data.data : errorArr.value = null
-				console.log(res.data);
+				console.log('服务类校验res---->',res.data);
 				if (res.data.data.length != 0) {
 					uni.showModal({
 						title: '提示',

pages/store-home/ProductDetails/ProductDetails.vue

@@ -5,11 +5,13 @@
     class="self-stretch image"
     :src="goodObject.goodImg"
   /> -->
-	<swiper class="swiper-box">
-		<swiper-item v-for="(item,index) in imgArr" :key="index" >
-			<image mode="aspectFill" class="self-stretch image" :src="item" @tap="previewImage(index)"></image>
-		</swiper-item>
-	</swiper>
+	<view style="margin: 5px;">
+		<swiper class="swiper-box">
+			<swiper-item v-for="(item,index) in imgArr" :key="index" >
+				<image mode="aspectFill" class="self-stretch image" :src="item" @tap="previewImage(index)"></image>
+			</swiper-item>
+		</swiper>
+	</view>
   <view class="flex-col self-stretch section_2">
     <view class="self-start group">
       <text class="font text_2">￥</text>