From 4edb972be686f737fbf4098d5af876da679ede02 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Sat, 1 Jun 2024 22:52:44 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
packages/order/activityorder.vue | 2 +-
packages/order/activityorderinfo.vue | 2 +-
packages/order/visitorder.vue | 8 +++---
packages/park/index.vue | 10 +++----
pages.json | 12 ++++----
pages/index/index.vue | 24 ++++++++--------
pages/mine/index.vue | 2 +-
pages/visit/book.vue | 41 ++++++++++++++--------------
pages/visit/teambook.vue | 2 +-
9 files changed, 51 insertions(+), 52 deletions(-)
diff --git a/packages/order/activityorder.vue b/packages/order/activityorder.vue
index 8ecff01..15ec0b3 100644
--- a/packages/order/activityorder.vue
+++ b/packages/order/activityorder.vue
@@ -9,7 +9,7 @@
- {{item.type==1?"团队预约":"个人预约"}}
+ {{item.type==1?"团队信息":"个人信息"}}
{{item.status_name}}
diff --git a/packages/order/activityorderinfo.vue b/packages/order/activityorderinfo.vue
index d2deeee..877f5e8 100644
--- a/packages/order/activityorderinfo.vue
+++ b/packages/order/activityorderinfo.vue
@@ -3,7 +3,7 @@
- {{info.type==1?"团队预约信息":"个人预约信息"}}
+ {{info.type==1?"团队信息":"个人信息"}}
diff --git a/packages/order/visitorder.vue b/packages/order/visitorder.vue
index ce39a60..76e6908 100644
--- a/packages/order/visitorder.vue
+++ b/packages/order/visitorder.vue
@@ -9,7 +9,7 @@
- {{item.type==1?"团队预约":"个人预约"}}
+ {{item.type==1?"团队信息":"个人信息"}}
{{item.status_name}}
@@ -19,7 +19,7 @@
- 预约时间：{{timeFormat(item.date, 'MM月DD日')}}{{item.time?item.time:''}}
+ 参观时间：{{timeFormat(item.date, 'MM月DD日')}}{{item.time?item.time:''}}
入馆人数：{{item.total}} 位观众
@@ -39,7 +39,7 @@
查看详情
@@ -93,7 +93,7 @@
tocancel(id) {
var that = this;
uni.showModal({
- title: '确认要取消预约？',
+ title: '确认要取消参观？',
success: function(res) {
if (res.confirm) {
that.util.request({
diff --git a/packages/park/index.vue b/packages/park/index.vue
index af397dd..c4293c8 100644
--- a/packages/park/index.vue
+++ b/packages/park/index.vue
@@ -95,7 +95,7 @@
+ @click="showSelectorder=false">
选择信息：{{selectInfo.info||"暂未选择"}}
@@ -175,7 +175,7 @@
id: 1
}],
currentPark: 0,
- btnDisabled: false,
+ btnDisabled: true,
showSelectorder: false,
listOrder: [],
listActivtyOrder: [],
@@ -223,11 +223,11 @@
that.loadOrder(function(res) {
that.loadactivityOrder(function(r) {
if (res.length + r.length == 0) {
- that.util.toast("您需要“参观预约”或“活动预约”成功后才能进行停车位预约。");
+ // that.util.toast("您需要“参观预约”或“活动预约”成功后才能进行停车位预约。");
that.btnDisabled = true;
} else {
- that.btnDisabled = false;
- that.showSelectorder = true;
+ that.btnDisabled = true;
+ that.showSelectorder = false;
}
})
});
diff --git a/pages.json b/pages.json
index 2fb74a6..d506e64 100644
--- a/pages.json
+++ b/pages.json
@@ -75,28 +75,28 @@
}, {
"path": "pages/visit/index",
"style": {
- "navigationBarTitleText": "参观预约",
+ "navigationBarTitleText": "参观信息",
"enablePullDownRefresh": false
}
}, {
"path": "pages/visit/book",
"style": {
- "navigationBarTitleText": "个人预约",
+ "navigationBarTitleText": "个人信息",
"enablePullDownRefresh": false
}
}, {
"path": "pages/visit/teambook",
"style": {
- "navigationBarTitleText": "团体预约",
+ "navigationBarTitleText": "团队信息",
"enablePullDownRefresh": false
}
}, {
"path": "pages/success/success",
"style": {
- "navigationBarTitleText": "预约成功",
+ "navigationBarTitleText": "填报成功",
"enablePullDownRefresh": false
}
@@ -163,7 +163,7 @@
},{
"path": "order/visitorder",
"style": {
- "navigationBarTitleText": "参观预约订单",
+ "navigationBarTitleText": "参观订单",
"enablePullDownRefresh": false
}
@@ -177,7 +177,7 @@
}, {
"path": "order/visitorderinfo",
"style": {
- "navigationBarTitleText": "参观预约详情",
+ "navigationBarTitleText": "参观信息详情",
"enablePullDownRefresh": false
}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 8135d45..e057013 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -23,7 +23,7 @@
- 参观预约
+ 团队信息
@@ -78,7 +78,7 @@
- 不可预约
+ 不可参观
@@ -160,7 +160,7 @@
@@ -172,7 +171,7 @@
批量导入说明
-
+ -->
@@ -288,8 +287,8 @@
mode="center" width="600rpx" height="150rpx">
- 您已经预约成功
- 即将跳转到参观预约 {{time}} s
+ 您已经填报成功
+ 即将跳转到参观信息 {{time}} s
返回首页
@@ -335,12 +334,12 @@
maxheight: "",
scrollheight: "",
notice: [{
- title: "预约须知",
- content: "预约须知的内容",
+ title: "参观须知",
+ content: "参观须知的内容",
isTemplate:false
}, {
title: "批量上传帮助",
- content: "1.批量上传EXCEL的以xlsx结尾
2.第一行为标题行 姓名 手机号 证件号 行动不便者
3.文件是从微信聊天记录中选取或者微信文件传输助手
",
+ content: "1.批量上传EXCEL的以xlsx结尾
2.第一行为标题行 姓名 手机号 行动不便者
3.文件是从微信聊天记录中选取或者微信文件传输助手
",
isTemplate:true
}],
specialtype: false,
@@ -467,7 +466,7 @@
this.type = options.from;
this.load3Day(this.bcurrentDate.date);
uni.setNavigationBarTitle({
- title: (options.from == 'user' ? "个人预约" : "团队预约")
+ title: (options.from == 'user' ? "个人信息" : "团队信息")
})
//this.maxCount = (type == 'user' ? 5 : 50);
@@ -891,11 +890,11 @@
that.showCalendar = false;
that.bcurrentTime = null;
} else {
- that.util.toast("您选择的日期不可预约")
+ that.util.toast("您选择的日期不可参观")
}
});
} else {
- that.util.toast("您选择的日期不可预约")
+ that.util.toast("您选择的日期不可参观")
}
}
@@ -915,9 +914,9 @@
if (date == m.date) {
if (m.is_open == 1) {
if (m.remain_count == 0) {
- day.bottomInfo = '不可预约'
+ day.bottomInfo = '不可参观'
} else {
- day.bottomInfo = '可预约'
+ day.bottomInfo = '可参观'
}
} else {
day.bottomInfo = '闭馆'
@@ -944,7 +943,7 @@
if (cdate.remain_count === 0) {
uni.showToast({
icon: "none",
- title: "该日期已不可预约"
+ title: "该日期已不可参观"
})
return;
}
@@ -966,7 +965,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/visit/teambook.vue b/pages/visit/teambook.vue
index dd60266..196d940 100644
--- a/pages/visit/teambook.vue
+++ b/pages/visit/teambook.vue
@@ -70,7 +70,7 @@
已选：5月6日 09:00-10:00
- 预约须知
+ 参观须知