合并冲突

app.acss

+page {
+    font-family: PingFangSC-Regular;
+    background: #F6F6F6;
+}
+picker-view {
+    background: #F6F6F6;
+}
\ No newline at end of file

app.json

@@ -14,5 +14,8 @@
     "pages/participantsDetail/participantsDetail",
     "pages/editFile/editFile",
     "pages/createOrEditSchedule/createOrEditSchedule"
-  ]
+  ],
+  "window": {
+    "titleBarColor": "#FFFFFF"
+  }
 }

pages/createOrEditSchedule/createOrEditSchedule.axml

-<view class="createOrEditSchedule">
+<block a:if="{{showPage}}">
+  <view class="createOrEditSchedule">
     <!-- 主题 -->
     <view class="container {{!!scheduleItem?(organizer==permissions?'':'noPermissions'):''}}">
       <view class="theme">
@@ -41,9 +42,9 @@
         </view>
       </view>
     </view>
-</view>
-<!-- 地点  -->
-<view class="container {{!!scheduleItem?(organizer==permissions?'':'noPermissions'):''}}">
+  </view>
+  <!-- 地点  -->
+  <view class="container {{!!scheduleItem?(organizer==permissions?'':'noPermissions'):''}}">
     <view class="permissions" a:if="{{!!scheduleItem?(organizer==permissions?false:true):false}}">
     </view>
     <view class="place" a:if="{{!!scheduleItem?!!locationName:true}}">
@@ -59,9 +60,9 @@
         </text>
       </view>
     </view>
-</view>
-<!-- 参会人  -->
-<view class="participants">
+  </view>
+  <!-- 参会人  -->
+  <view class="participants">
     <view class="icon iconfont iconcanhuiren1">
     </view>
     <view class="text">
@@ -94,9 +95,9 @@
       </view>
       <text class="addParticipants" a:else data-nextPage="participantsDetail" onTap="addParticipants">添加参会人</text>
     </view>
-</view>
-<!--  提醒  -->
-<view class="container {{!!scheduleItem?(organizer==permissions?'':'noPermissions'):''}}">
+  </view>
+  <!--  提醒  -->
+  <view class="container {{!!scheduleItem?(organizer==permissions?'':'noPermissions'):''}}">
     <view class="permissions" a:if="{{!!scheduleItem?(organizer==permissions?false:true):false}}">
     </view>
     <view class="remind" a:if="{{aheadTimes.length}}">
@@ -117,9 +118,9 @@
         <text class="close iconshanchu iconfont" a:if="{{!!scheduleItem?(organizer==permissions?true:false):true}}" data-icon="iconhuiqiantixing" catchTap="closeEditList"></text>
       </view>
     </view>
-</view>
-<!-- 重复 -->
-<view class="container {{!!scheduleItem?(organizer==permissions?'':'noPermissions'):''}}">
+  </view>
+  <!-- 重复 -->
+  <view class="container {{!!scheduleItem?(organizer==permissions?'':'noPermissions'):''}}">
     <view class="permissions" a:if="{{!!scheduleItem?(organizer==permissions?false:true):false}}">
     </view>
     <view class="repeat" a:if="{{!!scheduleItem&&!!repeatable}}">
@@ -137,9 +138,9 @@
         </view>
       </view>
     </view>
-</view>
-<!-- 描述 -->
-<view class="container {{!!scheduleItem?(organizer==permissions?'':'noPermissions'):''}}">
+  </view>
+  <!-- 描述 -->
+  <view class="container {{!!scheduleItem?(organizer==permissions?'':'noPermissions'):''}}">
     <view class="permissions" a:if="{{!!scheduleItem?(organizer==permissions?false:true):false}}">
     </view>
     <view class="describe" a:if="{{!!remark}}">
@@ -151,9 +152,9 @@
       <view class="iconfont iconshanchu" data-icon="icondidianmiaoshu" catchTap="closeEditList" a:if="{{!!scheduleItem?(organizer==permissions?true:false):true}}">
       </view>
     </view>
