From 29fe09df318b929ccfdf3b90c986e11d79f6722f Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Sat, 18 Jun 2022 11:09:42 +0800
Subject: [PATCH] 专享礼包 苹果机不显示

---
 pages/giftpack/buygiftpack/giftpackbuy.js   | 4 ++++
 pages/giftpack/buygiftpack/giftpackbuy.wxml | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pages/giftpack/buygiftpack/giftpackbuy.js b/pages/giftpack/buygiftpack/giftpackbuy.js
index ec4a7d0..b200948 100644
--- a/pages/giftpack/buygiftpack/giftpackbuy.js
+++ b/pages/giftpack/buygiftpack/giftpackbuy.js
@@ -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
diff --git a/pages/giftpack/buygiftpack/giftpackbuy.wxml b/pages/giftpack/buygiftpack/giftpackbuy.wxml
index e0f40b8..c440673 100644
--- a/pages/giftpack/buygiftpack/giftpackbuy.wxml
+++ b/pages/giftpack/buygiftpack/giftpackbuy.wxml
@@ -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}}">
--
libgit2 0.21.4