合并冲突

pages/createOrEditSchedule/createOrEditSchedule.axml

@@ -103,7 +103,7 @@
   </view>
 </view>
 <!-- 重复 -->
-<view class="repeat" a:if="{{!!repeatable}}">
+<view class="repeat" a:if="{{!!scheduleItem&&!!repeatable}}">
   <view class="iconfont iconchongfu">
   </view>
   <view class="repeatContaint">

pages/createOrEditSchedule/createOrEditSchedule.js

@@ -155,6 +155,8 @@ create.Page({
   addParticipants() {
     const _that = this
     dd.complexChoose({
+      limitTips: "超出了",          //超过限定人数返回提示
+      maxUsers: 100,            //最大可选人数
       title: "选择参会人",            //标题
       multiple: true,            //是否多选
       pickedUsers: _that.store.data.participatorUserId,            //已选用户
@@ -346,7 +348,7 @@ create.Page({
       this.store.data.requireUserList = participatorUserId
       this.store.data.participatorList = participatorList
       this.store.data.remark = res.data.data.remark || ''
-      this.store.data.recurrenceModel = res.data.data.recurrenceModel
+      this.store.data.recurrenceModel = res.data.data.recurrenceModel || { model: 'no-repeat' }
       this.setData({
         originUserList: participatorList,
         title: res.data.data.title,
@@ -487,6 +489,7 @@ create.Page({
       })
     })
 
-  }
+  },
+  // 去重
 
 });

pages/participantsDetail/participantsDetail.js

@@ -29,7 +29,7 @@ create.Page({
       title: "选择参会人",            //标题
       multiple: true,            //是否多选
       limitTips: "超出了",          //超过限定人数返回提示
-      maxUsers: 1000,            //最大可选人数
+      maxUsers: 100,            //最大可选人数
       pickedUsers: _that.store.data.participatorUserId,            //已选用户
       requiredUsers: [],            //必选用户（不可取消选中状态
       responseUserOnly: true,        //返回人，或者返回人和部门

pages/scheduleDetail/scheduleDetail.acss

@@ -74,6 +74,11 @@ page {
     background: #3296Fa;
     margin-right: 16rpx;
 }
+.imageGroup image {
+    width: 58rpx;
+    height: 58rpx;
+    border-radius: 50%;
+} 
 
 .number {
     margin-right: 16rpx;

pages/scheduleDetail/scheduleDetail.axml

@@ -63,7 +63,7 @@
       <text a:if="{{aheadTimes.includes(2880)}}">两天前</text>
       <text a:if="{{aheadTimes.includes(10080)}}">1周前</text>
       提醒
-    </view>Ï
+    </view>
   </view>
   <!-- 会议描述 -->
   <view class="describe" a:if="{{!!remark}}">