修改会议室列表样式

pages/meetingRoomList/meetingRoomList.acss

@@ -232,33 +232,26 @@
   z-index: 999;
 }
 
-.modalContent {
+.modalContent, .calendarMoadl {
   width: 100%;
   height: 732rpx;
+  overflow: hidden;
+  margin-top: -10px;
 }
 
 .modalHeader {
-  height: 44rpx;
-  line-height: 44rpx;
+  height: 32rpx;
+  line-height: 1;
   font-size: 32rpx;
   padding: 0 32rpx;
   text-align: right;
-  color: #3070F2;
+  color: #0A0A0A;
   box-sizing: border-box;
 }
 
 .modalHeader>view {
   flex: 1;
-}
-
-.modalHeader>view:nth-of-type(1) {
   color: #191F25;
-  text-align: left;
-}
-
-.modalHeader>view:nth-of-type(2) {
-  color: #3296FA;
-  text-align: right;
 }
 
 .changeDay {
@@ -267,13 +260,29 @@
   font-size: 30rpx;
   text-align: center;
   display: flex;
-  height: 100rpx;
+  height: 80rpx;
   align-items: center;
-  justify-content: center;
+  justify-content: space-between;
+  padding: 0 32rpx;
+  margin-top: 30rpx;
 }
 
 .changeDay>view {
-  flex: 1;
+  height: 80rpx;
+}
+
+.changeDay>view>view:nth-of-type(1) {
+  font-size: 28rpx;
+  font-family: DINAlternate-Bold, DINAlternate;
+  font-weight: bold;
+  color: rgba(10, 10, 10, 1);
+  line-height: 28rpx;
+  margin-bottom: 4rpx;
+}
+
+.changeDay>view>view:nth-of-type(2) {
+  font-size: 22rpx;
+  color: rgba(27, 38, 61, .56)
 }
 
 .modalOccupyTimeSlot {
@@ -282,7 +291,7 @@
 }
 
 .modalOccupyTimeSlot>view {
-  height: 100rpx;
+  height: 80rpx;
   width: 100%;
   padding-left: 32rpx;
 }
@@ -400,7 +409,11 @@
 }
 
 .dataNumSelected {
-  color: #3296FA;
+  border-bottom: 2rpx solid #EA0C28;
+}
+
+.dataNumSelected view:nth-of-type(1) {
+  color: #EA0C28 !important;
 }
 
 .roomScrollView {
@@ -446,10 +459,12 @@
 
 .modalTimeSlot {
   height: 44rpx;
-  font-family: DINAlternate-Bold;
   font-size: 32rpx;
+  font-family: DINAlternate-Bold, DINAlternate;
+  font-weight: bold;
+  color: rgba(10, 10, 10, .49);
+  line-height: 38rpx;
   text-align: center;
-  color: #1B263D;
 }
 
 ::-webkit-scrollbar {
@@ -472,7 +487,10 @@
   color: rgba(25, 31, 37, 0.12);
   font-size: 40rpx;
 }
-.calendarTip{
+
+.calendarTip {
   font-size: 24rpx;
-  color: rgba(25,31,37,.56)
+  text-align: center;
+  color: rgba(25, 31, 37, .56);
+  margin-top: 40rpx;
 }
\ No newline at end of file

pages/meetingRoomList/meetingRoomList.axml

@@ -66,10 +66,26 @@
         <text a:if="{{modalFooter.startTime && modalFooter.endTime}}">{{modalFooter.startTime}}至{{modalFooter.isOneDay ? modalFooter.endTime.substr(11,16):modalFooter.endTime}} 共{{modalFooter.allMinutes}}分钟</text>
       </view>
       <view class="changeDay">
-        <view class="{{dataNum == '0' ? 'dataNumSelected' : ''}}" onTap="chooseDate" data-num="0">{{TimeSlot.todayTime.split('/')[1]}}月{{TimeSlot.todayTime.split('/')[2]}}日</view>
-        <view class="{{dataNum == '1' ? 'dataNumSelected' : ''}}" onTap="chooseDate" data-num="1">{{TimeSlot.tomorrowTime.split('/')[1]}}月{{TimeSlot.tomorrowTime.split('/')[2]}}日</view>
-        <view class="{{dataNum == '2' ? 'dataNumSelected' : ''}}" onTap="chooseDate" data-num="2">{{TimeSlot.afterTomorrowTime.split('/')[1]}}月{{TimeSlot.afterTomorrowTime.split('/')[2]}}日</view>
-        <view class="{{dataNum == '3' ? 'dataNumSelected' : ''}}" onTap="chooseDate" data-num="3">自定义日期</view>
+        <view class="{{dataNum == '0' ? 'dataNumSelected' : ''}}" onTap="chooseDate" data-num="0">
+          <view>{{TimeSlot.todayTime.split('/')[1]}}月{{TimeSlot.todayTime.split('/')[2]}}日</view>
+          <view>今天</view>
+        </view>
+        <view class="{{dataNum == '1' ? 'dataNumSelected' : ''}}" onTap="chooseDate" data-num="1">
+          <view>{{TimeSlot.tomorrowTime.split('/')[1]}}月{{TimeSlot.tomorrowTime.split('/')[2]}}日</view>
+          <view>明天</view>
+        </view>
+        <view class="{{dataNum == '2' ? 'dataNumSelected' : ''}}" onTap="chooseDate" data-num="2">
+          <view>{{TimeSlot.afterTomorrowTime.split('/')[1]}}月{{TimeSlot.afterTomorrowTime.split('/')[2]}}日</view>
+          <view>后天</view>
+        </view>
+        <view class="{{dataNum == '3' ? 'dataNumSelected' : ''}}" onTap="chooseDate" data-num="3">
+          <view>
+            自定义日期
+          </view>
+          <view>
+            <text a:if="{{dataNum == '3'}}">{{meetingTime.date.split('/')[1]}}月{{meetingTime.date.split('/')[2]}}日</text>
+          </view>
+        </view>
       </view>
       <scroll-view scroll-y='{{true}}' class="modalOccupyTimeSlot" scroll-into-view="{{toThisTime}}">
         <view class="OccupyTimeList" a:for="{{modalList}}" data-index="{{index}}" onTap="onChangeModalTime" id="{{item.reserveStartTime.substr(11,15)}}">
@@ -96,7 +112,7 @@
         </view>
       </scroll-view>
     </view>
-    <view a:else>
+    <view class="calendarMoadl" a:else>
       <view class="calendarTip">
         自定义时间
       </view>

pages/meetingRoomList/meetingRoomList.js

@@ -69,7 +69,8 @@ create.Page({
     TimeSlot: {
       todayTime: "",
       tomorrowTime: "",
-      afterTomorrowTime: ""
+      afterTomorrowTime: "",
+      customTime: ""
     }
   },
   onLoad(query) {
@@ -89,9 +90,9 @@ create.Page({
       "search.time": `${year}-${month}-${day}`,
       "TimeSlot.todayTime": todayTime,
       "TimeSlot.tomorrowTime": `${year}/${tomorrowTime.getMonth() +
-        1}/${tomorrowTime.getDate()}/`,
+        1}/${tomorrowTime.getDate()}`,
       "TimeSlot.afterTomorrowTime": `${year}/${afterTomorrowTime.getMonth() +
-        1}/${afterTomorrowTime.getDate()}/`
+        1}/${afterTomorrowTime.getDate()}`
     });
     this.getPageData();
   },
@@ -1233,11 +1234,22 @@ create.Page({
     });
   },
   handleSelect(e) {
-    let date = getFormatDate(e[0], "yyyyMMdd");
+    let date = `${e[0].getFullYear()}/${e[0].getMonth() + 1}/${e[0].getDate()}`;
+    let num = "";
+    if (date === this.data.TimeSlot.todayTime) {
+      num = "0";
+    } else if (date === this.data.TimeSlot.tomorrowTime) {
+      num = "1";
+    } else if (date === this.data.TimeSlot.afterTomorrowTime) {
+      num = "2";
+    } else {
+      num = "3";
+    }
     this.setData(
       {
         isShowCalendar: false,
-        "meetingTime.date": date
+        "meetingTime.date": date,
+        dataNum: num
       },
       () => {
         this.getTimeSlotData();