1

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);

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) {
             // 错误提示

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": "预约信息"
 }

miniprogram/pages/meeting/exhibition/order/order.wxml

@@ -14,9 +14,6 @@
         <view class="detailView">
             <view class="title">{{detail.capacityNum}}人间 | {{detail.roomName}} | {{detail.buildingName}}</view>
         </view>
-        <view class="priceView">
-            <view class="price">￥免费</view>
-        </view>
     </view>
 
     <!-- 内容 -->
@@ -64,7 +61,13 @@
         <view class="itemView" bind:tap="showVisitType">
             <view class="label must">参观目的</view>
             <view class="content">
-                <van-field value="{{ formData.visitTypeName }}" placeholder="请选择参观目的" input-align="right" border="{{ false }}" readonly is-link arrow-direction="down" bind:change="titleChange" />
+                <van-field value="{{ formData.visitTypeName }}" placeholder="请选择参观目的" input-align="right" border="{{ false }}" readonly is-link arrow-direction="down" />
+            </view>
+        </view>
+        <view class="itemView" bind:tap="visitAreaShow">
+            <view class="label must">拟参观区域</view>
+            <view class="content">
+                <van-field value="{{ visitAreaSelectContent }}" placeholder="请选择拟参观区域" input-align="right" border="{{ false }}" readonly is-link arrow-direction="down" />
             </view>
         </view>
         <view class="itemView">
@@ -124,3 +127,16 @@
 
 <!-- 选择-参观目的 -->
 <van-action-sheet description="请选择参观目的" close-on-click-overlay="{{true}}" show="{{ visitTypeShow }}" actions="{{ visitTypeList }}" bind:select="selectVisitType" bind:close="hideVisitType" />
+
+
+<!-- 拟参观区域 -->
+<van-popup show="{{ visitAreaShow }}" closeable close-icon="close" position="bottom" custom-style="height: 30%" bind:close="visitAreaClose">
+    <view class="visitAreaTitleView">拟参观区域</view>
+    <view class="visitAreaView">
+        <van-checkbox-group value="{{ visitAreaSelectList }}" bind:change="visitAreaChange">
+            <view class="visitAreaContentView" wx:for="{{visitAreaList}}">
+                <van-checkbox name="{{item.name}}"  icon-size="50rpx" label-position="left">{{item.name}}</van-checkbox>
+            </view>
+        </van-checkbox-group>
+    </view>
+</van-popup>

miniprogram/pages/meeting/exhibition/order/order.wxss

@@ -260,3 +260,27 @@
 .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);
+}

miniprogram/pages/meeting/reservationRecord/exhibitionRecord/detail/detail.wxml

@@ -50,6 +50,10 @@
             <view class="label">参观目的</view>
             <view class="content">{{detail.visitTypeName}}</view>
         </view>
+        <view class="cellView">
+            <view class="label">拟参观区域</view>
+            <view class="content">{{detail.visitArea}}</view>
+        </view>
         <view class="cellView">
             <view class="label">讲解需求</view>
             <view class="content">{{detail.explainNeedType ? '是' : '否'}}</view>