xinyin025/smart-admin
1
0
Fork 0
mirror of https://gitee.com/lab1024/smart-admin.git synced 2025-10-02 02:06:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

!204 Leung

Browse Source 
Merge pull request !204 from Admin/sit-Leung-v3
This commit is contained in:
Admin 2022-03-07 03:23:54 +00:00 committed by Gitee
commit 672738daf3
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rc-busness/pages/personal/settlement.vue
View File

@ -403,12 +403,18 @@ export default {
valDateFromTime=0; valDateFromTime=0;
valDateToTime=0; valDateToTime=0;
dateChecked=true; dateChecked=true;
if(myCoupon.fValidFrom) { if(myCoupon.fValidFrom) {
//Fix ios date issue
myCoupon.fValidFrom = myCoupon.fValidFrom.replace(/-/g, '/');
valDateFromTime = new Date(myCoupon.fValidFrom).getTime(); valDateFromTime = new Date(myCoupon.fValidFrom).getTime();
} }
if(myCoupon.fValidTo) { if(myCoupon.fValidTo) {
//Fix ios date issue
myCoupon.fValidTo = myCoupon.fValidTo.replace(/-/g, '/');
valDateToTime = new Date(myCoupon.fValidTo).getTime(); valDateToTime = new Date(myCoupon.fValidTo).getTime();
} }
if(valDateFromTime && curTime < valDateFromTime) { if(valDateFromTime && curTime < valDateFromTime) {
dateChecked=false; dateChecked=false;
} }

14
rc-busness/pages/productdetails/producted.vue
View File

@ -585,18 +585,32 @@ export default {
let valDateToTime=0; let valDateToTime=0;
let curTime = new Date().getTime(); let curTime = new Date().getTime();
let dateChecked=true; let dateChecked=true;
if(item.publishFrom && curTime < item.publishFrom) {
dateChecked=false;
}
if(item.publishTo && curTime > item.publishTo) {
dateChecked=false;
}
if(item.fValidFrom) { if(item.fValidFrom) {
//Fix ios date issue
item.fValidFrom = item.fValidFrom.replace(/-/g, '/');
valDateFromTime = new Date(item.fValidFrom).getTime(); valDateFromTime = new Date(item.fValidFrom).getTime();
} }
if(item.fValidTo) { if(item.fValidTo) {
//Fix ios date issue
item.fValidTo = item.fValidTo.replace(/-/g, '/');
valDateToTime = new Date(item.fValidTo).getTime(); valDateToTime = new Date(item.fValidTo).getTime();
} }
if(valDateFromTime && curTime < valDateFromTime) { if(valDateFromTime && curTime < valDateFromTime) {
dateChecked=false; dateChecked=false;
} }
if(valDateToTime && curTime > valDateToTime) { if(valDateToTime && curTime > valDateToTime) {
dateChecked=false; dateChecked=false;
} }
if(item.packageTypeIds!='1') { if(item.packageTypeIds!='1') {
dateChecked=false; dateChecked=false;
} }