From b8cbf558279e0225de8d8198ca4e610165bdc391 Mon Sep 17 00:00:00 2001
From: taiwan <taiwan.su@meidd.com>
Date: Tue, 22 Mar 2022 17:05:32 +0800
Subject: [PATCH] 商品分组添加购物车图标

---
 components/diy_goodsGroup/diy_goodsGroup.wxml | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------
 components/diy_goodsGroup/diy_goodsGroup.wxss |  41 +++++++++++++++++++++++++++++++++++++----
 2 files changed, 135 insertions(+), 10 deletions(-)

diff --git a/components/diy_goodsGroup/diy_goodsGroup.wxml b/components/diy_goodsGroup/diy_goodsGroup.wxml
index 4b4ad3c..654704a 100644
--- a/components/diy_goodsGroup/diy_goodsGroup.wxml
+++ b/components/diy_goodsGroup/diy_goodsGroup.wxml
@@ -155,7 +155,25 @@
                             </block>
 
                         </view>
-                        <view class='zs_wz5' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view>
+                        <!-- <view class='zs_wz5' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view> -->
+												<view class="flex jc-sb ai-center">
+													<view class='zs_wz5_x' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view>
+													
+													<!-- 购物车图标 -->
+													<view class="icon-box" wx:if="{{object.goodcaricon != 1}}">
+														<!-- 系统图标 -->
+														<block wx:if="{{object.goodcaricon == 2}}">
+															<image class="icon" src="{{url + '/miniapp/images/cart/group_goods_car_1.png'}}" wx:if="{{object.stylecaricon == 1}}" mode="widthFix"></image>
+															<image class="icon" src="{{url + '/miniapp/images/cart/group_goods_car_2.png'}}" wx:if="{{object.stylecaricon == 2}}" mode="widthFix"></image>
+															<text class="icon-text" wx:if="{{object.stylecaricon == 3}}">马上抢</text>
+															<text class="icon-text" wx:if="{{object.stylecaricon == 4}}">立即购买</text>
+														</block>
+														<!-- 自定义图标 -->
+														<block wx:if="{{object.goodcaricon == 3}}">
+															<image class="icon icon2" src="{{object.customcaricon}}" mode="widthFix"></image>
+														</block>
+													</view>
+												</view>
                         <view style="height: 10rpx;"></view>
                     </view>
                 </navigator>
@@ -303,8 +321,27 @@
                                         </block>
                                     </block>
                                 </view>
-                                <view class='zs_wz5_2l' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view>
-                                <view style="height: 10rpx;"></view>
+                                <!-- <view class='zs_wz5_2l' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view> -->
+                                <view class="flex jc-sb ai-center">
+                                	<view class='zs_wz5_x' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view>
+                                	
+                                	<!-- 购物车图标 -->
+                                	<view class="icon-box" wx:if="{{object.goodcaricon != 1}}">
+                                		<!-- 系统图标 -->
+                                		<block wx:if="{{object.goodcaricon == 2}}">
+                                			<image class="icon" src="{{url + '/miniapp/images/cart/group_goods_car_1.png'}}" wx:if="{{object.stylecaricon == 1}}" mode="widthFix"></image>
+                                			<image class="icon" src="{{url + '/miniapp/images/cart/group_goods_car_2.png'}}" wx:if="{{object.stylecaricon == 2}}" mode="widthFix"></image>
+                                			<text class="icon-text" wx:if="{{object.stylecaricon == 3}}">马上抢</text>
+                                			<text class="icon-text" wx:if="{{object.stylecaricon == 4}}">立即购买</text>
+                                		</block>
+                                		<!-- 自定义图标 -->
+                                		<block wx:if="{{object.goodcaricon == 3}}">
+                                			<image class="icon icon2" src="{{object.customcaricon}}" mode="widthFix"></image>
+                                		</block>
+                                	</view>
+                                </view>
+																
+																<view style="height: 10rpx;"></view>
                             </view>
                         </view>
                     </view>
@@ -453,7 +490,25 @@
                                             </block>
                                         </block>
                                     </view>
-                                    <view class='zs_wz5_3l' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view>
+                                    <!-- <view class='zs_wz5_3l' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view> -->
+																		<view class="flex jc-sb ai-center">
+																			<view class='zs_wz5_x' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view>
+																			
+																			<!-- 购物车图标 -->
+																			<view class="icon-box" wx:if="{{object.goodcaricon != 1}}">
+																				<!-- 系统图标 -->
+																				<block wx:if="{{object.goodcaricon == 2}}">
+																					<image class="icon" src="{{url + '/miniapp/images/cart/group_goods_car_1.png'}}" wx:if="{{object.stylecaricon == 1}}" mode="widthFix"></image>
+																					<image class="icon" src="{{url + '/miniapp/images/cart/group_goods_car_2.png'}}" wx:if="{{object.stylecaricon == 2}}" mode="widthFix"></image>
+																					<text class="icon-text" wx:if="{{object.stylecaricon == 3}}">马上抢</text>
+																					<text class="icon-text" wx:if="{{object.stylecaricon == 4}}">立即购买</text>
+																				</block>
+																				<!-- 自定义图标 -->
+																				<block wx:if="{{object.goodcaricon == 3}}">
+																					<image class="icon icon2" src="{{object.customcaricon}}" mode="widthFix"></image>
+																				</block>
+																			</view>
+																		</view>
                                     <view style="height: 10rpx;"></view>
                                 </view>
                             </view>
