diff --git a/pages/activity/book.vue b/pages/activity/book.vue
index c5a6d9b..d149659 100644
--- a/pages/activity/book.vue
+++ b/pages/activity/book.vue
@@ -240,7 +240,7 @@
content: "预约须知的内容"
}, {
title: "批量上传帮助",
- content: "1.批量上传EXCEL的以xlsx结尾
2.第一列为标题列 姓名 手机号 证件号
3.文件是从微信聊天记录中选取或者微信文件传输助手
"
+ content: "1.批量上传EXCEL的以xlsx结尾
2.第一列为标题列 姓名 手机号 证件号
3.文件是从微信聊天记录中选取或者微信文件传输助手
"
}]
}
},
@@ -292,6 +292,7 @@
},
openNoticeInfo(type) {
this.showInfo = true;
+ this.notice[type].content = this.notice[type].content.replace("@host@", this.util.HOST);
this.currentNotice = this.notice[type];
},
handleAddUser() {
@@ -457,7 +458,7 @@
icon: "none",
title: "下单成功",
complete() {
- uni.reLaunch({
+ uni.redirectTo({
url: "/pages/success/success?from=activity&id=" + res.id
})
}
diff --git a/pages/order/activityorder.vue b/pages/order/activityorder.vue
index b49291a..2f5b819 100644
--- a/pages/order/activityorder.vue
+++ b/pages/order/activityorder.vue
@@ -65,7 +65,7 @@
name: '已参加',
idx: "2"
}, {
- name: '取消预约',
+ name: '已预约',
idx: "0"
}],
current: 0,
diff --git a/pages/order/activityorderinfo.vue b/pages/order/activityorderinfo.vue
index a92438b..3ba2b33 100644
--- a/pages/order/activityorderinfo.vue
+++ b/pages/order/activityorderinfo.vue
@@ -7,10 +7,14 @@
-
+
订单信息：{{$u.timeFormat(new Date(info.activity.start_time), 'mm月dd日')}}{{getHm(info.activity.start_time)}}-{{getHm(info.activity.end_time)}}丨{{info.total}}位人员
+ class="orderBoxInfoRowTxt">活动时间：{{timeFormat(info.activity.start_time, 'MM月DD日')}}{{getHm(info.activity.start_time)}}-{{getHm(info.activity.end_time)}}
+
+
+
+ 活动人数：{{info.total}}位人员
@@ -120,6 +124,9 @@
if (val) {
return this.$moment(val).format("hh:MM")
} else return "";
+ },
+ timeFormat(time, format) {
+ return this.$moment(time).format(format)
}
}
}
diff --git a/pages/order/visitorderinfo.vue b/pages/order/visitorderinfo.vue
index 5f42d59..a17c87c 100644
--- a/pages/order/visitorderinfo.vue
+++ b/pages/order/visitorderinfo.vue
@@ -10,8 +10,13 @@
订单信息：{{$u.timeFormat(new Date(info.date), 'mm月dd日')}}{{info.time||""}}丨{{info.total||0}}位观众
+ class="orderBoxInfoRowTxt">参观时间：{{timeFormat(info.date, 'MM月DD日')}}{{info.time||""}}
+
+
+ 参观人数：{{info.total||0}}位观众
+
+
领队：{{info.leader||""}}丨 {{info.mobile||""}}
@@ -122,6 +127,9 @@
})
},
+ timeFormat(time, format) {
+ return this.$moment(time).format(format);
+ },
loadInfo(id) {
var that = this;
this.util.request({
diff --git a/pages/park/book.vue b/pages/park/book.vue
index be8942b..d02f1e5 100644
--- a/pages/park/book.vue
+++ b/pages/park/book.vue
@@ -316,7 +316,7 @@
icon: "none",
title: "下单成功",
complete() {
- uni.reLaunch({
+ uni.redirectTo({
url: "/pages/success/success?from=park&id=" + res.id
})
}
diff --git a/pages/success/success.vue b/pages/success/success.vue
index f578ab0..fc6581f 100644
--- a/pages/success/success.vue
+++ b/pages/success/success.vue
@@ -52,7 +52,7 @@
that.time = that.time - 1;
}, 1000)
setTimeout(function() {
- uni.reLaunch({
+ uni.redirectTo({
url: url
})
clearInterval(t);
diff --git a/pages/visit/book.vue b/pages/visit/book.vue
index 9f94fcc..1cabb87 100644
--- a/pages/visit/book.vue
+++ b/pages/visit/book.vue
@@ -233,7 +233,7 @@
content: "预约须知的内容"
}, {
title: "批量上传帮助",
- content: "1.批量上传EXCEL的以xlsx结尾
2.第一列为标题列 姓名 手机号 证件号
3.文件是从微信聊天记录中选取或者微信文件传输助手
"
+ content: "1.批量上传EXCEL的以xlsx结尾
2.第一列为标题列 姓名 手机号 证件号
3.文件是从微信聊天记录中选取或者微信文件传输助手
"
}],
form: {
date: "",
@@ -378,6 +378,7 @@
},
openNoticeInfo(type) {
this.showInfo = true;
+ this.notice[type].content = this.notice[type].content.replace("@host@", this.util.HOST);
this.currentNotice = this.notice[type];
},
submitOrder() {
@@ -459,7 +460,7 @@
icon: "none",
title: "下单成功",
complete() {
- uni.reLaunch({
+ uni.redirectTo({
url: "/pages/success/success?from=visit&id=" + res.id
})
}
diff --git a/static/img/export.png b/static/img/export.png
deleted file mode 100644
index 9561431..0000000
Binary files a/static/img/export.png and /dev/null differ