Merge branch 'master' of http://gitlab.roboming.com/fengzhaoyu/schedule

app.json

 {
   "pages": [
     "pages/index/index",
+    "pages/place/place",
     "pages/createOrEditSchedule/createOrEditSchedule",
     "pages/uploadFile/uploadFile",
     "pages/meetingRoomList/meetingRoomList",
@@ -11,7 +12,6 @@
     "pages/addRemark/addRemark",
     "pages/remind/remind",
     "pages/scheduleDetail/scheduleDetail",
-    "pages/place/place",
     "pages/participantsDetail/participantsDetail",
     "pages/editFile/editFile",
     "pages/createOrEditSchedule/createOrEditSchedule"

pages/scheduleDetail/scheduleDetail.acss

@@ -279,6 +279,7 @@ page {
     border-radius: 6px;
     background: rgba(0, 0, 0, 0.8);
     position: absolute;
+    z-index: 9;
     top: -73rpx;
     left: 50%;
 }
@@ -412,3 +413,10 @@ page {
 .green {
      color: #15BC83;
 }
+.model {
+    width: 100%;
+    height: 100%;
+    position: fixed;
+    top: 0;
+    background: rgb(0, 0, 0, 0);
+}
\ No newline at end of file

pages/scheduleDetail/scheduleDetail.axml

@@ -86,7 +86,7 @@
         <text class="line">|</text>
         <text class="iconshangchuanwenjian1 iconfont"></text></view></view>
     <!-- 动态详情展示 -->
-    <view class="dynamicContent" a:if="{{!!allFileInfo.length}}">
+    <view class="dynamicContent" a:if="{{allFileInfo.length}}">
       <view class="dynamicDetail" a:for="{{allFileInfo}}" onTouchStart="touchStart" onTouchEnd="touchEnd" onLongTap="longPress" data-id="{{item.meetingLogId}}">
         <view class="dynamicList" a:if="{{!!item.scheduleAccessory}}">
           <view class="dynamicleft">
@@ -105,8 +105,7 @@
                 {{item2.fileName}}
               </view>
             </view>
-            <!-- a:if="{{organizer == pemissions?(item.meetingLogId == meetingLogId):(item.meetingLogId == meetingLogId&&item.scheduleAccessory.uploaderInfo.userId==pemissions)}}" -->
-            <view class="modFile" >
+            <view class="modFile" a:if="{{organizer == pemissions?(item.meetingLogId == meetingLogId):(item.meetingLogId == meetingLogId&&item.scheduleAccessory.uploaderInfo.userId==pemissions)}}">
               <view class="ediFile" data-nextPage="editFile" catchTap="nextPage" data-file="{{item.scheduleAccessory}}">
                 编辑
               </view>
@@ -161,4 +160,7 @@
       </view>
     </view>
   </view>
+  <!-- 编辑 删除的时候的弹窗 -->
+  <view class="model" onTap="hideModel" a:if="{{!!meetingLogId}}"> 
+  </view>
 </block>
\ No newline at end of file

pages/scheduleDetail/scheduleDetail.js

@@ -195,7 +195,9 @@ create.Page({
             item.scheduleAccessory.fileInfos = JSON.parse(item.scheduleAccessory.fileInfos)
             item.scheduleAccessory.uploaderInfo = JSON.parse(item.scheduleAccessory.uploaderInfo)
           }
+          if (!!item.scheduleAccessory || !!item.content) {
             allFileInfo.push(item)
+          }
         })
       }
       this.setData({
@@ -360,5 +362,11 @@ create.Page({
         })
       })
     })
+  },
+  // 隐藏删除编辑弹窗
+  hideModel() {
+    this.setData({
+      meetingLogId: ''
+    })
   }
 })