Merge branch 'release/dev/2.0.0' into release/2.0.0

app.json

 {
   "pages": [
+    "pages/uploadFile/uploadFile",
     "pages/index/index",
     "pages/meetingRoomList/meetingRoomList",
     "pages/appDetails/appDetails",
@@ -7,7 +8,6 @@
     "pages/excutorList/excutorList",
     "pages/createMeeting/createMeeting",
     "pages/place/place",
-    "pages/uploadFile/uploadFile",
     "pages/participantsDetail/participantsDetail",
     "pages/applicationDetails/applicationDetails",
     "pages/attendeeList/attendeeList",

pages/uploadFile/uploadFile.axml

@@ -5,6 +5,10 @@
   <file-list fileInfos="{{fileInfos}}" isCanEdit="{{false}}" isPreview="{{false}}" isCanDelete="{{true}}"/>
   <view class="addText" onTap="add">继续添加</view>
 </view>
-<view class="saveButton" onTap="saveUpload">
-      保存
+<view class="save" onTap="saveUpload">
+  <view class="button">
+            保存
+  </view>
+  <view class="tabBarBottom" a:if="{{isIPX}}">
+  </view>
 </view>
\ No newline at end of file

pages/uploadFile/uploadFile.js

@@ -3,6 +3,7 @@ import { saveFileInfo, addSchedule, uploadPermissions, previewPermissions, updat
 import { throttle, debounce, getCreateShowTime } from './../../utils/utils.js'
 import pageStore from '../meetingDetail/store';
 import { getFileInfo } from '../meetingDetail/uploadFile';
+import { checkFullScren } from "../../utils/checkFullScren";
 
 create.Page({
   store: pageStore,
@@ -10,8 +11,12 @@ create.Page({
     fileInfos: null, //store
     description: '',//store
     id: '',
+    isIPX: checkFullScren(),
   },
   onLoad(query) {
+    this.setData({
+      isIPX: checkFullScren()
+    })
     dd.setNavigationBar({
       title: '会议文件'
     });