提测2版

PageComponents/scheduleList/scheduleList.axml

@@ -2,7 +2,7 @@
   <view>2020年3月</view>
   <view onTap="changesidebar">icon</view>
 </view>
-<scroll-view class="indexScrollView" scroll-y="{{true}}" style="background: #FFFFFF" lower-threshold="1000" onScrollToLower="lower" scroll-into-view="{{thisDay}}">
+<scroll-view class="indexScrollView" scroll-y="{{true}}" style="background: #FFFFFF" lower-threshold="1000" onScrollToLower="lower" scroll-into-view="{{todayStr}}">
   <block a:for="{{scheduleList}}" a:for-item="scheduleYearList">
     <block a:for="{{scheduleYearList}}">
       <block a:if="{{item.type == 'year'}}">

PageComponents/scheduleList/scheduleList.js

@@ -59,18 +59,25 @@ create.Component({
               scheduleList.push(that.returnScheduleList(2019 + i));
             }
             // 第一次加载
-            const today = new Date();
             // finalDate 是用来定位到今天的
-            const finalDate = new Date(today);
+            const finalDate = new Date();
             // finalDate.setDate(today.getDate() - today.getDay())
-            that.setData({
-              scheduleList: scheduleList,
-              todayStr: finalDate.toLocaleDateString(),
-              thisYear: year,
-              maxYear: year,
-              startPageOnShow: true,
-              isFirstLoad: false
-            });
+            that.setData(
+              {
+                scheduleList: scheduleList,
+                todayStr: finalDate.toLocaleDateString(),
+                thisYear: year,
+                maxYear: year,
+                startPageOnShow: true,
+                isFirstLoad: false
+              }
+              // ,
+              // () => {
+              //   that.setData({
+
+              //   });
+              // }
+            );
           }
         );
       });

components/meetingTimePicker/meetingTimePicker.js

