Merge branch 'release/2.0.0' of…

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

pages/meetingDetail/meetingDetail.acss

@@ -316,13 +316,20 @@ input {
     width: 80rpx;
     height: 80rpx;
     border-radius: 50%;
-    background: #1890FF;
+    /* background: #1890FF; */
     color: white;
     line-height: 80rpx;
     text-align: center;
     position: relative;
 }
 
+.noHeadUrl {
+    background: #1890FF;
+    border-radius: 50%;
+    width: 80rpx;
+    height: 80rpx;
+}
+
 .headUrl>image {
     vertical-align: top;
     width: 100%;
@@ -671,8 +678,8 @@ input {
 
 .operation-more {
     position: relative;
-    padding: 0 8rpx;
-    background: #F9FAFB;
+    padding: 2rpx 10rpx;
+    background: #F6F8F9;
     border-radius: 4rpx;
     font-size: 28rpx;
 }
@@ -702,7 +709,7 @@ input {
     /* padding-right: 16rpx; */
     /* margin-right: 16rpx; */
     padding-right: 24rpx;
-    margin-right: 24rpx;
+    /* margin-right: 24rpx; */
     font-size: 24rpx;
     color: #fff;
     /* border-right: 1px solid rgba(255, 255, 255, 0.55); */
@@ -715,12 +722,22 @@ input {
 }
 
 .operation-containt>text:last-child {
+    padding-right: 0;
+    margin-right: 0;
+    border-right: none;
+}
+
+.operation-containt>text:last-child .editText {
+    border-right: none;
+}
+
+/* .editText:last-child {
     padding-right: 0rpx;
     margin-right: 0rpx;
     border-right: none;
-}
+} */
 
-.text {
+.editText {
     white-space: nowrap;
     padding-left: 8rpx;
     padding-right: 16rpx;

pages/meetingDetail/meetingDetail.axml

@@ -87,7 +87,19 @@
             </view>
             <view class="participatorListBottom" catchTap="goParticipantsDetail">
               <view class="people" a:for="{{$data.showParticipatorList.length > 10 ? [...$data.showParticipatorList].splice(0, 11) : $data.showParticipatorList}}">
-                <head-img className="headUrl" item="{{item}}"></head-img>
+                <block>
+                  <view class="headUrl">
+                    <image a:if="{{item.headUrl}}" mode="scaleToFill" src="{{item.headUrl}}" onLoad="imageLoad" />
+                    <view class="noHeadUrl" a:else>
+                    {{item.username.substring(item.username.length-numLength)}}
+                    </view>
+                    <view a:if="{{item.confirmAttendance == 0}}" class=" noParticipateStatus participate-status iconicon_noAgreed1 iconfont">
+                    </view>
+                    <view a:if="{{item.confirmAttendance == 1}}" class=" participate participate-status iconicon_Agreed1 iconfont">
+                    </view>
+                  </view>
+                </block>
+                <!--<head-img className="headUrl" item="{{item}}"></head-img> -->
                 <!--<view class="headUrl"><image a:if="{{item.headUrl}}" mode="scaleToFill" src="{{item.headUrl}}" /><view class="conflict iconicon_conflict iconfont" a:if="{{conflictPeople.includes(item.userId)}}"></view></view><view class="name">{{item.name}}</view> -->
               </view>
               <view class="addPeople iconfont iconicon_add1" catchTap="handleAddParticipator" data-type='participator'></view>
@@ -210,23 +222,23 @@
           <view class="operation-more iconmore iconfont color4" catchTap="handleOpenOperation" data-commentId="{{item.commentId}}">
             <view class="operation-containt" a:if="{{modifyDynamicId === item.commentId}}">
               <text class="icondescribe11 iconfont color4" a:if="{{item.fileDetailList&&item.creator.ddUserId === currentPeople}}" catchTap="openRemarkModal" data-commentId="{{item.commentId}}" data-remark="{{item.remark}}">
-                <text class="text">编辑</text>
+                <text class="editText">编辑</text>
                 <!--<text class="line">|</text> -->
               </text>
               <text class="icondescribe11 iconfont color4" a:if="{{item.notes&&item.creator.ddUserId === currentPeople }}" catchTap="editNotes" data-meetingNotes="{{item.notes}}" data-commentId="{{item.commentId}}">
-                <text class="text">编辑</text>
+                <text class="editText">编辑</text>
                 <!--<text class="line">|</text> -->
               </text>
               <text class="icondescribe11 iconfont color4" a:if="{{item.commentType === 'task' &&item.creator.ddUserId === currentPeople }}" catchTap="editTask" data-task="{{item.meetingTaskSimpleViewModel}}" data-commentId="{{item.commentId}}">
-                <text class="text">编辑</text>
+                <text class="editText">编辑</text>
                 <!--<text class="line">|</text> -->
               </text>
               <text class="iconcomments1 iconfont color4" data-commentId="{{item.commentId}}" catchTap="openComentModal">
-                <text class="text">评论</text>
+                <text class="editText">评论</text>
                 <!--<text class="line">|</text> -->
               </text>
               <text class="icondelete2 iconfont color4" a:if="{{item.creator.ddUserId === currentPeople}}" catchTap="handleDeleteMoment" data-commentId="{{item.commentId}}">
-                <text class="text">删除</text>
+                <text class="editText">删除</text>
               </text>
             </view>
           </view>

pages/meetingDetail/meetingDetail.js

@@ -148,6 +148,7 @@ create.Page({
         return
       }
 
+
       this.setData({
         scheduleItem: {
           id: res.data.data.id,
@@ -1372,9 +1373,13 @@ create.Page({
     this.store.data.modifyDynamicId = ''
     this.update()
   },
+  // 图片加载完成
+  imageLoad() {
+
+  },
 
   blank() {
-    debugger
+    // debugger
   },
 
 

pages/meetingDetail/utils.js

@@ -17,6 +17,10 @@ export function getSelectRepeatId(recurrenceModel, repeatList) {
 export function getInitialPsarticipants(participants) {
     let people = {}
     for (let i = 0; i < participants.length; i++) {
+        if (i < 11 && participants[i].headUrl) {
+            let img = new new Image()
+            img.src = img.headUrl
+        }
         participants[i].participator.confirmAttendance = participants[i].confirmAttendance
         people[participants[i].participator.userId] = participants[i].participator
     }