Merge branch 'dev' into release_beta/1.0.0

pages/meetingDetail/meetingDetail.acss

@@ -206,7 +206,7 @@ input {
     position: relative;
 }
 
-.place, .time, .participator, .meetingWay {
+.place, .time, .participator, .meetingWay, .meetingWayShowTop {
     display: flex;
     padding: 0 32rpx;
     font-family: PingFangSC-Regular;
@@ -215,11 +215,11 @@ input {
     margin-top: 48rpx;
 }
 
-.place>.icon, .time>.icon, .participator>.icon, .meetingWay>.icon {
+.place>.icon, .time>.icon, .participator>.icon, .meetingWay>.icon, .meetingWayShowTop>.icon {
     margin-right: 24rpx;
 }
 
-.noPlace, .hasplace, .timeText, .participatorText, .noWay, .hasWay {
+.noPlace, .hasplace, .timeText, .participatorText, .noWay, .hasWay, .meetingWayText {
     font-size: 34rpx;
     width: 100%;
     line-height: 1.5;
@@ -625,4 +625,29 @@ input {
     border-top: 1px solid rgba(239, 242, 245, 1);
     padding-top: 32rpx;
     margin: 0 auto 50rpx;
+}
+
+.meetingWayText {
+    color: rgba(48, 112, 242, 1);
+}
+
+.mettingWayText {
+    margin-top: 22rpx;
+    font-size: 28rpx;
+    font-family: PingFangSC-Regular, PingFang SC;
+    font-weight: 400;
+    color: rgba(25, 31, 37, 0.55);
+}
+
+.mettingWayText .icon {
+    color: rgba(10, 10, 10, 0.14);
+    margin-left: 26rpx;
+}
+
+.passWord {
+    margin-top: 0rpx;
+}
+
+.meetingWayShowTop>.icon {
+    color: rgb(216, 216, 216) !important
 }
\ No newline at end of file

pages/meetingDetail/meetingDetail.axml

@@ -139,6 +139,25 @@
         <view class="permission" a:if="{{currentPeople != organizer}}">
         </view>
       </view>
+      <view class="meetingWayShow" a:if="{{comListData.meetingWayModelId == 0}}">
+        <view class="meetingWayShowTop">
+          <view class=" icon iconfont iconicon_camera1">
+          </view>
+          <view class="meetingWayText">
+            <view onTap="setCopy" data-item="https://zoom.com.cn/j/93255954558?pwd=YmNZQkY1SGxtUFNPYjZlcUpJT0xtQT09" data-type="url">
+                 Zoom
+            </view>
+            <view class="mettingWayText" onTap="setCopy" data-item="513410069">
+              <text>ID：513410069</text>
+              <text class="icon iconfont iconicon_task1"></text>
+            </view>
+            <view class="mettingWayText passWord" onTap="setCopy" data-item="4ez3am">
+              <text >密码:4ez3am</text>
+              <text class="icon iconfont iconicon_task1"></text>
+            </view>
+          </view>
+        </view>
+      </view>
       <!-- 删除该会议 -->
       <template is="deleteBtn" onhandleDelete="" data="{{title: '删除该会议' }}"/>
     </view>

pages/meetingDetail/meetingDetail.js

@@ -1384,7 +1384,9 @@ create.Page({
         if (itemData.fileInfos) {
           item.fileView = {
             fileInfos: JSON.parse(itemData.fileInfos),
-            creatorInfo: itemData.creatorInfo
+            creatorInfo: itemData.creatorInfo,
+            id: itemData.id,
+            description: itemData.description
           };
         }
         if (itemData.taskInfos) {
@@ -1717,5 +1719,29 @@ create.Page({
       path: 'pages/index/index'
     };
   },
+  setCopy(event) {
+    if (event.currentTarget.dataset.type) {
+      dd.setClipboard({
+        text: event.currentTarget.dataset.item,
+        success: res => {
+          dd.alert({
+            buttonText: '确定',
+            content: '复制成功，请在外部浏览器打开'
+          })
+        }
+      })
+    } else {
+      dd.setClipboard({
+        text: event.currentTarget.dataset.item,
+        success: res => {
+          this.setData({
+            'conToastData.showToast': true,
+            'conToastData.title': '复制成功',
+          });
+
+        }
+      })
+    }
+  }
 });