diff --git a/pages/index/index.vue b/pages/index/index.vue
index 6ab6456..7ca3f10 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -53,7 +53,7 @@
{{item.remain_count==0?"售罄":"可预约"}}
+ v-if="item.is_open==1">{{item.remain_count==0?"不可预约":"可预约"}}
闭馆
@@ -91,7 +91,7 @@
{{item.remain_count}}张
- 售罄
+ 不可预约
不可预约
@@ -253,7 +253,7 @@
if (date == m.date) {
if (m.is_open == 1)
if (m.remain_count == 0) {
- day.bottomInfo = '售罄'
+ day.bottomInfo = '不可预约'
} else {
day.bottomInfo = '可预约'
}
@@ -279,7 +279,7 @@
if (cdate.remain_count === 0) {
uni.showToast({
icon: "none",
- title: "该日期已经售罄"
+ title: "该日期已不可预约"
})
return;
}
@@ -301,7 +301,7 @@
return false
}
if (mod.remain_count == 0) {
- this.util.toast("该时段已售罄");
+ this.util.toast("该时段已不可预约");
return false
}
for (var m of this.currentDate.rules) {
diff --git a/pages/order/activityorder.vue b/pages/order/activityorder.vue
index f4165fc..23bcc13 100644
--- a/pages/order/activityorder.vue
+++ b/pages/order/activityorder.vue
@@ -67,6 +67,9 @@
}, {
name: '已取消',
idx: "0"
+ }, {
+ name: '已过期',
+ idx: "3"
}],
current: 0,
isloading: true,
diff --git a/pages/order/parkorder.vue b/pages/order/parkorder.vue
index 2d2d226..e44f53b 100644
--- a/pages/order/parkorder.vue
+++ b/pages/order/parkorder.vue
@@ -56,6 +56,9 @@
}, {
name: '已完成',
idx: "2"
+ } {
+ name: '已过期',
+ idx: "3"
}],
current: 0,
isloading: true,
@@ -63,7 +66,8 @@
statusArr: {
0: "已取消",
1: "待完成",
- 2: "已完成"
+ 2: "已完成",
+ 3: "已过期"
}
}
},
diff --git a/pages/order/visitorder.vue b/pages/order/visitorder.vue
index 4433db1..2e33745 100644
--- a/pages/order/visitorder.vue
+++ b/pages/order/visitorder.vue
@@ -62,6 +62,9 @@
}, {
name: '已参观',
idx: "2"
+ },{
+ name: '已过期',
+ idx: "3"
}],
current: 0,
isloading: true,
diff --git a/pages/visit/book.vue b/pages/visit/book.vue
index 1b0e41e..402a679 100644
--- a/pages/visit/book.vue
+++ b/pages/visit/book.vue
@@ -21,7 +21,7 @@
{{item.remain_count==0?"售罄":"可预约"}}
+ v-if="item.is_open==1">{{item.remain_count==0?"不可预约":"可预约"}}
闭馆
@@ -57,7 +57,7 @@
{{item.remain_count}}张
- 售罄
+ 不可预约
@@ -846,7 +846,7 @@
if (date == m.date) {
if (m.is_open == 1) {
if (m.remain_count == 0) {
- day.bottomInfo = '售罄'
+ day.bottomInfo = '不可预约'
} else {
day.bottomInfo = '可预约'
}
@@ -875,7 +875,7 @@
if (cdate.remain_count === 0) {
uni.showToast({
icon: "none",
- title: "该日期已经售罄"
+ title: "该日期已不可预约"
})
return;
}
@@ -894,7 +894,7 @@
handleSelectTime(index) {
var mod = this.currentDate.rules[index];
if (mod.remain_count == 0) {
- this.util.toast("该时段已售罄");
+ this.util.toast("该时段已不可预约");
return false
}
for (var m of this.currentDate.rules) {
diff --git a/static/img/index_bg.jpg b/static/img/index_bg.jpg
index af16fb9..056a7a1 100644
Binary files a/static/img/index_bg.jpg and b/static/img/index_bg.jpg differ