Merge branch 'release/2.0.0' of http://gitlab.roboming.com/fengzhaoyu/schedule into release/2.0.0

app.json

@@ -12,10 +12,12 @@
     "pages/participantsDetail/participantsDetail",
     "pages/applicationDetails/applicationDetails",
     "pages/attendeeList/attendeeList",
-    "pages/createTask/createTask"
+    "pages/createTask/createTask",
+    "pages/files/files",
+    "pages/tasks/tasks"
   ],
   "window": {
     "allowsBounceVertical": "YES"
   },
   "pullRefresh": false
-}
\ No newline at end of file
+}

pages/files/files.acss

+page {
+  background: #Fff;
+}
+
+.file-container {
+  padding: 0 32rpx;
+}
\ No newline at end of file

pages/files/files.axml

+<view class="file-container" a:for="{{files}}">
+  <file-list fileView="{{item}}"/>
+</view>
\ No newline at end of file

pages/files/files.js

+import create from 'dd-store';
+import pageStore from '../../pages/meetingDetail/store';
+create.Page({
+  store: pageStore,
+  data: {
+    meetingId: '',
+    files: null //store
+  },
+  onLoad(query) {
+    this.setData({
+      meetingId: query.meetingId
+    })
+  },
+});

pages/files/files.json

+{
+  "defaultTitle": "文件",
+  "usingComponents": {
+    "file-list": "../../components/fileList/fileList"
+  }
+}
\ No newline at end of file

pages/index/index.js

@@ -765,7 +765,6 @@ create.Page({
     dd.navigateTo({ url: "./../createMeeting/createMeeting" });
   },
   nextDetail: throttle(function (e) {
-    console.log(e.target.dataset)
     const { item } = e.target.dataset;
     const scheduleItem = { scheduleId: item.meetingId || item.id, scheduleTemplateId: item.scheduleTemplateId, planDate: item.planDate }
     dd.navigateTo({

pages/meetingDetail/meetingDetail.axml

@@ -107,6 +107,8 @@
           </view>
         </view>
       </view>
+      <view onTap="goTasksPage">{{tasks.length}} 个任务</view>
+      <view onTap="goFilesPage">{{files.length}} 个附件</view>
       <!-- 删除该会议 -->
       <template is="deleteBtn" onhandleDelete="" data="{{title: '删除该会议' }}"/>
     </view>

pages/meetingDetail/store.js

@@ -5,6 +5,8 @@ class Store {
         notes: null, //{meetingNotes: '', commentId: ''}
         parentCommentId: '', // 评论的动态Id
         remark: null,   //{remark: '', commentId: ''}
+        files: [],
+        tasks: [],
         fileInfos: null,
         description: '',
         oldFileInfos: '',

pages/tasks/tasks.acss

+page {
+  background: #Fff;
+}
\ No newline at end of file

pages/tasks/tasks.axml

+<block a:for="{{tasks}}">
+  <task-list onChangeTaskStatusOnList="changeTaskStatus" taskView="{{item.meetingTaskSimpleViewModel}}" commentId="{{item.commentId}}" isCanEdit="{{false}}"/>
+</block>
\ No newline at end of file

pages/tasks/tasks.js

+import create from 'dd-store';
+import pageStore from '../../pages/meetingDetail/store';
+create.Page({
+  store: pageStore,
+  data: {
+    meetingId: '',
+    tasks: null //store
+  },
+  onLoad(query) {
+    this.setData({
+      meetingId: query.meetingId
+    })
+  },
+});

pages/tasks/tasks.json

+{
+  "defaultTitle": "子任务",
+  "usingComponents": {
+    "task-list": "../../components/taskList/taskList"
+  }
+}
\ No newline at end of file