Commit 29fe09df318b929ccfdf3b90c986e11d79f6722f
1 parent
565f9cdc
专享礼包 苹果机不显示
Showing
2 changed files
with
6 additions
and
2 deletions
pages/giftpack/buygiftpack/giftpackbuy.js
@@ -263,6 +263,10 @@ Page({ | @@ -263,6 +263,10 @@ Page({ | ||
263 | th.data.curpage++; | 263 | th.data.curpage++; |
264 | var arr1 = th.data.wareCard; | 264 | var arr1 = th.data.wareCard; |
265 | var arr2 = res.data.data.pageData; | 265 | var arr2 = res.data.data.pageData; |
266 | + for (let j = 0; j < arr2.length; j++) { | ||
267 | + arr2[j].starTime1=Date.parse(new Date(arr2[j].starTime.replace(/-/g, "/")))/1000 | ||
268 | + } | ||
269 | + | ||
266 | var arr3 = [...arr1, ...arr2]; | 270 | var arr3 = [...arr1, ...arr2]; |
267 | var ismore = 0; | 271 | var ismore = 0; |
268 | if (arr3.length == res.data.data.total) ismore = 1 | 272 | if (arr3.length == res.data.data.total) ismore = 1 |
pages/giftpack/buygiftpack/giftpackbuy.wxml
@@ -50,7 +50,7 @@ | @@ -50,7 +50,7 @@ | ||
50 | <view class="content_ware_price"> | 50 | <view class="content_ware_price"> |
51 | <text class="ellipsis-1">{{"零售价:¥"+items.giftPosPrice}}</text> | 51 | <text class="ellipsis-1">{{"零售价:¥"+items.giftPosPrice}}</text> |
52 | </view> | 52 | </view> |
53 | - <view wx:if="{{items.is_show && now < filter.gettimestamp(items.starTime)}}" class="content_ware_time"> | 53 | + <view wx:if="{{items.is_show && now < items.starTime1 }}" class="content_ware_time"> |
54 | <text class="ellipsis-1">{{"活动开始时间:"+items.starTime}}</text> | 54 | <text class="ellipsis-1">{{"活动开始时间:"+items.starTime}}</text> |
55 | </view> | 55 | </view> |
56 | <view wx:else class="content_ware_time"> | 56 | <view wx:else class="content_ware_time"> |
@@ -62,7 +62,7 @@ | @@ -62,7 +62,7 @@ | ||
62 | <view class="box_button_remark"> | 62 | <view class="box_button_remark"> |
63 | <text>{{"已售:"+items.giftQty+"件"}}</text> | 63 | <text>{{"已售:"+items.giftQty+"件"}}</text> |
64 | </view> | 64 | </view> |
65 | - <block wx:if="{{now > filter.gettimestamp(items.starTime)}}"> | 65 | + <block wx:if="{{now > items.starTime1}}"> |
66 | <view class="flex-vertical"> | 66 | <view class="flex-vertical"> |
67 | <block wx:if="{{items.payMoney>0 && items.payIntegral>0}}"> | 67 | <block wx:if="{{items.payMoney>0 && items.payIntegral>0}}"> |
68 | <block wx:if="{{items.payMoney>0}}"> | 68 | <block wx:if="{{items.payMoney>0}}"> |