Commit 44a03623608e20f46b33246da62a8184338a1c6a
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
Showing
2 changed files
with
4 additions
and
3 deletions
components/diy_goodsGroup/diy_goodsGroup.wxml
@@ -136,7 +136,7 @@ | @@ -136,7 +136,7 @@ | ||
136 | 136 | ||
137 | </view> | 137 | </view> |
138 | <view class='zs_wz5' wx:if="{{object.goodsnum}}">销量:{{item.sales_sum}}件</view> | 138 | <view class='zs_wz5' wx:if="{{object.goodsnum}}">销量:{{item.sales_sum}}件</view> |
139 | - | 139 | + <view style="height: 10rpx;"></view> |
140 | </view> | 140 | </view> |
141 | </navigator> | 141 | </navigator> |
142 | </view> | 142 | </view> |
@@ -276,6 +276,7 @@ | @@ -276,6 +276,7 @@ | ||
276 | </block> | 276 | </block> |
277 | </view> | 277 | </view> |
278 | <view class='zs_wz5_2l' wx:if="{{object.goodsnum}}">销量:{{item.sales_sum}}件</view> | 278 | <view class='zs_wz5_2l' wx:if="{{object.goodsnum}}">销量:{{item.sales_sum}}件</view> |
279 | + <view style="height: 10rpx;"></view> | ||
279 | </view> | 280 | </view> |
280 | </view> | 281 | </view> |
281 | </view> | 282 | </view> |
@@ -418,6 +419,7 @@ | @@ -418,6 +419,7 @@ | ||
418 | </block> | 419 | </block> |
419 | </view> | 420 | </view> |
420 | <view class='zs_wz5_3l' wx:if="{{object.goodsnum}}">销量:{{item.sales_sum}}件</view> | 421 | <view class='zs_wz5_3l' wx:if="{{object.goodsnum}}">销量:{{item.sales_sum}}件</view> |
422 | + <view style="height: 10rpx;"></view> | ||
421 | </view> | 423 | </view> |
422 | </view> | 424 | </view> |
423 | </view> | 425 | </view> |
components/diy_goodsGroup/diy_goodsGroup.wxss
@@ -37,7 +37,7 @@ | @@ -37,7 +37,7 @@ | ||
37 | 37 | ||
38 | .zs_center { | 38 | .zs_center { |
39 | width: 100%; | 39 | width: 100%; |
40 | - min-height: 200rpx; | 40 | + /* min-height: 200rpx; */ |
41 | font-size: 28rpx; | 41 | font-size: 28rpx; |
42 | color: #333; | 42 | color: #333; |
43 | text-align: left; | 43 | text-align: left; |
@@ -295,7 +295,6 @@ | @@ -295,7 +295,6 @@ | ||
295 | 295 | ||
296 | .zs_center_2l { | 296 | .zs_center_2l { |
297 | width: 100%; | 297 | width: 100%; |
298 | - min-height: 200rpx; | ||
299 | font-size: 28rpx; | 298 | font-size: 28rpx; |
300 | color: #333; | 299 | color: #333; |
301 | text-align: left; | 300 | text-align: left; |