@@ -193,6 +193,7 @@ Component({
       if (this.props.endTime) {
         endDate = new Date(this.props.endTime);
       }
+      console.log(this.props)
 
       this.changeStart(startDate);
       this.changeEnd(endDate);

pages/index/index.axml

@@ -10,12 +10,7 @@
     <view onTap="changeTabBar" data-tabbar='0'>
         <view class="tabBarView {{tabBarIndex === '0' ? 'ischooseTabBar' : ''}}">
             <text class="iconfont iconicon_dynamic"></text>
-<<<<<<< HEAD
-            <text>动态
-            </text>
-=======
             <text>动态</text>
->>>>>>> b7fb19ed327785cdcb5da3f8a7365609dc94eaf8
         </view>
     </view>
     <view onTap="changeTabBar" data-tabbar='1'>

pages/meetingDetail/meetingDetail.axml

@@ -212,36 +212,26 @@
           </view>
           <file-list fileView="{{item.fileView}}" organizer="{{organizer}}" currentPeople="{{currentPeople}}" onDeleteMeetingFile="deleteMeetingFile"/>
         </view>
-        <view a:if="{{item.content}}" class='simple-column'>{{item.content}}{{item.createTime}}</view>
+        <view a:if="{{item.content}}" class='simple-column'>{{item.content}} {{item.createTime}}</view>
       </block>
       <view class="affair-placeholder" a:if="{{affairList.length <= 1}}">
         <image mode="widthFix" src="../../assests/noDynamic.png"/>
         <view class="affair-placeholder-text">我们不开无准备的会，快来上传会议文件吧。</view>
         <view onTap="addMeetingFile" class="affair-placeholder-button">添加会议文件</view>
       </view>
-<<<<<<< HEAD
-=======
-      <view a:if="{{item.content}}" class='simple-column'>{{item.content}} {{item.createTime}}</view>
-    </block>
-    <view class="affair-placeholder" a:if="{{affairList.length <= 1}}">
-      <image mode="widthFix" src="../../assests/noDynamic.png"/>
-      <view class="affair-placeholder-text">我们不开无准备的会，快来上传会议文件吧。</view>
-      <view onTap="addMeetingFile" class="affair-placeholder-button">添加会议文件</view>
->>>>>>> b7fb19ed327785cdcb5da3f8a7365609dc94eaf8
-    </view>
-    <!--<view class="delMetting" onTap="delSheudle"><view class=" iconfont iconicon_close"></view><view>
+      <!--<view class="delMetting" onTap="delSheudle"><view class=" iconfont iconicon_close"></view><view>
           删除该会议</view></view> -->
-    <popup title="{{popupTitle}}" show="{{popupShow}}" mask="true" onClose="closePopup">
-      <meeting-time-picker a:if="{{'time' === comType}}" onComplete="onComplete" startTime="{{$data.startTime}}" endTime="{{$data.endTime}}"></meeting-time-picker>
-      <hlist a:if="{{'participator' === comType}}" dataComList="{{comHListData.contactData}}" onSelectComHList="selectComHList"></hlist>
-      <list multiple="{{comListData.multiple}}" onCompelete="selectAheadtimes" comSelectList="{{comListData.aheadTimesListId}}" complete="{{comType=='aheadTime' ? true : false}}"a:if="{{comType=='repeat' || comType=='meetingWayModel' || comType=='aheadTime'}}" dataComList="{{comType=='repeat' ? comListData.repeatList : (comType=='aheadTime' ? comListData.aheadTimesList : comListData.meetingWayList)}}" onComSelectList="selectComList" comSelectListId="{{comType=='repeat' ? comListData.comSelectListId : (comType=='aheadTime'?comListData.aheadTimesListId : comListData.meetingWayModelId)}}" iconType="{{comListData.iconType}}">
-      </list>
-    </popup>
-    <popup show="{{show}}" onClose="closePop" title="{{pop.title}}">
-      <!-- 任务创建弹出框 -->
-      <task-panel a:if="{{pop.type === 'createTask'}}" onComplete="complete" action='create'/>
-      <!-- 任务修改弹出框 -->
-      <task-panel a:if="{{pop.type === 'updateTask'}}" action='update' onDeleteTask="deleteTask"/>
-    </popup>
-  </view>
-</block>
\ No newline at end of file
+      <popup title="{{popupTitle}}" show="{{popupShow}}" mask="true" onClose="closePopup">
+        <meeting-time-picker a:if="{{'time' === comType}}" onComplete="onComplete" startTime="{{$data.startTime}}" endTime="{{$data.endTime}}"></meeting-time-picker>
+        <hlist a:if="{{'participator' === comType}}" dataComList="{{comHListData.contactData}}" onSelectComHList="selectComHList"></hlist>
+        <list multiple="{{comListData.multiple}}" onCompelete="selectAheadtimes" comSelectList="{{comListData.aheadTimesListId}}" complete="{{comType=='aheadTime' ? true : false}}"a:if="{{comType=='repeat' || comType=='meetingWayModel' || comType=='aheadTime'}}" dataComList="{{comType=='repeat' ? comListData.repeatList : (comType=='aheadTime' ? comListData.aheadTimesList : comListData.meetingWayList)}}" onComSelectList="selectComList" comSelectListId="{{comType=='repeat' ? comListData.comSelectListId : (comType=='aheadTime'?comListData.aheadTimesListId : comListData.meetingWayModelId)}}" iconType="{{comListData.iconType}}">
+        </list>
+      </popup>
+      <popup show="{{show}}" onClose="closePop" title="{{pop.title}}">
+        <!-- 任务创建弹出框 -->
+        <task-panel a:if="{{pop.type === 'createTask'}}" onComplete="complete" action='create'/>
+        <!-- 任务修改弹出框 -->
+        <task-panel a:if="{{pop.type === 'updateTask'}}" action='update' onDeleteTask="deleteTask"/>
+      </popup>
+    </view>
+    </block>
\ No newline at end of file

pages/meetingDetail/meetingDetail.js

@@ -194,8 +194,8 @@ create.Page({
         this.$store.data.originUsers = participatorList
         this.$store.data.locationName = res.data.data.location.locationName
         this.$store.data.roomId = res.data.data.meetingRoomId < 0 ? '' : res.data.data.meetingRoomId
-        this.$store.data.startTime = res.data.data.startTime.replace(/'-'/g, "\/")
-        this.$store.data.endTime = res.data.data.endTime.replace(/'-'/g, "\/")
+        this.$store.data.startTime = res.data.data.startTime.replace(/-/g, "/")
+        this.$store.data.endTime = res.data.data.endTime.replace(/-/g, "/")
         this.$store.data.participatorList = participatorList
         this.$store.data.participatorUserId = participatorUserId
         this.$store.data.originUsersId = participatorUserId