22

app.json

@@ -5,6 +5,7 @@
     "pages/createOrEditSchedule/createOrEditSchedule",
     "pages/uploadFile/uploadFile",
     "pages/meetingRoomList/meetingRoomList",
+    "pages/uploadFile/uploadFile",
     "pages/repetitionTime/repetitionTime",
     "pages/repeatMechanism/repeatMechanism",
     "pages/attendingSituation/attendingSituation",

components/mwSelectTimeModal/mwSelectTimeModal.acss

@@ -12,6 +12,7 @@
     display: flex;
     background: rgba(0, 0, 0, 0.15);
     flex-direction: column-reverse;
+    z-index: 99;
 }
 .mwModalBox{
     background: #fff;

pages/createOrEditSchedule/createOrEditSchedule.acss

@@ -5,6 +5,7 @@ page {
     font-size: 34rpx;
     color: #191F25;
     padding-bottom: 180rpx;
+    box-sizing: border-box;
 }
 
 .iconfont {
@@ -33,6 +34,7 @@ page {
     width: 100%;
     padding-left: 0;
     height: 52rpx;
+    font-size: 40rpx;
     line-height: 52rpx;
 }
 
@@ -45,18 +47,24 @@ page {
     border-bottom: 1rpx solid rgba(25, 31, 37, 0.12);
 }
 
-.selectTime {
-    background: #3296FA;
-    color: white;
-}
-
 .time {
     height: 132rpx;
     display: flex;
     padding: 0;
     /* overflow-y: hidden; */
 }
-
+.AllTimeUnAction {
+    background: url('../../assests/AllTimeUnAction.png');
+    background-size: cover;
+}
+.startTimeAction {
+    background: url('../../assests/startTimeAction.png');
+    background-size: cover;
+}
+.endTimeAction {
+    background: url('../../assests/endTimeAction.png');
+    background-size: cover;
+}
 .timeContainer {
     font-family: DINAlternate-Bold;
     display: flex;
@@ -80,19 +88,12 @@ page {
 
 .startTime, .endTime {
     width: 50%;
-    height: 100%;
+    height: 132rpx;
 }
 
 .startTime {
     width: 355rpx;
     text-indent: 32rpx;
-    /* position: relative; */
-    /* border-right: 1rpx solid rgba(25, 31, 37, 0.12); */
-}
-
-.selectTime {
-    background: #3296FA;
-    color: white;
 }
 
 .line {
@@ -115,7 +116,12 @@ page {
 .endTime {
     text-indent: 75rpx;
 }
+.endTime::before {
+    
+}
+.endTime::after {
     
+}
 .icon, .text {
     width: 100%;
     height: 100%;

pages/createOrEditSchedule/createOrEditSchedule.axml

@@ -30,8 +30,8 @@
     <view class="container {{!!scheduleItem?(organizer==permissions?'':'noPermissions'):''}}">
       <view class="permissions" a:if="{{!!scheduleItem?(organizer==permissions?false:true):false}}">
       </view>
-      <view class="time">
-        <view class="startTime {{timeStaus === '0' ? 'selectTime' : ''}}" data-timeStaus="0" onTap="selectTime">
+      <view class="time {{timeStaus == '0' ? 'startTimeAction' : timeStaus == '1' ? 'endTimeAction' : 'AllTimeUnAction'}}">
+        <view class="startTime" data-timeStaus="0" onTap="selectTime">
           <view class="timeContainer">
             <view class="yearTime">
               {{time1.slice(5,7)}}月{{time1.slice(8,10)}}日
@@ -43,9 +43,8 @@
           <view class="weekTime">
             {{week1}}
           </view>
-          <!--<view class="line {{!!timeStaus ? 'selectLine' : ''}}"> -->
         </view>
-        <view class="endTime {{timeStaus === '1' ? 'selectTime' : ''}}" data-timeStaus="1" onTap="selectTime">
+        <view class="endTime" data-timeStaus="1" onTap="selectTime">
           <view class="timeContainer">
             <view class="yearTime">
               {{time2.slice(5,7)}}月{{time2.slice(8,10)}}日

pages/createOrEditSchedule/createOrEditSchedule.js

@@ -94,7 +94,7 @@ create.Page({
       this.update()
       setTimeout(() => {
         this.setData({
-          showPage: true
+          showPage: trueflict
         })
       }, 300)
     }
@@ -148,7 +148,8 @@ create.Page({
             time2: `${y}/${m}/${d} ${h < 10 ? "0" + date.getHours() : date.getHours()}:${min < 10 ? "0" + min : min}:00`,
             isShowModal: false,
             week1: w1,
-            week2: w2
+            week2: w2,
+            timeStaus: ''
           }, () => {
             that.conflict()
           })
@@ -156,7 +157,8 @@ create.Page({
           this.setData({
             time1: `${e.time}:00`,
             isShowModal: false,
-            week1: w1
+            week1: w1,
+            timeStaus: ''
           }, () => {
             that.conflict()
           })
@@ -174,7 +176,8 @@ create.Page({
           this.setData({
             time2: `${e.time}:00`,
             isShowModal: false,
-            week2: w1
+            week2: w1,
+            timeStaus: ''
           }, () => {
             that.conflict()
           })
@@ -182,7 +185,8 @@ create.Page({
       }
     } else {
       this.setData({
-        isShowModal: false
+        isShowModal: false,
+        timeStaus: ''
       })
     }
   },
@@ -508,7 +512,7 @@ create.Page({
         }
         dd.confirm({
           title: '删除会议',
-          content: '确认删除本次日程吗？',
+          content: '确认删除删除会议吗？',
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           success: (success) => {

pages/index/index.acss

@@ -67,11 +67,56 @@ page {
     background: #CFECFF;
     margin-bottom: 16rpx;
 }
-
+.NoSchedule{
+    width: 604rpx;
+    border-radius: 8rpx;
+    font-size: 26rpx;
+    height: 90rpx;
+    padding-left: 16rpx;
+    box-sizing: border-box;
+    margin-bottom: 16rpx;
+    line-height: 0.9rem;
+}
+.NoSchedule > view:nth-of-type(1) text:nth-of-type(1) {
+    color: rgba(25,31,37,0.56);
+}
+.NoSchedule > view:nth-of-type(1) text:nth-of-type(2) {
+    color: #3296FA;
+}
 .dataSchedule .overdue {
     background: #F6F6F6;
     color: rgba(25, 31, 37, 0.56);
 }
+.thisDay > view{
+    color: rgb(50, 150, 250);
+}
+.thisDay > text{
+    color: rgb(50, 150, 250);
+}
+.thisDayLine {
+    position: relative;
+    height: 2rpx;
+    background: #F25643;
+    width: 100%;
+    overflow: visible;
+}
+.dataSchedule .thisDayHavaMeeting {
+    height: 2rpx !important;
+    background: #F25643 !important;
+    overflow: visible !important;
+}
+.thisDayLine::after {
+    content: '';
+    position: absolute;
+    left: -2rpx;
+    bottom: -2rpx;
+    width: 8rpx;
+    height: 8rpx;
+    border-radius: 50%;
+    background: #F25643;
+    z-index: 99;
+    box-sizing: border-box;
+}
 
 .dataSchedule .cancel {
     width: 602rpx;

pages/index/index.axml

@@ -4,7 +4,7 @@
     <block a:for="{{scheduleList}}" a:for-item="scheduleYearList">
         <block a:for="{{scheduleYearList}}">
             <block a:if="{{item.type == 'year'}}">
-                <view class="month" onTap="changMd">
+                <view class="month">
                     {{item.value}}年
                 </view>
             </block>
@@ -22,14 +22,38 @@
             </block>
             <block a:elif="{{item.type == 'day'}}">
                 <view class="date">
-                    <view class="dateTime">
+                    <view class="dateTime {{item.isThisDay}}">
                         <view>
                             {{item.value.week}}
                         </view>
                         <text>{{item.value.day}}</text>
                     </view>
                     <view class="dataSchedule">
-                        <view a:for="{{item.value.value}}" a:for-item="item2" data-item="{{item2}}" class="{{ item2.isBeOverdue ? 'overdue' : item2.confirmAttendance === 0 ? 'cancel' : '' }}" onTap="nextDetail">
+                        <view a:for="{{item.value.value}}" a:for-item="item2" data-item="{{item2}}" class="{{ item2.isBeOverdue ? 'overdue' : item2.confirmAttendance === 0 ? 'cancel' : '' }}" onTap="{{!isClicked?'nextDetail':''}}">
+                            <view class="dataScheduleName">
+                                <text>{{item2.title}}{{item2.isfirstDayOrEndDay ? `（第${item2.isFewDays}天，共${item2.duration}天）` : '' }}</text>
+                            </view>
+                            <view class="dataScheduleTime">
+                            <text a:if="{{item2.isfirstDayOrEndDay && item2.isfirstDayOrEndDay === '0'}}">{{item2.thisDayStartTime}}</text>
+                            <text a:elif="{{item2.isfirstDayOrEndDay && item2.isfirstDayOrEndDay === '1'}}">全天</text>
+                            <text a:elif="{{item2.isfirstDayOrEndDay && item2.isfirstDayOrEndDay === '2'}}">直到{{item2.thisDayEndTime}}</text>
+                            <text a:else>{{item2.thisDayStartTime}} - {{item2.thisDayEndTime}}</text>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+            </block>
+            <block a:elif="{{item.type == 'today'}}">
+                <view class="date">
+                    <view class="dateTime {{item.isThisDay}}">
+                        <view style="color">
+                            {{item.value.week}}
+                        </view>
+                        <text style="color">{{item.value.day}}</text>
+                    </view>
+                    <view class="dataSchedule">
+                        <view class="thisDayLine thisDayHavaMeeting" style="margin-bottom: 7.5rpx"></view>
+                        <view a:for="{{item.value.value}}" a:for-item="item2" data-item="{{item2}}" class="{{ item2.isBeOverdue ? 'overdue' : item2.confirmAttendance === 0 ? 'cancel' : '' }}" onTap="{{!isClicked?'nextDetail':''}}">
                             <view class="dataScheduleName">
                                 <text>{{item2.title}}{{item2.isfirstDayOrEndDay ? `（第${item2.isFewDays}天，共${item2.duration}天）` : '' }}</text>
                             </view>
@@ -43,8 +67,25 @@
                     </view>
                 </view>
             </block>
+            <block a:elif="{{item.type == 'thisDay'}}">
+                <view class="date">
+                    <view class="dateTime thisDay">
+                        <view>
+                            {{item.value.week}}
+                        </view>
+                        <text>{{item.value.day}}</text>
+                    </view>
+                    <view class="NoSchedule">
+                        <view>
+                            <text>暂无日程安排，</text>
+                            <text onTap="{{!isClicked?'nextPage':''}}">创建日程</text>
+                        </view>
+                        <view class="thisDayLine"></view>
+                    </view>
+                </view>
+            </block>
         </block>
     </block>
 </scroll-view>
-<view class="createSchedule iconfont iconjiahao " onTap="nextPage">
+<view class="createSchedule iconfont iconjiahao " onTap="{{!isClicked?'nextPage':''}}">
 </view>

pages/index/index.js

 import { getHomeUserSchedule } from '../../api/request.js'
+import { isClicked } from './../../utils/utils.js'
 Page({
   data: {
     AllScheduleList: [],
@@ -7,7 +8,7 @@ Page({
     thisYear: '',
     maxYear: '',
     minYear: '',
-    canClick: true
+    isClicked:false
   },
   onLoad(query) {
     // 页面加载
@@ -130,6 +131,7 @@ Page({
       type: 'year',
       value: year
     })
+    let thisDay = new Date().toLocaleDateString()
     DateMap.forEach(function (value, key, map) {
       if (new Date(key).getDay() === 0 && that.count(key, new Date(year, 0, isLeapYear ? 366 : 365).toLocaleDateString()) >7) {
         listWeek = listWeek + 1
@@ -177,9 +179,29 @@ Page({
           dayStr: key
         })
       }
-      if (value.scheduleList.length !== 0) {
+      if (value.scheduleList.length !== 0 && key !== thisDay) {
         DateList.push({
           type: 'day',
+          isThisDay: true,
+          value: {
+            value: value.scheduleList,
+            day: new Date(key).getDate() < 10 ? '0' + new Date(key).getDate() : new Date(key).getDate(),
+            week: weekList[new Date(key).getDay()]
+          },
+        })
+      } else if (value.scheduleList.length !== 0 && key === thisDay) {
+        DateList.push({
+          type: 'today',
+          value: {
+            value: value.scheduleList,
+            day: new Date(key).getDate() < 10 ? '0' + new Date(key).getDate() : new Date(key).getDate(),
+            week: weekList[new Date(key).getDay()]
+          },
+        })
+      }
+      if (value.scheduleList.length === 0 && key === thisDay) {
+        DateList.push({
+          type: 'thisDay',
           value: {
             value: value.scheduleList,
             day: new Date(key).getDate() < 10 ? '0' + new Date(key).getDate() : new Date(key).getDate(),
@@ -220,21 +242,13 @@ Page({
     };
   },
   nextPage() {
-    if(this.data.canClick) {
-      this.setData({
-        canClick: false
-      })
+    isClicked(this)
     dd.navigateTo({ url: './../createOrEditSchedule/createOrEditSchedule' })
-    }
   },
   nextDetail(e) {
-    if(this.data.canClick) {
-      this.setData({
-        canClick: false
-      })
+    isClicked(this)
     let item = e.target.dataset.item
     dd.navigateTo({ url: `./../scheduleDetail/scheduleDetail?scheduleItem=${JSON.stringify(item)}` })
-    }
   },
   lower() {
     let year = this.data.maxYear + 1

pages/meetingRoomList/meetingRoomList.acss

@@ -395,15 +395,36 @@
   height: 100vh;
   padding-top: 192rpx;
   box-sizing: border-box;
+  position: relative;
 }
 
 .reserveRoomMsg .iconfont {
   font-size: 24rpx;
   margin-right: 8rpx;
 }
-
 .occupiedStatus {
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
 }
+.noRoom{
+  position: absolute;
+  left: 0;
+  top: 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width:100%;
+  height:100%;
+}
+.noRoom>view{
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+}
+.noRoomTip{
+  margin-top: 32rpx;
+  font-size: 30rpx;
+  color: rgba(25,31,37,0.56);
+}
\ No newline at end of file

pages/meetingRoomList/meetingRoomList.axml

@@ -71,6 +71,14 @@
       </view>
     </view>
   </view>
+  <view class="noRoom" a:if={{noRoom}}>
+    <view>
+      <view>
+        <image style="width: 280rpx; height: 156rpx;" mode="{{item.mode}}" src="./../../assests/noRoom.png" />
+      </view>
+      <view class="noRoomTip">当前暂无会议室</view>
+    </view>
+  </view>
 </scroll-view>
 <view a:if="{{isShowModal}}" class="modal">
   <view class="modalContent">
@@ -134,4 +142,3 @@
   onPropsCS="onPropsCS"
 >
 </lable-tree>
\ No newline at end of file
- 

pages/meetingRoomList/meetingRoomList.js

@@ -19,6 +19,7 @@ create.Page({
       time: ''
     },
     dataNum: '0',
+    noRoom: false,
     location:{
       id: '',
       name: ''
@@ -92,7 +93,12 @@ create.Page({
             }
           })
           that.setData({
-            reserveRoomList: reserveRoomList
+            reserveRoomList: reserveRoomList,
+            noRoom: false
+          })
+        } else {
+          that.setData({
+            noRoom: true
           })
         }
       })
@@ -553,11 +559,13 @@ create.Page({
           }
         })
         that.setData({
-          reserveRoomList: reserveRoomList
+          reserveRoomList: reserveRoomList,
+          noRoom: false
         })
       } else {
         that.setData({
-          reserveRoomList: []
+          reserveRoomList: [],
+          noRoom: true
         })
       }
     })

pages/place/place.axml

@@ -5,16 +5,19 @@
     <input placeholder="搜索地点" onInput="inputPlace"/>
   </view>
   <view class="availableList" a:if="{{!place}}">
-    <view class="title">
+    <view a:if="{{availableMeetingRoom.length !==0 }}" class="title">
       可用会议室
     </view>
+    <view a:if="{{availableMeetingRoom.length ===0 }}" style="text-align:center" class="title">
+      暂无可用会议室
+    </view>
     <block a:for="{{availableMeetingRoom}}">
       <view class="mettingRoom" data-locationName="{{item.name}}" data-locationid="{{item.meetingRoomId}}" onTap="selectMeetingRoom">
         <view class="icon iconfont iconhuiyishi2">
         </view>
         <view class="mettingRoomRight">
           <view class="name">
-            {{item.name}}
+            {{item.meetingRoomFullName}}
           </view>
           <view class="mettingRoomDetail">
             <view class="num">