Commit e4c5e3ac0700dbffa5bba0604c3c2794d7fca9e2
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
Showing
5 changed files
with
23 additions
and
10 deletions
components/diy_nav/diy_nav.wxml
| ... | ... | @@ -5,7 +5,7 @@ |
| 5 | 5 | <view style='width:{{100/nav_list.length}}%' |
| 6 | 6 | class="{{object.seticon==1?'big_view_one':object.seticon==2?'big_view_two':'bicder_picture'}}"> |
| 7 | 7 | <block wx:if="{{item.navicon==null}}"> |
| 8 | - <image style='width:{{object.sliderExample+100}}rpx;height:{{object.sliderExample+100}}rpx;' | |
| 8 | + <image style='width:{{object.sliderExample*2}}rpx;height:{{object.sliderExample*2}}rpx;' | |
| 9 | 9 | class="{{object.seticon==1?'print_one':object.seticon==2?'print_two':'image_none'}}" |
| 10 | 10 | src="{{imghost}}/miniapp/images/nav-icon.png"></image> |
| 11 | 11 | <view class="{{object.seticon==1?'font_one':object.seticon==2?'font_bicder_two':'font_three'}}"> |
| ... | ... | @@ -13,7 +13,7 @@ |
| 13 | 13 | </view> |
| 14 | 14 | </block> |
| 15 | 15 | <block wx:if="{{item.navicon!=null}}"> |
| 16 | - <image style='width:{{object.sliderExample+100}}rpx;height:{{object.sliderExample+100}}rpx;' | |
| 16 | + <image style='width:{{object.sliderExample*2}}rpx;height:{{object.sliderExample*2}}rpx;' | |
| 17 | 17 | class="{{object.seticon==1?'print_one':object.seticon==2?'print_two':'image_none'}}" |
| 18 | 18 | src="{{item.navicon}}"></image> |
| 19 | 19 | <view class="{{object.seticon==1?'font_one':object.seticon==2?'font_bicder_two':'font_three'}}"> |
| ... | ... | @@ -34,13 +34,13 @@ |
| 34 | 34 | <view class="one_div"> |
| 35 | 35 | <view class="picture_one"> |
| 36 | 36 | <block wx:if="{{item.navicon!=null}}"> |
| 37 | - <image style='width:{{object.sliderExample+100}}rpx;height:{{object.sliderExample+100}}rpx;' | |
| 37 | + <image style='width:{{object.sliderExample*2}}rpx;height:{{object.sliderExample*2}}rpx;' | |
| 38 | 38 | src="{{item.navicon}}"> |
| 39 | 39 | </image> |
| 40 | 40 | </block> |
| 41 | 41 | |
| 42 | 42 | <block wx:if="{{item.navicon==null}}"> |
| 43 | - <image style='width:{{object.sliderExample+100}}rpx;height:{{object.sliderExample+100}}rpx;' | |
| 43 | + <image style='width:{{object.sliderExample*2}}rpx;height:{{object.sliderExample*2}}rpx;' | |
| 44 | 44 | src="{{imghost}}/miniapp/images/nav-icon.png"> |
| 45 | 45 | </image> |
| 46 | 46 | </block> | ... | ... |
components/nav_box_card/nav_box.wxss
| ... | ... | @@ -26,14 +26,16 @@ height: 50rpx; |
| 26 | 26 | color: #ffff; |
| 27 | 27 | font-size: 50rpx; |
| 28 | 28 | background: none; |
| 29 | +line-height: 78rpx; | |
| 30 | + | |
| 29 | 31 | |
| 30 | 32 | } |
| 31 | 33 | |
| 32 | 34 | .box_main .dian image{ |
| 33 | 35 | width: 60rpx; |
| 34 | 36 | height: 20rpx; |
| 35 | -margin: 0rpx 0 0 10rpx; | |
| 36 | -margin-bottom: 7rpx; | |
| 37 | + | |
| 38 | + | |
| 37 | 39 | |
| 38 | 40 | } |
| 39 | 41 | ... | ... |
pages/goods/goodsInfo/goodsInfo.js
| ... | ... | @@ -2496,7 +2496,18 @@ Page({ |
| 2496 | 2496 | var cid = e.currentTarget.dataset.cid; |
| 2497 | 2497 | var index = e.currentTarget.dataset.ind; |
| 2498 | 2498 | var item = this.data.quan_list[index]; |
| 2499 | - | |
| 2499 | + | |
| 2500 | + | |
| 2501 | + //--先判断会员状态-- | |
| 2502 | + var user_info = getApp().globalData.userInfo; | |
| 2503 | + if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { | |
| 2504 | + wx.navigateTo({ | |
| 2505 | + url: '/pages/getphone/getphone', | |
| 2506 | + }) | |
| 2507 | + return false; | |
| 2508 | + } | |
| 2509 | + | |
| 2510 | + | |
| 2500 | 2511 | //如果券还在领取中，不能再点 |
| 2501 | 2512 | if (item.linging == 1) { |
| 2502 | 2513 | getApp().my_warnning('领取中..', 0, this); | ... | ... |
pages/user/address_list/address_list.wxml