@@ -610,7 +665,26 @@
 
                             </block>
                         </view>
-                        <view class='zs_wz5_x' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view>
+												
+												<view class="flex jc-sb ai-center">
+													<view class='zs_wz5_x' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view>
+													
+													<!-- 购物车图标 -->
+													<view class="icon-box" wx:if="{{object.goodcaricon != 1}}">
+														<!-- 系统图标 -->
+														<block wx:if="{{object.goodcaricon == 2}}">
+															<image class="icon" src="{{url + '/miniapp/images/cart/group_goods_car_1.png'}}" wx:if="{{object.stylecaricon == 1}}" mode="widthFix"></image>
+															<image class="icon" src="{{url + '/miniapp/images/cart/group_goods_car_2.png'}}" wx:if="{{object.stylecaricon == 2}}" mode="widthFix"></image>
+															<text class="icon-text" wx:if="{{object.stylecaricon == 3}}">马上抢</text>
+															<text class="icon-text" wx:if="{{object.stylecaricon == 4}}">立即购买</text>
+														</block>
+														<!-- 自定义图标 -->
+														<block wx:if="{{object.goodcaricon == 3}}">
+															<image class="icon icon2" src="{{object.customcaricon}}" mode="widthFix"></image>
+														</block>
+													</view>
+												</view>
+                        
                     </view>
 
                 </view>
@@ -784,7 +858,25 @@
                                         </block>
                                     </block>
                                 </view>
-                                <view class='zs_wz5_3l' wx:if="{{object.goodsnum}}">销量：{{aitem.sales_sum}}件</view>
+                                <!-- <view class='zs_wz5_3l' wx:if="{{object.goodsnum}}">销量：{{aitem.sales_sum}}件</view> -->
+																<view class="flex jc-sb ai-center">
+																	<view class='zs_wz5_x' wx:if="{{object.goodsnum}}">销量：{{aitem.sales_sum}}件</view>
+																	
+																	<!-- 购物车图标 -->
+																	<view class="icon-box" wx:if="{{object.goodcaricon != 1}}">
+																		<!-- 系统图标 -->
+																		<block wx:if="{{object.goodcaricon == 2}}">
+																			<image class="icon" src="{{url + '/miniapp/images/cart/group_goods_car_1.png'}}" wx:if="{{object.stylecaricon == 1}}" mode="widthFix"></image>
+																			<image class="icon" src="{{url + '/miniapp/images/cart/group_goods_car_2.png'}}" wx:if="{{object.stylecaricon == 2}}" mode="widthFix"></image>
+																			<text class="icon-text" wx:if="{{object.stylecaricon == 3}}">马上抢</text>
+																			<text class="icon-text" wx:if="{{object.stylecaricon == 4}}">立即购买</text>
+																		</block>
+																		<!-- 自定义图标 -->
+																		<block wx:if="{{object.goodcaricon == 3}}">
+																			<image class="icon icon2" src="{{object.customcaricon}}" mode="widthFix"></image>
+																		</block>
+																	</view>
+																</view>
                                 <view style="height: 10rpx;"></view>
                             </view>
 
diff --git a/components/diy_goodsGroup/diy_goodsGroup.wxss b/components/diy_goodsGroup/diy_goodsGroup.wxss
index fd5d8d9..095e1fe 100644
--- a/components/diy_goodsGroup/diy_goodsGroup.wxss
+++ b/components/diy_goodsGroup/diy_goodsGroup.wxss
@@ -31,9 +31,10 @@
 .zs_top {
   width: 100%;
   min-height: 700rpx;
-  margin: 0 auto;
-  margin-bottom: 30rpx;
+  /* margin: 0 auto;
+  margin-bottom: 30rpx; */
   display: flex;
+	
 }
 
 .zs_t_img {
@@ -43,13 +44,15 @@
 }
 
 .zs_center {
+	box-sizing: border-box;
   width: 100%;
   /* min-height: 200rpx; */
   font-size: 28rpx;
   color: #333;
   text-align: left;
-  margin-left: 25rpx;
-  padding: 0 10rpx;
+	padding: 20rpx;
+  /* margin-left: 25rpx; */
+  /* padding: 0 10rpx; */
 }
 
 .zs_wz1 {
@@ -171,6 +174,8 @@
 .zs_center_x {
   /* width: 100%;
   min-height: 200rpx; */
+	box-sizing: border-box;
+	flex-grow: 1;
   font-size: 28rpx;
   color: #333;
 	padding-left: 20rpx;
@@ -555,6 +560,10 @@
 	justify-content: space-around;
 }
 
+.jc-sb {
+	justify-content: space-between;
+}
+
 .fs24 {
   font-size: 24rpx;
 }
@@ -870,5 +879,29 @@ top: 10rpx;
     -webkit-line-clamp: 2;
 }
 
+.icon-box {
+	/* width: 50rpx; */
+}
+
+.icon-box .icon {
+	display: block;
+	width: 50rpx;
+	height: 50rpx;
+}
+
+.icon-box .icon.icon2 {
+	width: 80rpx;
+}
+
+.icon-box .icon-text {
+	font-size: 26rpx;
+	color: red;
+	padding: 10rpx 20rpx;
+	border: 2rpx solid red;
+	border-radius: 40rpx;
+}
+
+
+
 
 
--
libgit2 0.21.4