Commit fdcdfbddb3beeb08ddf85d2d19a4f485d47c2696
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
Showing
2 changed files
with
5 additions
and
2 deletions
pages/index/index/index.wxml
| @@ -44,7 +44,9 @@ | @@ -44,7 +44,9 @@ | ||
| 44 | </view> | 44 | </view> |
| 45 | </view> | 45 | </view> |
| 46 | </view> | 46 | </view> |
| 47 | - | 47 | + <!-- 如果有关注，要 --> |
| 48 | + <view wx:if="{{is_gz_h5 && is_ok_h5}}" style="height: 84px"></view> | ||
| 49 | + | ||
| 48 | <!--滚动广告--> | 50 | <!--滚动广告--> |
| 49 | <view class="rel title-img" wx:if="{{banner}}"> | 51 | <view class="rel title-img" wx:if="{{banner}}"> |
| 50 | <swiper circular="true" indicator-dots indicator-active-color="#fff" autoplay="true" class="swiper_box" duration="1000" interval="3000" vertical="" bindchange="bannerSwiperChange" style="height:{{max_sw_height}}rpx"> | 52 | <swiper circular="true" indicator-dots indicator-active-color="#fff" autoplay="true" class="swiper_box" duration="1000" interval="3000" vertical="" bindchange="bannerSwiperChange" style="height:{{max_sw_height}}rpx"> |
pages/index/index/index.wxss
| @@ -663,6 +663,7 @@ | @@ -663,6 +663,7 @@ | ||
| 663 | border-radius: 8rpx; | 663 | border-radius: 8rpx; |
| 664 | white-space: nowrap; | 664 | white-space: nowrap; |
| 665 | height: 28rpx; | 665 | height: 28rpx; |
| 666 | + align-items: center; | ||
| 666 | } | 667 | } |
| 667 | 668 | ||
| 668 | .xc-people-val-frame .val-img { | 669 | .xc-people-val-frame .val-img { |
| @@ -1014,7 +1015,7 @@ page { | @@ -1014,7 +1015,7 @@ page { | ||
| 1014 | } | 1015 | } |
| 1015 | 1016 | ||
| 1016 | .container.nor{ | 1017 | .container.nor{ |
| 1017 | - padding-top: 140rpx; | 1018 | + padding-top: 80rpx; |
| 1018 | } | 1019 | } |
| 1019 | 1020 | ||
| 1020 | /* page, | 1021 | /* page, |