Commit 4dc79d9b7b6996504c6268604a5fd4b108aa26bd

Authored by yvan.ni
2 parents 16f63cc9 b3e25619

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

Showing 1 changed file with 2 additions and 2 deletions
pages/index/index/index.wxml
... ... @@ -182,7 +182,7 @@
182 182 </view>
183 183 </navigator>
184 184 <view class="seckill-lists rel">
185   - <swiper class="s_proms" indicator-active-color='red' bindchange="ptSwiperChange">
  185 + <swiper class="s_proms" style="height:{{pindGoods[0].length>1?'590':'290'}}rpx" indicator-active-color='red' bindchange="ptSwiperChange">
186 186 <swiper-item wx:for="{{pindGoods}}" wx:key="{{index}}" wx:for-index="pix">
187 187 <view class="teamheight" style='display:block;' wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind">
188 188 <view class="kill-item">
... ... @@ -196,7 +196,7 @@
196 196 <view class="kill-cont">
197 197 <navigator class="goods-name ellipsis-2" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">
198 198 {{aitem.title}}
199   -
  199 +
200 200 </navigator>
201 201 <view class="flex left">
202 202 <view class="tneirong red-b flex-vertical rel" wx:if="{{aitem.is_team_tepy!=0}}">
... ...