Commit bce5a20063fe18de6e685be993af8564a32991cf
1 parent
04ff8978
专享礼包
Showing
5 changed files
with
22 additions
and
4 deletions
packageA/pages/distribution/goods/goods.js
| @@ -30,6 +30,7 @@ Page({ | @@ -30,6 +30,7 @@ Page({ | ||
| 30 | currentQuery: { | 30 | currentQuery: { |
| 31 | store_id: app.globalData.setting.stoid, | 31 | store_id: app.globalData.setting.stoid, |
| 32 | }, | 32 | }, |
| 33 | + is_no_plus:1, | ||
| 33 | default_img: '/miniapp/images/default_g_img.gif', | 34 | default_img: '/miniapp/images/default_g_img.gif', |
| 34 | }, | 35 | }, |
| 35 | 36 | ||
| @@ -67,6 +68,22 @@ Page({ | @@ -67,6 +68,22 @@ Page({ | ||
| 67 | options, | 68 | options, |
| 68 | tabArr, | 69 | tabArr, |
| 69 | }); | 70 | }); |
| 71 | + | ||
| 72 | + //调用接口判断商家plus有没有过期 | ||
| 73 | + getApp().request.promiseGet("/store/storemoduleendtime/page?store_id=" + os.stoid + "&type=3", {}).then(res => { | ||
| 74 | + if (res.data.code == 0) { | ||
| 75 | + var arr = res.data.data.pageData; | ||
| 76 | + if (arr.length > 0) { | ||
| 77 | + var item = arr[0]; | ||
| 78 | + if (item.is_sy == 0) { | ||
| 79 | + var now = Date.parse(new Date()); now = now / 1000; | ||
| 80 | + if (item.end_time < now) { | ||
| 81 | + self.setData({ is_no_plus: 0 }) | ||
| 82 | + } | ||
| 83 | + } | ||
| 84 | + } | ||
| 85 | + } | ||
| 86 | + }) | ||
| 70 | 87 | ||
| 71 | 88 | ||
| 72 | 89 |
packageA/pages/distribution/goods/goods.wxml
| @@ -101,7 +101,7 @@ | @@ -101,7 +101,7 @@ | ||
| 101 | </block> | 101 | </block> |
| 102 | <block wx:else> | 102 | <block wx:else> |
| 103 | <!-- 商品价格,先判断下是后⼜等级价--> | 103 | <!-- 商品价格,先判断下是后⼜等级价--> |
| 104 | - <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}"> | 104 | + <block wx:if="{{g_filter.is_has_rank(rank_switch,item) && is_no_plus}}"> |
| 105 | <!-- 当会员是等级卡的时候 --> | 105 | <!-- 当会员是等级卡的时候 --> |
| 106 | <block wx:if="{{card_field}}"> | 106 | <block wx:if="{{card_field}}"> |
| 107 | <!-- 等级价>0 --> | 107 | <!-- 等级价>0 --> |
| @@ -242,7 +242,7 @@ | @@ -242,7 +242,7 @@ | ||
| 242 | </block> | 242 | </block> |
| 243 | <block wx:else> | 243 | <block wx:else> |
| 244 | <!-- 商品价格,先判断下是后⼜等级价--> | 244 | <!-- 商品价格,先判断下是后⼜等级价--> |
| 245 | - <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}"> | 245 | + <block wx:if="{{g_filter.is_has_rank(rank_switch,item) && is_no_plus}}"> |
| 246 | <!-- 当会员是等级卡的时候 --> | 246 | <!-- 当会员是等级卡的时候 --> |
| 247 | <block wx:if="{{card_field}}"> | 247 | <block wx:if="{{card_field}}"> |
| 248 | <!-- 等级价>0 --> | 248 | <!-- 等级价>0 --> |
pages/giftpack/buygiftpack/giftpackbuy.js
| @@ -53,6 +53,7 @@ Page({ | @@ -53,6 +53,7 @@ Page({ | ||
| 53 | }) | 53 | }) |
| 54 | } | 54 | } |
| 55 | 55 | ||
| 56 | + | ||
| 56 | getApp().request.promiseGet("/api/weshop/ad/page?pid=901&store_id=" + os.stoid, { | 57 | getApp().request.promiseGet("/api/weshop/ad/page?pid=901&store_id=" + os.stoid, { |
| 57 | data: { | 58 | data: { |
| 58 | enabled: 1 | 59 | enabled: 1 |
| @@ -84,7 +85,6 @@ Page({ | @@ -84,7 +85,6 @@ Page({ | ||
| 84 | } | 85 | } |
| 85 | } | 86 | } |
| 86 | this.getList(); | 87 | this.getList(); |
| 87 | - | ||
| 88 | }, | 88 | }, |
| 89 | 89 | ||
| 90 | //购买礼包 | 90 | //购买礼包 |
pages/giftpack/giftpacklist/giftpacklist.js
pages/goods/goodsList/goodsList.wxml
| @@ -203,7 +203,7 @@ | @@ -203,7 +203,7 @@ | ||
| 203 | </block> | 203 | </block> |
| 204 | <block wx:else> | 204 | <block wx:else> |
| 205 | <!-- 商品价格,先判断下是后又等级价--> | 205 | <!-- 商品价格,先判断下是后又等级价--> |
| 206 | - <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}"> | 206 | + <block wx:if="{{g_filter.is_has_rank(rank_switch,item) && is_no_plus}}"> |
| 207 | <!-- 当会员是等级卡的时候 --> | 207 | <!-- 当会员是等级卡的时候 --> |
| 208 | <block wx:if="{{card_field}}"> | 208 | <block wx:if="{{card_field}}"> |
| 209 | <!-- 等级价>0 --> | 209 | <!-- 等级价>0 --> |