Merge branch 'dev' into release_beta/1.0.0

pages/createMeeting/createMeeting.js

@@ -319,6 +319,22 @@ create.Page({
     })
     this.conflictPeople()
     this.resetRepeatList()
+
+    /* 
+    改时间 改掉重复规则
+    先选重复规则 再改时间 重复规则也要改变
+    暂时修改每周 每月重复问题
+     */
+    if (this.data.recurrenceModel.model === 'weekly' && this.data.recurrenceModel.weekDayList.length === 1) {
+      this.setData({
+        recurrenceModel: this.data.comListData.repeatList[2].recurrenceModel
+      })
+    } else if (this.data.recurrenceModel.model === 'absolute_Monthly') {
+      this.setData({
+        recurrenceModel: this.data.comListData.repeatList[4].recurrenceModel
+      })
+    }
+
   },
   addSchedule: throttle(async function () {
     let data = {

pages/outLookContact/outLookContact.acss

@@ -25,11 +25,12 @@ input {
     width: 100%;
     font-family: PingFangSC-Medium;
     font-size: 40rpx;
+    height: 60rpx;
 }
 
 .addContact>.icon {
     color: #3070F2;
-    line-height: 58rpx;
+    line-height: 68rpx;
 }
 
 .contactListItem {