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

api/request.js

@@ -289,9 +289,10 @@ export function setRead(meetingId) {
   })
 }
 
-export function previewOssFile(fileId) {
+export function previewOssFile(data) {
   return $http({
-    method: 'get',
-    url: `/meet/fileDetail?objectName=${fileId}`
+    method: 'post',
+    url: `/meet/fileDetail`,
+    data: JSON.stringify(data)
   })
 }
\ No newline at end of file

components/fileList/fileList.js

@@ -71,7 +71,7 @@ create.Component({
           });
         } else {
           // 预览文件
-          previewOssFile(encodeURIComponent(file.fileId)).then(res => {
+          previewOssFile({ objectName: file.fileId }).then(res => {
             openLink({
               url: res.data.data.webUrl
             });

pages/createMeeting/createMeeting.acss

@@ -63,11 +63,11 @@ input {
 
 .place, .time, .participator, .meetingWay, .aheadTime {
     display: flex;
-    padding: 0 32rpx;
+    padding: 24rpx 32rpx;
     font-family: PingFangSC-Regular;
     color: #191F25;
     overflow: hidden;
-    margin-top: 48rpx;
+    /* margin-top: 48rpx; */
 }
 
 .place>.icon, .time>.icon, .participator>.icon, .meetingWay>.icon, .aheadTime>.icon {

pages/createMeeting/createMeeting.axml

@@ -11,16 +11,16 @@
         </view>
     </view>
     <!-- $data.$data.roomId locationName 地点  -->
-    <view class="place">
+    <view class="place" onTap="goSelectPlace">
         <view class="iconicon_room iconfont icon " a:if="{{$data.roomId}}">
         </view>
         <view class="iconicon_location1 iconfont icon {{$data.locationName ? '' : 'noValueIcon'}}" a:else>
         </view>
         <view class="placeContaint">
-            <view class="noPlace" a:if="{{!$data.locationName}}" onTap="goSelectPlace">
+            <view class="noPlace" a:if="{{!$data.locationName}}">
                 添加地点
             </view>
-            <view class="hasplace" onTap="goSelectPlace"  a:else>
+            <view class="hasplace" a:else>
                 {{$data.locationName}}
             </view>
             <view class=" icon iconfont iconicon_close close" a:if="{{!!$data.locationName}}" catchTap="handleDeletePlace">
@@ -76,11 +76,11 @@
             </view>
         </view>
     </view>
-    <view class="aheadTime">
+    <view class="aheadTime" onTap="handleSelectAheadTime">
         <view class="iconicon_time1 iconfont icon">
         </view>
         <view class="aheadTimeContent">
-            <view class="aheadTimeItem" onTap="handleSelectAheadTime">
+            <view class="aheadTimeItem">
                 <text class="aheadTimeText" a:for="{{aheadTime.aheadTimeList}}" a:if="{{aheadTime.aheadTimes.includes(item.id)}}"> 
                     {{item.text}}
                     <text class="divder">{{"、"}}</text>

pages/createMeeting/createMeeting.js

@@ -55,9 +55,17 @@ create.Page({
     this.reset()
   },
   onShow() {
+    if (this.$store.data.shouldUpdateShowTime) {
+      this.setData({
+        showTime: getShowTime(this.$store.data.startTime, this.$store.data.endTime)
+      })
+      this.$store.data.shouldUpdateShowTime = false;
+      this.update();
+    }
     setTimeout(() => {
       this.update()
     }, 100)
+
   },
 
   // 添加标题

pages/meetingDetail/meetingDetail.acss

@@ -220,11 +220,11 @@ input {
 
 .place, .time, .participator, .meetingWay, .meetingWayShowTop, .taskNumber {
     display: flex;
-    padding: 0 32rpx;
+    padding: 24rpx 32rpx;
     font-family: PingFangSC-Regular;
     color: #191F25;
     overflow: hidden;
-    margin-top: 48rpx;
+    /* margin-top: 48rpx; */
 }
 
 .place>.icon, .time>.icon, .participator>.icon, .meetingWay>.icon, .meetingWayShowTop>.icon, .taskNumber>.icon {
@@ -363,7 +363,7 @@ input {
 }
 
 .editeMeeting .delete-task-wrap {
-    padding: 74rpx 0 32rpx 0;
+    padding: 32rpx 0 32rpx 0;
 }
 
 .delete-task {