diff --git a/pages/component/calendarTheatre/index.js b/pages/component/calendarTheatre/index.js
index 3a4bcdf..1981d0b 100644
--- a/pages/component/calendarTheatre/index.js
+++ b/pages/component/calendarTheatre/index.js
@@ -149,9 +149,10 @@ Component({
},
onTapDay:function(e){
let date = e.currentTarget.dataset.date;
- console.log(date)
+ let item = e.currentTarget.dataset.item;
+ console.log(date, item)
- if (date) {
+ if (date && item.haveStock) {
console.log('trigger')
this.triggerEvent("onTapDay",date)
}
diff --git a/pages/component/calendarTheatre/index.wxml b/pages/component/calendarTheatre/index.wxml
index 02fa0a2..81ede25 100644
--- a/pages/component/calendarTheatre/index.wxml
+++ b/pages/component/calendarTheatre/index.wxml
@@ -11,8 +11,9 @@
{{item}}
-
-
+
+
{{item.dateNum}}
diff --git a/pages/order/show/index.js b/pages/order/show/index.js
index c773207..51c71e2 100644
--- a/pages/order/show/index.js
+++ b/pages/order/show/index.js
@@ -107,8 +107,11 @@ Page({
dateArr.push({date: util.formatDate(new Date(date))})
}
- dateArr.forEach(v=>{
+ dateArr.forEach((v,index)=>{
v.short_date = v.date.split("-").splice(1, 2).join("-")
+ if (index == 0) v.short_date = "今天 "+v.short_date
+ if (index == 1) v.short_date = "明天 "+v.short_date
+ if (index == 2) v.short_date = "后天 "+v.short_date
})
this.setData({dateArr: dateArr})
// 默认选中第一天
diff --git a/pages/order/show/index.wxss b/pages/order/show/index.wxss
index 3e80075..a79a32a 100644
--- a/pages/order/show/index.wxss
+++ b/pages/order/show/index.wxss
@@ -46,6 +46,7 @@ page {
.sku-box .tag{
width: fit-content;
}
+
.tag{
padding: 15rpx 19rpx;
border: 1px solid #999999;
@@ -64,6 +65,11 @@ page {
border: none;
color: #FFFFFF;
}
+.date-box-page-sadsdsd .tag{
+ padding: 15rpx 0rpx;
+ text-align: center;
+ width: 220rpx;
+}
.tag.disabled{
background: #CCCCCC;