-</view>
-<!-- 编辑列表 -->
-<view class="editList">
+  </view>
+  <!-- 编辑列表 -->
+  <view class="editList">
     <view a:if="{{!!scheduleItem?organizer==permissions&&!locationName:false}}" class="listGroup" onTap="editSchedule" data-icon="icondingwei">
       <view class="listIcon iconfont icondingwei">
       </view>
@@ -200,9 +201,9 @@
         </view>
       </picker>
     </view>
-</view>
-<!-- 编辑重复的时候的保存 -->
-<picker a:if="{{isRepeat=='1'}}" value="{{0}}" range="{{['仅更新此会议', '更新以后会议', '更新所有会议']}}" onChange="saveRepeat">
+  </view>
+  <!-- 编辑重复的时候的保存 -->
+  <picker a:if="{{isRepeat=='1'}}" value="{{0}}" range="{{['仅更新此会议', '更新以后会议', '更新所有会议']}}" onChange="saveRepeat">
     <view>
       <view class="save">
         <view>
@@ -210,13 +211,14 @@
         </view>
       </view>
     </view>
-</picker>
-<!-- 保存 -->
-<view class="save" a:else>
+  </picker>
+  <!-- 保存 -->
+  <view class="save" a:else>
     <view onTap="saveCreate">
     {{buttonText}}
     </view>
-</view>
-</view>
-<mw-modal isShowModal="{{isShowModal}}" time="{{propsTime}}" onChange="changeSelectTime">
-</mw-modal>
+  </view>
+  </view>
+  <mw-modal isShowModal="{{isShowModal}}" time="{{propsTime}}" onChange="changeSelectTime">
+  </mw-modal>
\ No newline at end of file
+</block>
\ No newline at end of file

pages/createOrEditSchedule/createOrEditSchedule.js

