Commit 4a347c822293f6e60c9d1f17ae327ae4ecd3fad1
1 parent
c10cc780
导航控件, 商品详情领取券要判断会员是否存在
Showing
2 changed files
with
16 additions
and
5 deletions
components/diy_nav/diy_nav.wxml
@@ -5,7 +5,7 @@ | @@ -5,7 +5,7 @@ | ||
5 | <view style='width:{{100/nav_list.length}}%' | 5 | <view style='width:{{100/nav_list.length}}%' |
6 | class="{{object.seticon==1?'big_view_one':object.seticon==2?'big_view_two':'bicder_picture'}}"> | 6 | class="{{object.seticon==1?'big_view_one':object.seticon==2?'big_view_two':'bicder_picture'}}"> |
7 | <block wx:if="{{item.navicon==null}}"> | 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 | class="{{object.seticon==1?'print_one':object.seticon==2?'print_two':'image_none'}}" | 9 | class="{{object.seticon==1?'print_one':object.seticon==2?'print_two':'image_none'}}" |
10 | src="{{imghost}}/miniapp/images/nav-icon.png"></image> | 10 | src="{{imghost}}/miniapp/images/nav-icon.png"></image> |
11 | <view class="{{object.seticon==1?'font_one':object.seticon==2?'font_bicder_two':'font_three'}}"> | 11 | <view class="{{object.seticon==1?'font_one':object.seticon==2?'font_bicder_two':'font_three'}}"> |
@@ -13,7 +13,7 @@ | @@ -13,7 +13,7 @@ | ||
13 | </view> | 13 | </view> |
14 | </block> | 14 | </block> |
15 | <block wx:if="{{item.navicon!=null}}"> | 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 | class="{{object.seticon==1?'print_one':object.seticon==2?'print_two':'image_none'}}" | 17 | class="{{object.seticon==1?'print_one':object.seticon==2?'print_two':'image_none'}}" |
18 | src="{{item.navicon}}"></image> | 18 | src="{{item.navicon}}"></image> |
19 | <view class="{{object.seticon==1?'font_one':object.seticon==2?'font_bicder_two':'font_three'}}"> | 19 | <view class="{{object.seticon==1?'font_one':object.seticon==2?'font_bicder_two':'font_three'}}"> |
@@ -34,13 +34,13 @@ | @@ -34,13 +34,13 @@ | ||
34 | <view class="one_div"> | 34 | <view class="one_div"> |
35 | <view class="picture_one"> | 35 | <view class="picture_one"> |
36 | <block wx:if="{{item.navicon!=null}}"> | 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 | src="{{item.navicon}}"> | 38 | src="{{item.navicon}}"> |
39 | </image> | 39 | </image> |
40 | </block> | 40 | </block> |
41 | 41 | ||
42 | <block wx:if="{{item.navicon==null}}"> | 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 | src="{{imghost}}/miniapp/images/nav-icon.png"> | 44 | src="{{imghost}}/miniapp/images/nav-icon.png"> |
45 | </image> | 45 | </image> |
46 | </block> | 46 | </block> |
pages/goods/goodsInfo/goodsInfo.js
@@ -2496,7 +2496,18 @@ Page({ | @@ -2496,7 +2496,18 @@ Page({ | ||
2496 | var cid = e.currentTarget.dataset.cid; | 2496 | var cid = e.currentTarget.dataset.cid; |
2497 | var index = e.currentTarget.dataset.ind; | 2497 | var index = e.currentTarget.dataset.ind; |
2498 | var item = this.data.quan_list[index]; | 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 | if (item.linging == 1) { | 2512 | if (item.linging == 1) { |
2502 | getApp().my_warnning('领取中..', 0, this); | 2513 | getApp().my_warnning('领取中..', 0, this); |