Merge branch 'dev' into 'test'

专享礼包苹果机不显示 See merge request !1063

Merge branch 'dev' into 'test'
专享礼包苹果机不显示 See merge request !1063
后端研发-苏明海
2 parents 2bb26dcf 29fe09df
Showing 2 changed files with 6 additions and 2 deletions
pages/giftpack/buygiftpack/giftpackbuy.js
pages/giftpack/buygiftpack/giftpackbuy.wxml
@@ -263,6 +263,10 @@ Page({
           th.data.curpage++;
           var arr1 = th.data.wareCard;
           var arr2 = res.data.data.pageData;
+          for (let j = 0; j < arr2.length; j++) {
+              arr2[j].starTime1=Date.parse(new Date(arr2[j].starTime.replace(/-/g, "/")))/1000
+          }
+
           var arr3 = [...arr1, ...arr2];
           var ismore = 0;
           if (arr3.length == res.data.data.total) ismore = 1
@@ -50,7 +50,7 @@
 					<view class="content_ware_price">
 						<text class="ellipsis-1">{{"零售价:￥"+items.giftPosPrice}}</text>
 					</view>
-					<view wx:if="{{items.is_show && now < filter.gettimestamp(items.starTime)}}" class="content_ware_time">
+					<view wx:if="{{items.is_show && now < items.starTime1 }}" class="content_ware_time">
 						<text class="ellipsis-1">{{"活动开始时间："+items.starTime}}</text>
 					</view>
 					<view wx:else class="content_ware_time">
@@ -62,7 +62,7 @@
 				<view class="box_button_remark">
 					<text>{{"已售:"+items.giftQty+"件"}}</text>
 				</view>
-				<block wx:if="{{now > filter.gettimestamp(items.starTime)}}">
+				<block wx:if="{{now > items.starTime1}}">
 					<view class="flex-vertical">
 						<block wx:if="{{items.payMoney>0 && items.payIntegral>0}}">
 							<block wx:if="{{items.payMoney>0}}">