From f21ea95aa22b99984caafa8bd379932bf752d707 Mon Sep 17 00:00:00 2001 From: Leung Date: Sun, 6 Mar 2022 13:29:59 +0800 Subject: [PATCH] IOS date issue fixed --- rc-busness/pages/personal/settlement.vue | 6 ++++++ rc-busness/pages/productdetails/producted.vue | 14 ++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/rc-busness/pages/personal/settlement.vue b/rc-busness/pages/personal/settlement.vue index 6b8d8f0f..775b32e7 100644 --- a/rc-busness/pages/personal/settlement.vue +++ b/rc-busness/pages/personal/settlement.vue @@ -403,12 +403,18 @@ export default { valDateFromTime=0; valDateToTime=0; dateChecked=true; + if(myCoupon.fValidFrom) { + //Fix ios date issue + myCoupon.fValidFrom = myCoupon.fValidFrom.replace(/-/g, '/'); valDateFromTime = new Date(myCoupon.fValidFrom).getTime(); } if(myCoupon.fValidTo) { + //Fix ios date issue + myCoupon.fValidTo = myCoupon.fValidTo.replace(/-/g, '/'); valDateToTime = new Date(myCoupon.fValidTo).getTime(); } + if(valDateFromTime && curTime < valDateFromTime) { dateChecked=false; } diff --git a/rc-busness/pages/productdetails/producted.vue b/rc-busness/pages/productdetails/producted.vue index 2cd059b7..b03f41e1 100644 --- a/rc-busness/pages/productdetails/producted.vue +++ b/rc-busness/pages/productdetails/producted.vue @@ -585,18 +585,32 @@ export default { let valDateToTime=0; let curTime = new Date().getTime(); let dateChecked=true; + + if(item.publishFrom && curTime < item.publishFrom) { + dateChecked=false; + } + if(item.publishTo && curTime > item.publishTo) { + dateChecked=false; + } + if(item.fValidFrom) { + //Fix ios date issue + item.fValidFrom = item.fValidFrom.replace(/-/g, '/'); valDateFromTime = new Date(item.fValidFrom).getTime(); } if(item.fValidTo) { + //Fix ios date issue + item.fValidTo = item.fValidTo.replace(/-/g, '/'); valDateToTime = new Date(item.fValidTo).getTime(); } + if(valDateFromTime && curTime < valDateFromTime) { dateChecked=false; } if(valDateToTime && curTime > valDateToTime) { dateChecked=false; } + if(item.packageTypeIds!='1') { dateChecked=false; }