合并冲突

PageComponents/scheduleList/scheduleList.js

@@ -126,6 +126,14 @@ create.Component({
           // TO DO 判断所获取的时间区间
           // 将会议的年，月，日拆分，时分拆分，生成rrules规则
           let initialTime = item.initialTime.split("-"); //
+          // <<<<<<< HEAD
+          //           let initialTimeDate = new Date(parseInt(initialTime[0]), parseInt(initialTime[1]) - 1, parseInt(initialTime[2]));
+          //           initialTimeDate.setDate(initialTimeDate.getDate() - 1)
+          //           console.log(initialTimeDate.toLocaleDateString())
+          //           let initialTimeDateyear = initialTimeDate.getFullYear()
+          //           let initialTimeDatemonth = initialTimeDate.getMonth() + 1 < 10 ? '0' + (initialTimeDate.getMonth() + 1) : initialTimeDate.getMonth() + 1
+          //           let initialTimeDateday = initialTimeDate.getDate() < 10 ? '0' + initialTimeDate.getDate() : initialTimeDate.getDate()
+          // =======
           let initialTimeDate = new Date(
             parseInt(initialTime[0]),
             parseInt(initialTime[1]) - 1,
@@ -140,14 +148,13 @@ create.Component({
             initialTimeDate.getDate() < 10
               ? "0" + initialTimeDate.getDate()
               : initialTimeDate.getDate();
+          // >>>>>>> 8548e2b26ad549008cdd8c9e5e2bf83d67124e7d
           let startTimeList = item.startTime.split(":");
           let DTSTART = `${initialTimeDateyear}${initialTimeDatemonth}${initialTimeDateday}T${startTimeList[0]}${startTimeList[1]}00Z`;
           let rule = RRule.fromString(
             `${item.recurrenceModel.recurrenceRule};DTSTART=${DTSTART}`
           );
-          // console.log(rule, 'rule')
           rule.options.tzid = "Asia/Hong_Kong";
-          // 改变时区
           // 判断是否需要剔除某一天
           if (item.excludePlanDates) {
             // 拿到剔除日期的list

app.json

 {
   "pages": [
-    "pages/index2/index2",
     "pages/index/index",
+    "pages/index2/index2",
     "pages/meetingDetail/meetingDetail",
     "pages/excutorList/excutorList",
     "pages/createMeeting/createMeeting",

pages/createMeeting/createMeeting.axml

@@ -2,12 +2,12 @@
     <!-- title remark 标题 描述 -->
     <view class="createTitle">
         <view class="title">
-            <input placeholder-class="placeholder" placeholder="请输入主题" class="text" focus="{{true}}" onInput="onInput" data-type="title" value="{{title}}" />
+            <input placeholder-class="placeholder" placeholder="{{placeholder}}" class="text" onInput="onInput" data-type="title" value="{{title}}" focus="{{true}}"/>
             <view class="icon iconfont iconicon_description1 {{remark ? '' : 'noValueIcon'}}" onTap="addRemark">
             </view>
         </view>
         <view class="remark" a:if="{{isShowRemark}}">
-            <input placeholder-class="placeholder" placeholder="请添加描述" class="text" onInput="onInput" data-type="remark" value="{{remark}}" />
+            <input placeholder-class="placeholder" placeholder="请添加描述" class="text" onInput="onInput" data-type="remark" value="{{remark}}" focus="{{false}}" />
         </view>
     </view>
     <!-- $data.$data.roomId locationName 地点  -->
@@ -35,10 +35,10 @@
             <view>
                 <view class="timeText" catchTap="showPopup" data-type='time'>
                     <text a:if="{{isAcrossDay}}">
-                        {{`${$data.startTime.substring(5, 7)}月${$data.startTime.substring(8, 10)}日 ${$data.startTime.substring(11, 16)}`}} - {{`${$data.endTime.substring(5, 7)}月${$data.endTime.substring(8, 10)}日 ${$data.endTime.substring(11, 16)}`}}
+                        {{`${$data.startTime.substring(5, 7)}月${$data.startTime.substring(8, 10)}日 ${$data.startTime.substring(11, 16)}-${$data.endTime.substring(5, 7)}月${$data.endTime.substring(8, 10)}日 ${$data.endTime.substring(11, 16)}`}}
                     </text>
                     <text a:else>
-                        {{`${$data.startTime.substring(5, 7)}月${$data.startTime.substring(8, 10)}日 ${week} ${$data.startTime.substring(11, 16)}-  ${$data.endTime.substring(11, 16)}`}}
+                        {{`${$data.startTime.substring(5, 7)}月${$data.startTime.substring(8, 10)}日 ${week} ${$data.startTime.substring(11, 16)}-${$data.endTime.substring(11, 16)}`}}
                     </text>
                     <!-- 3月1日 周日 14:00-16:00 -->
                 </view>
@@ -70,7 +70,7 @@
                     </view>
                     <view class="iconicon_open iconfont icon" style="  vertical-align: middle" catchTap="nextPage" data-nextPage="participantsDetail"></view>
                 </view>
-                <view class="participatorListBottom">
+                <view class="participatorListBottom" catchTap="nextPage" data-nextPage="participantsDetail">
                     <view class="people" a:for="{{$data.participatorList.length > 10 ? [...$data.participatorList].splice(0, 11) : $data.participatorList}}">
                         <view class="headUrl">
                             <image a:if="{{item.headUrl}}" mode="scaleToFill" src="{{item.headUrl}}" />
@@ -82,7 +82,7 @@
                         </view>
                         <view class="name">{{item.name}}</view>
                     </view>
-                    <view class="addPeople" catchTap="showPopup" data-type='participator'></view>
+                    <view class="addPeople iconfont iconicon_add1" catchTap="showPopup" data-type='participator'></view>
                 </view>
             </view>
         </view>

pages/createMeeting/createMeeting.js

@@ -44,6 +44,7 @@ create.Page({
     week: '',
     isAcrossDay: false,
     conflictPeople: [],
+    placeholder: ''
   },
 
   showPop(event) {
@@ -65,7 +66,7 @@ create.Page({
       title: `创建会议`
     })
     this.setData({
-      title: `${getApp().globalData.name}创建的会议`
+      placeholder: `${getApp().globalData.name}创建的会议`
     })
     this.reset()
   },
@@ -246,7 +247,7 @@ create.Page({
     return year + '-' + month + '-' + day
   },
   // 添加参会人
-  addParticipator() {
+  addParticipator: throttle(function () {
     const _that = this
     let require = []
     let select = []
@@ -284,7 +285,8 @@ create.Page({
       fail: function (err) {
       }
     })
-  },
+
+  }),
   // 已选用户去中去掉必选用户
   selectedelRequired(req, pic) {
     for (let i = 0; i < req.length; i++) {
@@ -314,12 +316,14 @@ create.Page({
     this.$store.data.endTime = `${event.endTime}:00`
     this.update()
     this.acrossDay(this.$store.data.startTime, this.$store.data.endTime)
+
     this.setData({
-      popupShow: false
+      popupShow: false,
+      week: this.data.weekList[new Date(this.$store.data.startTime).getDay()],
     })
     this.conflictPeople()
   },
-  addSchedule() {
+  addSchedule: throttle(function () {
     let data = {
       title: this.data.title || `${getApp().globalData.name}创建的会议`,
       location: {
@@ -347,7 +351,8 @@ create.Page({
         })
       }
     })
-  },
+
+  }),
   // 获取时间参数
   getTimes(time = new Date()) {
     let date = getInterTime(new Date(time))

pages/index/index.axml

+版：174
 <view a:if="{{tabBarIndex === '0'}}">
     <my-dynamic>
     </my-dynamic>

pages/meetingDetail/meetingDetail.axml

@@ -7,7 +7,7 @@
       </view>
       <view class="hideTime">
         <text a:if="{{isAcrossDay}}">
-      {{`${$data.startTime.substring(5, 7)}月${$data.startTime.substring(8, 10)}日 ${$data.startTime.substring(11, 16)}`}}-{{`${$data.endTime.substring(5, 7)}月${$data.endTime.substring(8, 10)}日 ${$data.endTime.substring(11, 16)}`}}
+      {{`${$data.startTime.substring(5, 7)}月${$data.startTime.substring(8, 10)}日 ${$data.startTime.substring(11, 16)}-${$data.endTime.substring(5, 7)}月${$data.endTime.substring(8, 10)}日 ${$data.endTime.substring(11, 16)}`}}
         </text>
         <text a:else>
       {{`${$data.startTime.substring(5, 7)}月${$data.startTime.substring(8, 10)}日 ${week} ${$data.startTime.substring(11, 16)}-${$data.endTime.substring(11, 16)}`}}
@@ -21,7 +21,7 @@
       <view class="permissionContant">
         <view class="createTitle">
           <view class="title">
-            <input placeholder-class="placeholder" placeholder="请输入主题" class="text" onInput="onInput" data-type="title" data-selectType="common" value="{{title}}" onConfirm="onConfirm"/>
+            <input placeholder-class="placeholder" placeholder="{{placeholder}}" class="text" onInput="onInput" data-type="title" data-selectType="common" value="{{title}}" onConfirm="onConfirm" focus="{{true}}"/>
             <view class="icon iconfont iconicon_description1 {{remark ? '' : 'noValueIcon'}}" onTap="addRemark">
             </view>
           </view>
@@ -92,7 +92,7 @@
             <view class="participatorListTop">
               <view class="participatorText">
                 <view>
-                            {{$data.participatorList.length}}位参会人
+                    {{$data.participatorList.length}}位参会人
                 </view>
                 <view class="conflictStatus" a:if="{{conflictPeople.length}}">
                             {{conflictPeople.length}}人会议安排冲突
@@ -100,12 +100,11 @@
               </view>
               <view class="iconicon_open iconfont icon" style="  vertical-align: middle" catchTap="nextPage" data-nextPage="participantsDetail"></view>
             </view>
-            <view class="participatorListBottom">
+            <view class="participatorListBottom" catchTap="nextPage" data-nextPage="participantsDetail">
               <view class="people" a:for="{{$data.participatorList.length > 10 ? [...$data.participatorList].splice(0, 11) : $data.participatorList}}">
                 <view class="headUrl">
                   <image a:if="{{item.headUrl}}" mode="scaleToFill" src="{{item.headUrl}}" />
-                  <text
-                                a:else>{{item.platform==="outlook" ? item.username.substring(0, 2) : item.username.substring(item.username.length-2, item.username.length)}}
+                  <text a:else>{{item.platform==="outlook" ? item.username.substring(0, 2) : item.username.substring(item.username.length-2, item.username.length)}}
                   </text>
                   <view class="conflict iconicon_conflict iconfont" a:if="{{conflictPeople.includes(item.userId)}}">
                   </view>
@@ -142,7 +141,7 @@
     </view>
     <!-- 底部导航栏 -->
     <view class="footNav">
-      <view class="footNavTop">
+      <view class="footNavTop" a:if="{{!isExpand}}">
         <view class="originStaus" a:if="{{confirmAttendance === null}}">
           <view catchTap="participate">
             <text class="iconfont iconicon_Agreed1"></text>

pages/meetingDetail/meetingDetail.js

@@ -105,11 +105,10 @@ create.Page({
     editType: '',
     confirmAttendance: null,
     isExpand: false,
-    forbiddenScroll: false
-
+    forbiddenScroll: false,
+    placeholder: ''
   },
   onShow() {
-    console.log(this)
     this.conflictPeople()
     setTimeout(() => {
       this.update()
@@ -124,6 +123,7 @@ create.Page({
       title: `会议详情`
     })
     this.setData({
+      placeholder: `${getApp().globalData.name}创建的会议`,
       scheduleItem: JSON.parse(event.scheduleItem),
       currentPeople: getApp().globalData.userid
     })
@@ -182,7 +182,7 @@ create.Page({
           remark: res.data.data.remark,
           isExpand: res.data.data.confirmAttendance === 1 ? true : false,
           isShowRemark: res.data.data.remark ? true : false,
-          week: this.data.weekList[new Date(res.data.data.startTime.replace(/'-'/g, "\/")).getDay()],
+          week: this.data.weekList[new Date(res.data.data.startTime.replace(/-/g, "/")).getDay()],
           getData: true
         })
         if (res.data.data.repeatable) {
@@ -541,6 +541,7 @@ create.Page({
     this.acrossDay(this.$store.data.startTime, this.$store.data.endTime)
     this.setData({
       popupShow: false,
+      week: this.data.weekList[new Date(this.$store.data.startTime).getDay()],
       editType: '',
       forbiddenScroll: false
     })

pages/outLookContact/outLookContact.axml

 <view class="outLookContact">
   <!-- 输入邮箱联系人 -->
   <view class="addContact">
-    <input placeholder="请输入邮箱" focus="{{true}}" onInput="onInput" value="{{value}}" />
+    <input placeholder="请输入邮箱" onInput="onInput" value="{{value}}" />
     <view class="icon iconfont iconicon_add " onTap="addEmail">
     </view>
   </view>
@@ -16,7 +16,7 @@
       <view class="contactText">
       {{item.username}}
       </view>
-      <view a:if="{{!!scheduleItem ? !(item.userId == $data.originalData || $data.originUsersId.includes(item.userId)) : !(item.userId == $data.originalData)}}" class="contactClose  icon iconfont  iconicon_close" onTap="close" data-item="{{item}}">
+      <view a:if="{{(!scheduleItem || currentPeople === $data.originalData.organizer) ? !(item.userId == currentPeople) : !($data.originUsersId.includes(item.userId))}}" class="contactClose  icon iconfont  iconicon_close" onTap="close" data-item="{{item}}">
       </view>
     </view>
   </view>

pages/outLookContact/outLookContact.js

@@ -41,6 +41,7 @@ create.Page({
       showToast: false,
       title: '保存成功'
     },
+    currentPeople: ''
   },
   onLoad(event) {
     const _that = this
@@ -57,7 +58,8 @@ create.Page({
       }
     }
     this.setData({
-      outlookContact: outlookContact
+      outlookContact: outlookContact,
+      currentPeople: getApp().globalData.userid
     })
     observer.register({
       notice(scheduleItem) {
@@ -185,7 +187,7 @@ create.Page({
     })
     if (event.currentTarget.dataset.item.id > -1) {
       let addUserList = this.arrayPoor(this.$store.data.originUsers, this.data.userList).addUserList
-      let deleteUserList = this.arrayPoor(this.$store.data.originUsers, this.data.userListId).deleteUserList
+      let deleteUserList = this.arrayPoor(this.$store.data.originUsers, this.data.userList).deleteUserList
       let dataUser = {
         addUserList: addUserList,
         deleteUserList: deleteUserList,

pages/participantsDetail/participantsDetail.axml

@@ -8,7 +8,7 @@
       </view>
       <view class="info">
         <text class="name">{{item.username}}</text>
-        <text a:if="{{!!scheduleItem ? !(item.userId == $data.originalData || $data.originUsersId.includes(item.userId)) : !(item.userId == currentPeople)}}" class="close iconicon_close iconfont" data-userId="{{item.userId}}" onTap="delParticipants"></text>
+        <text a:if="{{(!scheduleItem || currentPeople === $data.originalData.organizer) ? !(item.userId == currentPeople) : false}}" class="close iconicon_close iconfont" data-userId="{{item.userId}}" onTap="delParticipants"></text>
       </view>
     </view>
   </view>

stores/exampleStore.js

@@ -8,7 +8,7 @@ class Store {
         originUsers: [],
         originUsersId: [],
         originalData: null,
-        indexNeedUpdate: false,
+        indexNeedUpdate: false
     }
 }
 export default new Store()
\ No newline at end of file