Commit ce9456a0d853e7bc35a4e81f83db720b1f333ab9
1 parent
65202ce0
1、 幸运购单独购买的时候,要判断商品价格
2、 分类页面的优化
Showing
2 changed files
with
12 additions
and
2 deletions
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
@@ -4579,10 +4579,17 @@ Page({ | @@ -4579,10 +4579,17 @@ Page({ | ||
4579 | 4579 | ||
4580 | if (th.data.is_normal == 1) { | 4580 | if (th.data.is_normal == 1) { |
4581 | var conf = th.data.bconfig; | 4581 | var conf = th.data.bconfig; |
4582 | - if (conf.switch_list) { | 4582 | + if (conf.switch_list && getApp().globalData.userInfo['card_field'] && getApp().globalData.userInfo['card_expiredate']) { |
4583 | var s_list = JSON.parse(conf.switch_list); | 4583 | var s_list = JSON.parse(conf.switch_list); |
4584 | + | ||
4585 | + var now = ut.gettimestamp(); | ||
4586 | + | ||
4587 | + var str = getApp().globalData.userInfo['card_expiredate'].replace(/-/g, '/'); | ||
4588 | + var end = new Date(str); | ||
4589 | + end = Date.parse(end) / 1000; | ||
4590 | + | ||
4584 | //如果后台有开启等级价的功能 | 4591 | //如果后台有开启等级价的功能 |
4585 | - if (parseInt(s_list.rank_switch) == 2) { | 4592 | + if (parseInt(s_list.rank_switch) == 2 && end > now) { |
4586 | var card_price = o[getApp().globalData.userInfo['card_field']]; | 4593 | var card_price = o[getApp().globalData.userInfo['card_field']]; |
4587 | //如果会员有等级价 | 4594 | //如果会员有等级价 |
4588 | if (getApp().globalData.userInfo['card_field'] != undefined && getApp().globalData.userInfo['card_field'] != null | 4595 | if (getApp().globalData.userInfo['card_field'] != undefined && getApp().globalData.userInfo['card_field'] != null |
pages/goods/categoryList/categoryList.wxml
@@ -37,6 +37,7 @@ | @@ -37,6 +37,7 @@ | ||
37 | </view> | 37 | </view> |
38 | </view> | 38 | </view> |
39 | </block> | 39 | </block> |
40 | + <view style="height: 80rpx"></view> | ||
40 | </scroll-view> | 41 | </scroll-view> |
41 | </swiper-item> | 42 | </swiper-item> |
42 | <!-------国别----------> | 43 | <!-------国别----------> |
@@ -53,6 +54,7 @@ | @@ -53,6 +54,7 @@ | ||
53 | </view> | 54 | </view> |
54 | </view> | 55 | </view> |
55 | </view> | 56 | </view> |
57 | + <view style="height: 80rpx"></view> | ||
56 | </scroll-view> | 58 | </scroll-view> |
57 | </swiper-item> | 59 | </swiper-item> |
58 | <!-- 品牌 --> | 60 | <!-- 品牌 --> |
@@ -68,6 +70,7 @@ | @@ -68,6 +70,7 @@ | ||
68 | </view> | 70 | </view> |
69 | </view> | 71 | </view> |
70 | </block> | 72 | </block> |
73 | + <view style="height: 80rpx"></view> | ||
71 | </scroll-view> | 74 | </scroll-view> |
72 | 75 | ||
73 | <view class="nav box box-tb my-nav" catchtouchmove="touchmove" catchtouchend="touchend"> | 76 | <view class="nav box box-tb my-nav" catchtouchmove="touchmove" catchtouchend="touchend"> |