diff --git a/pages/component/newCalendar/index.wxml b/pages/component/newCalendar/index.wxml index 8dd1fc8..ee667a4 100644 --- a/pages/component/newCalendar/index.wxml +++ b/pages/component/newCalendar/index.wxml @@ -57,7 +57,8 @@ - + + \ No newline at end of file diff --git a/pages/component/newCalendar/index.wxss b/pages/component/newCalendar/index.wxss index b7b528f..9c8d8ea 100644 --- a/pages/component/newCalendar/index.wxss +++ b/pages/component/newCalendar/index.wxss @@ -8,11 +8,13 @@ /* width: 697rpx; */ /* margin: 0 auto; padding: 37rpx 22rpx 40rpx; */ - background-color: #FFD6B2; + /* 节假日花样 */ + /* background-color: #FFD6B2; */ margin: 0 auto; padding: 37rpx 22rpx 40rpx; - background-image: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/calendar-top.png"); - background-size: 100% 100%; + /* 节假日花样 */ + /* background-image: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/calendar-top.png"); + background-size: 100% 100%; */ width: 90%; height: 65.67rpx } diff --git a/pages/index/index.wxml b/pages/index/index.wxml index d52cd90..8e9ed96 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -458,12 +458,12 @@ 安全服务 - - 高峰预警 + 景区舒适度 diff --git a/pages/list/activitynew/index.wxml b/pages/list/activitynew/index.wxml index acc1842..748360a 100644 --- a/pages/list/activitynew/index.wxml +++ b/pages/list/activitynew/index.wxml @@ -3,7 +3,8 @@ - + + diff --git a/pages/list/activitynew/index.wxss b/pages/list/activitynew/index.wxss index 337ffad..80dc266 100644 --- a/pages/list/activitynew/index.wxss +++ b/pages/list/activitynew/index.wxss @@ -1,8 +1,9 @@ /* pages/activity/index.wxss */ page { - /* background: #F2F2F2; */ - background: #FFD6B2; + background: #F2F2F2; + /* 节假日花样 */ + /* background: #FFD6B2; */ } .types { /* justify-content: space-between; */ @@ -204,7 +205,7 @@ background: rgba(11, 137, 142, .1); } .end-mask { position: absolute; - right: 22rpx; + right: 30rpx; /* top: 27rpx; */ text-align: center; width: 320rpx; @@ -319,7 +320,9 @@ background: rgba(11, 137, 142, .1); flex-shrink: 0; line-height: 40rpx; border-left: 1rpx solid #ccc; - color: #DE4126; + color: #0B898E; + /* 节假日花样 */ + /* color: #DE4126; */ } .new-top-search-box { display: flex; @@ -355,18 +358,20 @@ flex-shrink: 0; } .types-item-active { padding: 0 25rpx; - /* height: 57rpx; */ - height: 68rpx; - line-height: 58rpx; + height: 57rpx; + /* 节假日花样 */ + /* height: 68rpx; */ + line-height: 57rpx; display: inline-block; - /* background: #0B898E; */ + background: #0B898E; color: #FFFFFF; border-radius: 27rpx; margin-right: 13rpx; flex-shrink: 0; - background-image: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/calendar-bg.png"); + /* 节假日花样 */ + /* background-image: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/calendar-bg.png"); background-size: 100% 100%; - margin-top: -5rpx; + margin-top: -5rpx; */ text-align: center; } /* 不显示滚动条 */ diff --git a/pages/order/components/date/index.js b/pages/order/components/date/index.js index a13c832..8e25a91 100644 --- a/pages/order/components/date/index.js +++ b/pages/order/components/date/index.js @@ -36,7 +36,10 @@ Component({ isSzMuseum: false, kjIdCom: null, gpIdCom: null, - date_price:0 + date_price:0, + today:util.formatDate(new Date()), + tomorrow:util.formatMing(new Date()), + afterTom:util.formatHou(new Date()), }, lifetimes: { attached: function () { diff --git a/pages/order/components/date/index.wxml b/pages/order/components/date/index.wxml index 13a90d3..90bbd65 100644 --- a/pages/order/components/date/index.wxml +++ b/pages/order/components/date/index.wxml @@ -4,7 +4,7 @@ 使用日期 - {{tool.showAllSeldDate(item.date,index)}} + {{tool.showAllSeldDate(item.date,index,today,tomorrow,afterTom)}} 不可定 {{item.price==0 || kjIdCom?'免费':('￥'+item.price/100)}} diff --git a/utils/filter.wxs b/utils/filter.wxs index 8fe5028..6a3c348 100644 --- a/utils/filter.wxs +++ b/utils/filter.wxs @@ -26,18 +26,28 @@ var gotoUrl = function(item){ return str; } // 价格日历显示返回 -var showAllSeldDate = function (date, index) { +var showAllSeldDate = function (date, index,today,tomorrow,afterTom) { // return date.substring(5, 10) - switch (index) { - case 0: - return '今天' + date.substring(5, 10) - case 1: - return '明天' + date.substring(5, 10) - case 2: - return '后天' + date.substring(5, 10) - default: - return date.substring(5, 10) + console.log('tool的',date,today,tomorrow,afterTom); + if (date == today) { + return '今天' + date.substring(5, 10) + }else if (date == tomorrow) { + return '明天' + date.substring(5, 10) + }else if (date == afterTom) { + return '后天' + date.substring(5, 10) + }else { + return date.substring(5, 10) } + // switch (index) { + // case 0: + // return '今天' + date.substring(5, 10) + // case 1: + // return '明天' + date.substring(5, 10) + // case 2: + // return '后天' + date.substring(5, 10) + // default: + // return date.substring(5, 10) + // } } var toFix = function(value) { return (value / 100).toFixed(2); diff --git a/utils/util.js b/utils/util.js index cf8390c..8ccbf50 100644 --- a/utils/util.js +++ b/utils/util.js @@ -16,6 +16,19 @@ const formatDate = date => { const day = date.getDate() return [year, month, day].map(formatNumber).join('-'); } +const formatMing = date => { + var tomorrow = new Date(date.getTime() + 24 * 60 * 60 * 1000) // 获取明天的日期 + var tomorrowDate = tomorrow.getDate(); // 获取明天的日期数字 + var tomorrowMonth = tomorrow.getMonth() + 1; // 获取明天的月份（注意：月份是从0开始计算的，所以要加1） + var tomorrowYear = tomorrow.getFullYear(); + return [tomorrowYear, tomorrowMonth, tomorrowDate].map(formatNumber).join('-'); +} +const formatHou= date => { + date.setDate(date.getDate() + 2); + // 格式化日期为YYYY-MM-DD + var houtian = date.getFullYear() + '-' + ('0' + (date.getMonth() + 1)).slice(-2) + '-' + ('0' + date.getDate()).slice(-2); + return houtian +} const formatNumber = n => { n = n.toString() @@ -444,5 +457,7 @@ module.exports = { gotoOrder:gotoOrder, orderMoreTime:orderMoreTime, goKjOrder:goKjOrder, - pagePoint: pagePoint + pagePoint: pagePoint, + formatMing:formatMing, + formatHou:formatHou }