From 53069b2371486d04acc9a6e8649d5e7239a5e48f Mon Sep 17 00:00:00 2001
From: taiyuan <yvan.ni@yolipai.com>
Date: Fri, 28 Aug 2020 16:11:20 +0800
Subject: [PATCH] diy_goodsGroup 商品间距修改

---
 components/diy_goodsGroup/diy_goodsGroup.wxml | 38 ++++++++++++++++++++++++++++++--------
 components/diy_goodsGroup/diy_goodsGroup.wxss |  5 ++++-
 2 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/components/diy_goodsGroup/diy_goodsGroup.wxml b/components/diy_goodsGroup/diy_goodsGroup.wxml
index ce71705..4eb51b0 100644
--- a/components/diy_goodsGroup/diy_goodsGroup.wxml
+++ b/components/diy_goodsGroup/diy_goodsGroup.wxml
@@ -49,7 +49,10 @@
                                                  <view class="flex xc-wc ai_and">
                                                      <view class="fs24 wz_red">￥</view>
                                                      <view class="fs35 wz_red">{{filter.toFix(item[card_field],2)}}</view>
-                                                     <view class="card_bg"><image src="{{url}}/miniapp/images/plus/dj_icon.png"></image><view class="card_name">{{card_name}}</view></view>
+                                                     <view class="card_bg ellipsis-1">
+																											 <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
+																											 <text class="card_name">{{card_name}}</text>
+																										 </view>
                                                  </view>
                                              </view>
                                              <view class="flex" style="line-height: 28rpx;" >
@@ -98,7 +101,10 @@
                                                  <view class="price flex ai_and">
                                                      <view class="fs22">￥</view>
                                                      <view class="fs28">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view>
-                                                     <view class="card_bg"> <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>{{g_filter.get_card_price(item,card_list,1)}}</view>
+                                                     <view class="card_bg ellipsis-1">
+																											 <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
+																											 <text class="card_name">{{g_filter.get_card_price(item,card_list,1)}}</text>
+																										</view>
                                                  </view>
                                              </view>
                                          </block>
@@ -186,7 +192,10 @@
                                                 <view class="flex xc-wc ai_and">
                                                     <view class="fs24 wz_red">￥</view>
                                                     <view class="fs35 wz_red">{{filter.toFix(item[card_field],2)}}</view>
-                                                    <view class="card_bg"><image src="{{url}}/miniapp/images/plus/dj_icon.png"></image><view class="card_name">{{card_name}}</view></view>
+                                                    <view class="card_bg ellipsis-1">
+																											<image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
+																											<view class="card_name">{{card_name}}</view>
+																										</view>
                                                 </view>
                                             </view>
                                             <view class="flex" style="line-height: 28rpx;" >
@@ -235,7 +244,10 @@
                                                 <view class="price flex ai_and">
                                                     <view class="fs22">￥</view>
                                                     <view class="fs28">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view>
-                                                    <view class="card_bg"> <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>{{g_filter.get_card_price(item,card_list,1)}}</view>
+                                                    <view class="card_bg ellipsis-1">
+																											<image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
+																											<text class="card_name">{{g_filter.get_card_price(item,card_list,1)}}</text>
+																										</view>
                                                 </view>
                                             </view>
                                         </block>
@@ -322,7 +334,10 @@
                                                     <view class="flex xc-wc ai_and">
                                                         <view class="fs24 wz_red">￥</view>
                                                         <view class="fs35 wz_red">{{filter.toFix(item[card_field],2)}}</view>
-                                                        <view class="card_bg"><image src="{{url}}/miniapp/images/plus/dj_icon.png"></image><view class="card_name">{{card_name}}</view></view>
+                                                        <view class="card_bg ellipsis-1">
+																													<image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
+																													<text class="card_name">{{card_name}}</text>
+																												</view>
                                                     </view>
                                                 </view>
                                                 <view class="flex" style="line-height: 28rpx;" >
@@ -371,7 +386,10 @@
                                                     <view class="price flex ai_and">
                                                         <view class="fs22">￥</view>
                                                         <view class="fs28">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view>
-                                                        <view class="card_bg"> <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>{{g_filter.get_card_price(item,card_list,1)}}</view>
+                                                        <view class="card_bg ellipsis-1">
+																													<image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
+																													<text class="card_name">{{g_filter.get_card_price(item,card_list,1)}}</text>
+																												</view>
                                                     </view>
                                                 </view>
                                             </block>
@@ -453,7 +471,10 @@
                                         <view class="flex xc-wc ai_and">
                                             <view class="fs24 wz_red">￥</view>
                                             <view class="fs35 wz_red">{{filter.toFix(item[card_field],2)}}</view>
-                                            <view class="card_bg"><image src="{{url}}/miniapp/images/plus/dj_icon.png"></image><view class="card_name">{{card_name}}</view></view>
+                                            <view class="card_bg ellipsis-1">
+																							<image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
+																							<text class="card_name">{{card_name}}</text>
+																						</view>
                                         </view>
                                     </view>
                                     <view class="flex" style="line-height: 28rpx;" >
@@ -502,7 +523,8 @@
                                         <view class="price flex ai_and">
                                             <view class="fs22">￥</view>
                                             <view class="fs28">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view>
-                                            <view class="card_bg"> <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>{{g_filter.get_card_price(item,card_list,1)}}</view>
+                                            <view class="card_bg">
+																							<image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>{{g_filter.get_card_price(item,card_list,1)}}</view>
                                         </view>
                                     </view>
                                 </block>
diff --git a/components/diy_goodsGroup/diy_goodsGroup.wxss b/components/diy_goodsGroup/diy_goodsGroup.wxss
index aeb3a85..18ec7fb 100644
--- a/components/diy_goodsGroup/diy_goodsGroup.wxss
+++ b/components/diy_goodsGroup/diy_goodsGroup.wxss
@@ -258,7 +258,7 @@
 .zs_goods_wai_ban {
   display: flex;
   /* padding-left: 2rpx; */
-  margin-bottom: 12rpx;
+  /* margin-bottom: 12rpx; */
   width: 48%;
   float: left;
   background: #fff;
@@ -284,6 +284,7 @@
 .button-wrapper button {
   /*width: 94%;*/
   border: none;
+	margin-top: 10rpx;
 }
 
 .zs_t_img_2l {
@@ -572,3 +573,5 @@
 }
 
 
+
+
--
libgit2 0.21.4