Merge branch 'dev' of ssh://gitlab.roboming.com:2018/fengzhaoyu/schedule into dev

PageComponents/scheduleList/scheduleList.js

@@ -487,6 +487,9 @@ create.Component({
         scheduleList: scheduleList,
         maxYear: year
       });
+    },
+    nextPage() {
+      dd.navigateTo({ url: "./../createMeeting/createMeeting" });
     }
   }
 });

components/fileList/fileList.axml

@@ -12,7 +12,7 @@
       <view a:if="{{isCanDelete}}" class="iconfont iconicon_noAgreed1" catchTap="removeFile" data-id="{{item.fileId}}"></view>
     </view>
   </view>
-  <view class="btns-pop" a:if="{{fileView.logId == logId}}">
+  <view class="btns-pop" a:if="{{fileView.logId == logId && (organizer === currentPeople ? true : currentPeople === fileView.creatorId)}}">
     <view class="edit" catchTap="updateFile" data-fileView="{{fileView}}">
           编辑
     </view>

pages/addRemark/addRemark.axml

 <view>
   <view class="remarkInput">
-    <textarea onInput="getRemark" auto-height placeholder="添加内容描述" value="{{remark}}" class="textarea"  focus="{{false}}"  />
+    <textarea onInput="getRemark" auto-height placeholder="添加内容描述" value="{{remark}}" class="textarea" focus="{{false}}" />
   </view>
   <!-- 保存 -->
   <view class="confirm" onTap="save">

pages/applicationDetails/applicationDetails.axml

 <view class="pageBg">
   <view class="application">
     <view>
-      
     </view>
     <view>
       chudepeng@outlook.com

pages/meetingDetail/meetingDetail.axml

@@ -217,7 +217,7 @@
          {{item.fileView.creatorInfo.username}}
           <text>{{item.createTime}}</text>
         </view>
-        <file-list fileView="{{item.fileView}}" onDeleteMeetingFile="deleteMeetingFile"/>
+        <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>
     </block>