diff --git a/app.js b/app.js index 2d8e4ba..215d2b7 100644 --- a/app.js +++ b/app.js @@ -21,7 +21,7 @@ App({ unique_key: "wechatxcx" }).then(res => { let data = JSON.parse(res.data); - data.isTest = data.isTest149? true : false; + data.isTest = data.isTest150? true : false; this.globalData.configJson = data }).then(() => { // 获取ui配置文件 diff --git a/app.wxss b/app.wxss index 19c1009..d45f572 100644 --- a/app.wxss +++ b/app.wxss @@ -2,6 +2,18 @@ @import './iconfont/iconfont.wxss'; @import "./utils/wxParse/wxParse.wxss"; +/* 公祭日置灰 需手动发布 */ +/* page::before{ + content: ""; + width: 100vw; + height: 100vh; + position: fixed; + inset: 0; + backdrop-filter: grayscale(100%); + pointer-events: none; + z-index: 99999; +} */ + .container { height: 100%; display: flex; diff --git a/pages/order/show/index.js b/pages/order/show/index.js index 91cfb4e..c773207 100644 --- a/pages/order/show/index.js +++ b/pages/order/show/index.js @@ -9,6 +9,9 @@ Page({ */ data: { productId: null, + dateArrPage: [], // 页面日期 + showMore: false, + initFinsih: false, dateArr: [], times:[], skuArr: [], @@ -99,7 +102,7 @@ Page({ // 设置90天日期 let dateArr = [] let now = new Date().getTime() - for(let i=0 ;i<=90;i++) { + for(let i=0 ;i<=60;i++) { let date = now+i*24*60*60*1000 dateArr.push({date: util.formatDate(new Date(date))}) } @@ -109,8 +112,8 @@ Page({ }) this.setData({dateArr: dateArr}) // 默认选中第一天 - let param = {currentTarget: {dataset: {date: 0}}} - this.changeDate(param) + // let param = {currentTarget: {dataset: {date: 0}}} + // this.changeDate(param) // console.log(dateArr) setTimeout(() => { this.setPriceCalendar() @@ -292,11 +295,24 @@ Page({ let timData = res.map(v=>v.data) _this.data.dateArr.forEach((item,i)=>{ item.haveStock = timData.some(x=>x[i]&&x[i].stock>0) + item.itemIndex = i }) + + let dateArrPage = _this.data.dateArr.filter(v=>v.haveStock) console.log(_this.data.dateArr) _this.setData({ - dateArr: _this.data.dateArr + dateArr: _this.data.dateArr, + dateArrPage: dateArrPage.slice(0,3), + showMore: dateArrPage.length>3, + initFinsih: true, + dateindex: dateArrPage[0]?dateArrPage[0].itemIndex:0, }) + // 默认选中第一天 + if (dateArrPage[0]) { + let param = {currentTarget: {dataset: {date: dateArrPage[0].itemIndex}}} + _this.changeDate(param) + } + }).finally(()=>{ wx.hideLoading(); }) diff --git a/pages/order/show/index.wxml b/pages/order/show/index.wxml index c8dba60..dd5b7cc 100644 --- a/pages/order/show/index.wxml +++ b/pages/order/show/index.wxml @@ -5,13 +5,19 @@ {{product.title}} - + 选择日期 - - 今天 {{dateArr[0].short_date}} - 明天 {{dateArr[1].short_date}} - 后天 {{dateArr[2].short_date}} - {{dateindex>2?dateArr[dateindex].short_date:'更多'}} + + + {{dateArr[item.itemIndex].short_date}} + + + + {{(dateindex!=dateArrPage[0].itemIndex)&&(dateindex!=dateArrPage[1].itemIndex)&&(dateindex!=dateArrPage[2].itemIndex)? + dateArr[dateindex].short_date:'更多'}} + @@ -45,6 +51,10 @@ + + + 暂无场次 +