From 9e6c438a0269f6da909ce91ec2a8e93cc1f1c593 Mon Sep 17 00:00:00 2001
From: SelfRidicule <selfridicule@gmail.com>
Date: Tue, 12 Mar 2024 12:00:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=8F=E8=BF=B0:=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/meeting/exhibition/booked/booked.js |  2 +-
 .../meeting/exhibition/booked/booked.wxml     |  2 +-
 .../pages/meeting/exhibition/order/order.js   |  4 +-
 .../pages/meeting/exhibition/order/order.json | 17 +++---
 .../pages/meeting/exhibition/order/order.wxml | 42 ++++++++++++-
 .../pages/meeting/exhibition/order/order.wxss | 61 ++++++-------------
 6 files changed, 70 insertions(+), 58 deletions(-)

diff --git a/miniprogram/pages/meeting/exhibition/booked/booked.js b/miniprogram/pages/meeting/exhibition/booked/booked.js
index 8ef8e7d..2dd5501 100644
--- a/miniprogram/pages/meeting/exhibition/booked/booked.js
+++ b/miniprogram/pages/meeting/exhibition/booked/booked.js
@@ -172,7 +172,7 @@ Page({
             let dataList = res.data;
             dataList.map(item => {
                 item.nowDate = item.nowDate.substring(0, 10);
-                item.reservations = item.reservations.map(record => {
+                item.showroomRecords = item.showroomRecords.map(record => {
                     record.startTime = record.startTime.substring(11)
                     record.endDate = record.endDate.substring(11)
                     return record;
diff --git a/miniprogram/pages/meeting/exhibition/booked/booked.wxml b/miniprogram/pages/meeting/exhibition/booked/booked.wxml
index 8006253..9f786f6 100644
--- a/miniprogram/pages/meeting/exhibition/booked/booked.wxml
+++ b/miniprogram/pages/meeting/exhibition/booked/booked.wxml
@@ -6,7 +6,7 @@
         <!-- 预约列表 -->
         <view class="itemVIew" wx:for="{{dataList}}" wx:for-item="item" wx:key="*this">
             <view class="item">{{item.nowDate}}</view>
-            <view class="itemTimeView" wx:for="{{item.reservations}}" wx:for-item="record" wx:key="*this">
+            <view class="itemTimeView" wx:for="{{item.showroomRecords}}" wx:for-item="record" wx:key="*this">
                 <view class="time">{{record.startTime}}~{{record.endDate}}</view>
                 <view class="status">已预约</view>
             </view>
diff --git a/miniprogram/pages/meeting/exhibition/order/order.js b/miniprogram/pages/meeting/exhibition/order/order.js
index 4041085..318ab25 100644
--- a/miniprogram/pages/meeting/exhibition/order/order.js
+++ b/miniprogram/pages/meeting/exhibition/order/order.js
@@ -38,7 +38,7 @@ Page({
         endTime: null,
         selectDay: null,
         selectCountTime: null,
-       
+        formData: {}
     },
 
     /**
@@ -149,7 +149,7 @@ Page({
      */
     onShow() {
         console.log('onShow');
-        
+
     },
 
     /**
diff --git a/miniprogram/pages/meeting/exhibition/order/order.json b/miniprogram/pages/meeting/exhibition/order/order.json
index a78be73..5cdcc8f 100644
--- a/miniprogram/pages/meeting/exhibition/order/order.json
+++ b/miniprogram/pages/meeting/exhibition/order/order.json
@@ -1,10 +1,11 @@
 {
-  "usingComponents": {
-    "van-icon": "@vant/weapp/icon/index",
-    "van-field": "@vant/weapp/field/index",
-    "van-dialog": "@vant/weapp/dialog/index",
-    "van-notify": "@vant/weapp/notify/index",
-    "van-checkbox": "@vant/weapp/checkbox/index"
-  },
-  "navigationBarTitleText": "预约信息"
+    "usingComponents": {
+        "van-icon": "@vant/weapp/icon/index",
+        "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"
+    },
+    "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 9379a2a..49ff450 100644
--- a/miniprogram/pages/meeting/exhibition/order/order.wxml
+++ b/miniprogram/pages/meeting/exhibition/order/order.wxml
@@ -1,4 +1,4 @@
-<view class="containerView">
+<view class="containerView public">
     <!-- 轮播图 -->
     <view class="swiperView">
         <view class="tag">展厅</view>
@@ -38,9 +38,45 @@
     <!-- 填写信息 -->
     <view class="fillMsgView">
         <view class="itemView">
-            <view class="label">会议主题</view>
+            <view class="label must">展厅主题</view>
             <view class="content">
-                <van-field value="{{ title }}" placeholder="请输入会议主题" input-align="right" border="{{ false }}"  bind:change="titleChange"/>
+                <van-field value="{{ title }}" placeholder="请输入展厅主题" input-align="right" border="{{ false }}" bind:change="titleChange" />
+            </view>
+        </view>
+        <view class="itemView">
+            <view class="label must">来参观人员</view>
+            <view class="content">
+                <van-field value="{{ title }}" placeholder="请输入展厅主题" input-align="right" border="{{ false }}" bind:change="titleChange" />
+            </view>
+        </view>
+        <view class="itemView">
+            <view class="label must">参观目的</view>
+            <view class="content">
+                <van-field value="{{ title }}" placeholder="请选择参观目的" input-align="right" border="{{ false }}" readonly is-link arrow-direction="down" bind:change="titleChange" />
+            </view>
+        </view>
+        <view class="itemView">
+            <view class="label must">讲解需求</view>
+            <view class="content">
+                <van-switch checked="{{ checked }}" bind:change="onChange" size="50rpx"/>
+            </view>
+        </view>
+        <view class="itemView">
+            <view class="label must">是否需要会议室</view>
+            <view class="content">
+                <van-switch checked="{{ checked }}" bind:change="onChange" size="50rpx"/>
+            </view>
+        </view>
+        <view class="itemView">
+            <view class="label must">摄影需求</view>
+            <view class="content">
+                <van-switch checked="{{ checked }}" bind:change="onChange" size="50rpx"/>
+            </view>
+        </view>
+        <view class="itemView">
+            <view class="label">备注</view>
+            <view class="content">
+                <van-field value="{{ title }}" placeholder="请输入备注" input-align="right" border="{{ false }}" bind:change="titleChange" />
             </view>
         </view>
     </view>
diff --git a/miniprogram/pages/meeting/exhibition/order/order.wxss b/miniprogram/pages/meeting/exhibition/order/order.wxss
index f8b7844..d081a40 100644
--- a/miniprogram/pages/meeting/exhibition/order/order.wxss
+++ b/miniprogram/pages/meeting/exhibition/order/order.wxss
@@ -1,9 +1,5 @@
-.containerView {
-    height: 100vh;
-    width: 100vw;
-    overflow: auto;
-    padding-bottom: 100rpx;
-    background: #ffffff;
+.containerView.public {
+    height: auto;
 }
 
 .swiperView {
@@ -149,9 +145,21 @@
 }
 
 .fillMsgView .itemView .label {
+    position: relative;
     font-size: 28rpx;
 }
 
+.fillMsgView .itemView .label.must::after {
+    display: block;
+    content: '*';
+    position: absolute;
+    left: 100%;
+    margin-left: 10rpx;
+    top: 6rpx;
+    color: red;
+}
+
+
 .fillMsgView .itemView .content {
     flex: 1;
     display: flex;
@@ -184,40 +192,7 @@
     color: #76aef9;
 }
 
-.amountView {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 0 38rpx;
-}
-
-.amountView .priceView {
-    display: flex;
-    justify-content: flex-start;
-    align-items: center;
-}
-
-.amountView .priceView .title {
-    font-size: 32rpx;
-}
-
-.amountView .priceView .price {
-    color: red;
-    font-size: 34rpx;
-}
-
-.amountView .priceView .describe {
-    color: red;
-    font-size: 28rpx;
-    margin-left: 6rpx;
-}
-
-.amountView .caseBtn {
-    border-radius: 10rpx;
-    padding: 16rpx 60rpx;
-    color: white;
-    font-size: 30rpx;
-    background: #4e96f8;
-}
-
-
+.submitBtn {
+    position: static;
+    margin-left: 50%;
+}
\ No newline at end of file