Commit f9586563978aa67a219d38f91963b6b34c0d2052

Authored by yvan.ni
2 parents dfd37d8c b4feaa9c

Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

components/diy_advertising/diy_advertising.wxml
@@ -129,7 +129,7 @@ @@ -129,7 +129,7 @@
129 </view> 129 </view>
130 <view class="clear"></view> 130 <view class="clear"></view>
131 <!--2行三列--> 131 <!--2行三列-->
132 -<view class="{{object.aline ? 's4':''}}" wx:if='{{object.style==3}}' style="padding:0 {{object.two_side}}rpx;display: flex;{{object.aline ? 'flex-wrap: wrap;justify-content: space-between;' :''}} background-color:{{object.bg_color?object.bg_color:'none'}}"> 132 +<view class="{{object.aline ? 's4':''}}" wx:if='{{object.style==3}}' style="padding:0 {{object.two_side}}rpx;display: flex;{{object.aline ? 'flex-wrap: wrap;' :''}} background-color:{{object.bg_color?object.bg_color:'none'}}">
133 133
134 <block wx:for="{{object.data}}" wx:key="{{index}}"> 134 <block wx:for="{{object.data}}" wx:key="{{index}}">
135 135