@@ -28,7 +28,8 @@ create.Page({
     requireUsersInfo: [],
     organizer: '',
     isRepeat: '',
-    permissions: ''
+    permissions: '',
+    showPage: false
   },
   onLoad(event) {
     let index = new Date().getDay()
@@ -43,9 +44,12 @@ create.Page({
     this.store.data.conflictPeople = []
     this.store.data.participatorList = []
     this.store.data.locationName = ''
-    this.store.data.participatorUserId =
-      this.update()
+// <<<<<<< HEAD
+//     this.store.data.participatorUserId = []
+//       this.update()
 
+    this.store.data.participatorUserId = [getApp().globalData.userid]
+    this.update()
     var date = new Date();
     var y = date.getFullYear();
     var m = (date.getMonth() + 1) < 10 ? "0" + (date.getMonth() + 1) : (date.getMonth() + 1);//获取当前月份的日期，不足10补0
@@ -85,6 +89,9 @@ create.Page({
       this.store.data.week2 = this.data.week2
       this.store.data.aheadTimes = [15]
       this.update()
+      this.setData({
+        showPage: true
+      })
     }
   },
   onShow() {
@@ -451,7 +458,8 @@ create.Page({
         time1: res.data.data.startTime.replace(/-/g, '/'),
         time2: res.data.data.endTime.replace(/-/g, '/'),
         week1: this.data.weekList[new Date(res.data.data.startTime.replace(/-/g, "/")).getDay()],
-        week2: this.data.weekList[new Date(res.data.data.endTime.replace(/-/g, "/")).getDay()]
+        week2: this.data.weekList[new Date(res.data.data.endTime.replace(/-/g, "/")).getDay()],
+        showPage: true
       })
       this.update()
       this.conflict()

pages/index/index.axml

 <!-- <mw-select></mw-select> -->
 版本号：108版
-<scroll-view a:if="{{todayStr !== ''}}" scroll-y="{{true}}" upper-threshold="50" lower-threshold="50" onScrollToLower="lower" style="height: 100vh;" scroll-into-view="{{todayStr}}">
+<scroll-view a:if="{{todayStr !== ''}}" scroll-y="{{true}}" upper-threshold="50" lower-threshold="50" onScrollToLower="lower" onScroll="onScroll" style="height: 100vh;" scroll-into-view="{{todayStr}}">
     <block a:for="{{scheduleList}}" a:for-item="scheduleYearList">
         <block a:for="{{scheduleYearList}}">
             <block a:if="{{item.type == 'year'}}">

pages/index/index.js

@@ -13,6 +13,11 @@ Page({
   },
   onReady() {
   },
+  onScroll() {
+    this.setData({
+      todayStr: '00000'
+    })
+  },
   onShow() {
     // 页面显示
      let data = {
@@ -33,6 +38,7 @@ Page({
         const today = new Date()	
         const finalDate = new Date(today)
         finalDate.setDate(today.getDate() - today.getDay())
+        console.log(finalDate.toLocaleDateString())
         that.setData({
           scheduleList: scheduleList,
           todayStr: finalDate.toLocaleDateString(),

pages/meetingRoomList/meetingRoomList.acss

@@ -4,6 +4,9 @@
   box-sizing: border-box;
   background: #fff;
   width: 100%;
+  position: fixed;
+  left: 0;
+  top: 0;
 }
 .searchHeader1 {
   border-bottom: 1px solid rgba(25,31,37,0.12);
@@ -315,3 +318,8 @@
 .dataNumSelected {
   color: #3296FA;
 }
+.roomScrollView{
+  height: 100vh;
+  padding-top: 192rpx;
+  box-sizing: border-box;
+}

pages/meetingRoomList/meetingRoomList.axml

@@ -31,7 +31,8 @@
     </scroll-view>
   </view>
 </view>
-<view class="reserveMeeting">
+<scroll-view scroll-y="{{canScroll}}" class="roomScrollView">
+  <view class="reserveMeeting">
     <scroll-view scroll-y='{{true}}' scroll-into-view='searchList' class="reserveMeetingScrollView">
       <view class="meetingRoomContent" a:for="{{reserveRoomList}}" data-roomid="{{item.meetingRoomId}}" data-roomname="{{item.name}}" onTap="changeRoomTime">
         <view class="roomMessage">
@@ -71,7 +72,8 @@
         </view>
       </view>
     </scroll-view>
-</view>
+  </view>
+</scroll-view>
 <view a:if="{{isShowModal}}" class="modal">
   <view class="modalContent">
     <view class="modalHeader">
@@ -118,7 +120,7 @@
             已过期
           </view>
           <view class="occupiedStatus" a:if="{{item.reserveStatus === 'occupied'}}">
-            已被{{item.scheduleList[0].participatorList[0].username}}预定
+            已被{{item.scheduleList[0].organizerName}}预定
           </view>
         </view>
       </view>

pages/meetingRoomList/meetingRoomList.js

@@ -32,11 +32,12 @@ create.Page({
       date: '',
       meetingRoomId: '',
       meetingRoomName: ''
-    }
+    },
+    canScroll: true
   },
   onLoad(query) {
-    // let date = new Date(this.store.data.startTime.replace(/-/g, "/"))
-    let date = new Date()
+    let date = new Date(this.store.data.startTime.replace(/-/g, "/"))
+    // let date = new Date()
     let year = date.getFullYear()
     let month = `${date.getMonth() + 1}`
     let day = `${date.getDate()}`

pages/meetingRoomList/meetingRoomList.json

@@ -2,5 +2,6 @@
     "usingComponents": {
         "timecheckmodal": "../../components/timeCheckModal/timeCheckModal",
         "lable-tree": "../../components/selectArea/selectArea"
-    }
+    },
+    "defaultTitle": "所有会议室"
 }
\ No newline at end of file

pages/scheduleDetail/scheduleDetail.js

@@ -31,9 +31,6 @@ create.Page({
       scheduleItem: scheduleItem,
       pemissions: getApp().globalData.userid
     })
-    dd.setNavigationBar({
-      title: '会议详情'
-    })
   },
   onShow() {
     this.setData({

pages/scheduleDetail/scheduleDetail.json

-{}
+{
\ No newline at end of file
+    "defaultTitle": "会议详情"
+}
\ No newline at end of file