diff --git a/miniprogram/pages/meeting/exhibition/booked/booked.js b/miniprogram/pages/meeting/exhibition/booked/booked.js
index c3e3f6c..999c849 100644
--- a/miniprogram/pages/meeting/exhibition/booked/booked.js
+++ b/miniprogram/pages/meeting/exhibition/booked/booked.js
@@ -103,7 +103,8 @@ Page({
// 确认时间
confirmTime() {
let _this = this;
- let id = _this.data.id;
+ let id = 1;
+ // let id = _this.data.id;
let startTime = _this.data.startTime;
let endTime = _this.data.endTime;
let paramUrl = "?id=" + id + "&startTime=" + selfFormatTimeYMDHMS(startTime) + "&endTime=" + selfFormatTimeYMDHMS(endTime);
diff --git a/miniprogram/pages/meeting/exhibition/order/order.js b/miniprogram/pages/meeting/exhibition/order/order.js
index 1b66c21..cd1b24b 100644
--- a/miniprogram/pages/meeting/exhibition/order/order.js
+++ b/miniprogram/pages/meeting/exhibition/order/order.js
@@ -43,6 +43,11 @@ Page({
dialogPhone: null,
// 来参观人员
personList: [],
+ // 拟参观区域
+ visitAreaShow: false,
+ visitAreaList: [],
+ visitAreaSelectList: [],
+ visitAreaSelectContent: null,
// 提交数据
formData: {
showroomId: null, // 展厅id
@@ -60,6 +65,7 @@ Page({
photographType: 0, // 摄影需求
photographTypeBoolean: false, // 摄影需求-boolean
remake: null, // 备注
+ visitArea: null, // 拟参观区域
}
},
@@ -116,6 +122,21 @@ Page({
visitTypeList
})
})
+ // 拟参观区域字典
+ listByTypeRq({
+ "dictType": "visit_area"
+ }).then(res => {
+ console.log('getDictData', res);
+ let visitAreaList = res.data.map(item => {
+ return {
+ name: item.dictLabel,
+ value: item.dictValue,
+ }
+ })
+ _this.setData({
+ visitAreaList
+ })
+ })
},
// input监听
@@ -251,6 +272,36 @@ Page({
});
},
+ // 拟参观区域
+ visitAreaChange(event) {
+ let _this = this;
+ let visitAreaSelectList = event.detail;
+ let visitAreaSelectContent = null;
+ if (visitAreaSelectList && visitAreaSelectList.length > 0) {
+ visitAreaSelectContent = visitAreaSelectList.join(',')
+ } else {
+ visitAreaSelectContent = null;
+ }
+ _this.setData({
+ visitAreaSelectList,
+ visitAreaSelectContent
+ });
+ },
+
+ // 拟参观区域-关闭
+ visitAreaClose() {
+ this.setData({
+ visitAreaShow: false,
+ });
+ },
+
+ // 拟参观区域-显示
+ visitAreaShow() {
+ this.setData({
+ visitAreaShow: true,
+ });
+ },
+
// 协议点击
protocolChange() {
let _this = this;
@@ -293,6 +344,14 @@ Page({
_this.showErrMsg('请选择参观目的!');
return;
}
+ // 拟参观区域
+ if (_this.data.visitAreaSelectList && _this.data.visitAreaSelectList.length > 0) {
+ formData.visitArea = _this.data.visitAreaSelectList.join(',')
+ } else {
+ // 错误提示
+ _this.showErrMsg('请选择拟参观区域!');
+ return;
+ }
// 同意协议
if (!_this.data.protocolFlag) {
// 错误提示
diff --git a/miniprogram/pages/meeting/exhibition/order/order.json b/miniprogram/pages/meeting/exhibition/order/order.json
index 52f1640..0b894cb 100644
--- a/miniprogram/pages/meeting/exhibition/order/order.json
+++ b/miniprogram/pages/meeting/exhibition/order/order.json
@@ -4,9 +4,11 @@
"van-field": "@vant/weapp/field/index",
"van-dialog": "@vant/weapp/dialog/index",
"van-notify": "@vant/weapp/notify/index",
- "van-checkbox": "@vant/weapp/checkbox/index",
"van-switch": "@vant/weapp/switch/index",
- "van-action-sheet": "@vant/weapp/action-sheet/index"
+ "van-action-sheet": "@vant/weapp/action-sheet/index",
+ "van-popup": "@vant/weapp/popup/index",
+ "van-checkbox": "@vant/weapp/checkbox/index",
+ "van-checkbox-group": "@vant/weapp/checkbox-group/index"
},
"navigationBarTitleText": "预约信息"
}
\ No newline at end of file
diff --git a/miniprogram/pages/meeting/exhibition/order/order.wxml b/miniprogram/pages/meeting/exhibition/order/order.wxml
index 3ba08b5..7d627c4 100644
--- a/miniprogram/pages/meeting/exhibition/order/order.wxml
+++ b/miniprogram/pages/meeting/exhibition/order/order.wxml
@@ -14,9 +14,6 @@
{{detail.capacityNum}}人间 | {{detail.roomName}} | {{detail.buildingName}}
-
- ¥免费
-
@@ -64,7 +61,13 @@
参观目的
-
+
+
+
+
+ 拟参观区域
+
+
@@ -123,4 +126,17 @@
-
\ No newline at end of file
+
+
+
+
+
+ 拟参观区域
+
+
+
+ {{item.name}}
+
+
+
+
\ No newline at end of file
diff --git a/miniprogram/pages/meeting/exhibition/order/order.wxss b/miniprogram/pages/meeting/exhibition/order/order.wxss
index 0f35e27..c06a839 100644
--- a/miniprogram/pages/meeting/exhibition/order/order.wxss
+++ b/miniprogram/pages/meeting/exhibition/order/order.wxss
@@ -259,4 +259,28 @@
.dialogBtnView .successBtn {
color: #4e96f8;
+}
+
+.visitAreaTitleView{
+ text-align: center;
+ padding: 20rpx;
+ font-size: 28rpx;
+ color: gray;
+}
+
+.visitAreaView{
+ padding: 50rpx 0;
+ font-size: 30rpx;
+}
+
+.visitAreaView .visitAreaContentView{
+ display: flex;
+ justify-content: flex-end;
+ align-items: center;
+ padding: 10rpx 60rpx;
+ border-top: 1px solid rgb(126, 126, 126, 0.2);
+}
+
+.visitAreaView .visitAreaContentView:last-of-type{
+ border-bottom: 1px solid rgb(126, 126, 126, 0.2);
}
\ No newline at end of file
diff --git a/miniprogram/pages/meeting/reservationRecord/exhibitionRecord/detail/detail.wxml b/miniprogram/pages/meeting/reservationRecord/exhibitionRecord/detail/detail.wxml
index c989027..cc4e6c6 100644
--- a/miniprogram/pages/meeting/reservationRecord/exhibitionRecord/detail/detail.wxml
+++ b/miniprogram/pages/meeting/reservationRecord/exhibitionRecord/detail/detail.wxml
@@ -50,6 +50,10 @@
参观目的
{{detail.visitTypeName}}
+
+ 拟参观区域
+ {{detail.visitArea}}
+
讲解需求
{{detail.explainNeedType ? '是' : '否'}}