Commit ab1086fc39710ab51f40accbc4ea66eaab4904a2
1 parent
e1b7d9a0
礼包使用按钮要判断是否已使用,是否已过期
Showing
2 changed files
with
22 additions
and
4 deletions
pages/giftpack/giftpacklist/giftpacklist.js
@@ -3,6 +3,8 @@ var e = getApp(), | @@ -3,6 +3,8 @@ var e = getApp(), | ||
3 | os = a, | 3 | os = a, |
4 | t = e.request, | 4 | t = e.request, |
5 | d = e.globalData; | 5 | d = e.globalData; |
6 | +var ut = require("../../../utils/util.js"); | ||
7 | + | ||
6 | Page({ | 8 | Page({ |
7 | data: { | 9 | data: { |
8 | url: a.url, //接口网址 | 10 | url: a.url, //接口网址 |
@@ -23,7 +25,8 @@ Page({ | @@ -23,7 +25,8 @@ Page({ | ||
23 | wareCard: [], | 25 | wareCard: [], |
24 | orderSn: "", //订单编号 | 26 | orderSn: "", //订单编号 |
25 | lbId: "", | 27 | lbId: "", |
26 | - code: "", //核销码 | 28 | + code: "", //核销码 |
29 | + c_state:"0", //判断是否已经使用, 0正常 1已使用 2已过期 | ||
27 | }, | 30 | }, |
28 | onLoad: function(options) { | 31 | onLoad: function(options) { |
29 | var th = this; | 32 | var th = this; |
@@ -176,6 +179,16 @@ Page({ | @@ -176,6 +179,16 @@ Page({ | ||
176 | giftRemark: res.data.data.giftRemark | 179 | giftRemark: res.data.data.giftRemark |
177 | }) | 180 | }) |
178 | } | 181 | } |
182 | + | ||
183 | + //---获取日期的时间戳--- | ||
184 | + var t_endtime=res.data.data.endTime; | ||
185 | + t_endtime = t_endtime.replace(/-/g,'/'); | ||
186 | + var t_date = new Date(t_endtime)/1000; | ||
187 | + var t_now=ut.gettimestamp(); | ||
188 | + | ||
189 | + if(res.data.data.goodsUseState) th.setData({c_state:1}) | ||
190 | + else if(t_date<=t_now) | ||
191 | + th.setData({c_state:2}) | ||
179 | 192 | ||
180 | th.setData({ | 193 | th.setData({ |
181 | giftDate: res.data.data.endTime, | 194 | giftDate: res.data.data.endTime, |
pages/giftpack/giftpacklist/giftpacklist.wxml
@@ -118,12 +118,17 @@ | @@ -118,12 +118,17 @@ | ||
118 | </block> | 118 | </block> |
119 | <block wx:if="{{isBuy==0}}"> | 119 | <block wx:if="{{isBuy==0}}"> |
120 | <view class="foot_button data-v-3a5b7e36"> | 120 | <view class="foot_button data-v-3a5b7e36"> |
121 | - <view wx:if="{{false}}" class="foot_button_buy data-v-3a5b7e36" bindtap="getcode"> | 121 | + <view wx:if="{{c_state==0}}" class="foot_button_buy data-v-3a5b7e36" bindtap="getcode"> |
122 | <text class="data-v-3a5b7e36">立即使用</text> | 122 | <text class="data-v-3a5b7e36">立即使用</text> |
123 | </view> | 123 | </view> |
124 | - <view class="foot_button_buy data-v-3a5b7e36 overdue" bindtap="getcode"> | ||
125 | - <text class="data-v-3a5b7e36">商品已过期</text> | 124 | + <view wx:if="{{c_state==1}}" class="foot_button_buy data-v-3a5b7e36 overdue" > |
125 | + <text class="data-v-3a5b7e36">商品已使用</text> | ||
126 | </view> | 126 | </view> |
127 | + <view wx:if="{{c_state==2}}" class="foot_button_buy data-v-3a5b7e36 overdue" > | ||
128 | + <text class="data-v-3a5b7e36">商品已过期</text> | ||
129 | + </view> | ||
130 | + | ||
131 | + | ||
127 | </view> | 132 | </view> |
128 | </block> | 133 | </block> |
129 | </view> | 134 | </view> |