合并代码

app.json

@@ -2,6 +2,7 @@
   "pages": [
     "pages/index/index",
     "pages/createOrEditSchedule/createOrEditSchedule",
+    "pages/uploadFile/uploadFile",
     "pages/meetingRoomList/meetingRoomList",
     "pages/uploadFile/uploadFile",
     "pages/repetitionTime/repetitionTime",

pages/createOrEditSchedule/createOrEditSchedule.acss

@@ -7,9 +7,11 @@ page {
     padding-bottom: 180rpx;
     box-sizing: border-box;
 }
+
 .iconfont {
     font-size: 32rpx;
 }
+
 ::-webkit-scrollbar {
     display: none
 }
@@ -296,6 +298,7 @@ page {
 .editList>view {
     margin: 24rpx 0;
 }
+
 .listIcon {
     line-height: 30rpx;
     text-align: center;
@@ -375,23 +378,55 @@ page {
 .blank>text {
     margin-right: 10rpx;
 }
+
 .container {
     position: relative;
 }
+
 .permissions {
     width: 100%;
-    background:rgba(0, 0, 0, 0);
+    background: rgba(0, 0, 0, 0);
     position: absolute;
     height: 100%;
     top: 0;
     z-index: 10；
 }
+
 .noPermissions {
     opacity: 0.6;
 }
+
 .iconshanchu3 {
     color: #f25643;
 }
+
 .iconshanchu3+.listText {
-      color: #f25643;
+    color: #f25643;
 }
+
+.popupWindow {
+    height: 100%;
+    width: 100%;
+    position: fixed;
+    top: 0;
+    background: rgba(0, 0, 0, 0.12)
+}
+
+.popupWindowCenter {
+    width: 587rpx;
+    left: 50%;
+    margin-left: -293rpx;
+    height: auto;
+    position: absolute;
+    border-radius: 10rpx;
+    top: 450rpx;
+    background: #fff;
+}
+
+.list {
+    height: 96rpx;
+    text-align: center;
+    line-height: 96rpx;
+    text-align: center;
+    border-bottom: 1rpx solid rgba(25, 31, 37, 0.12);
+}
\ No newline at end of file

pages/createOrEditSchedule/createOrEditSchedule.axml

@@ -220,4 +220,22 @@
   </view>
   <mw-modal isShowModal="{{isShowModal}}" time="{{propsTime}}" onChange="changeSelectTime">
   </mw-modal>
+  <view class="popupWindow">
+    <view class="popupWindowCenter">
+      <view class="list">
+        向参会人发送通知？
+      </view>
+      <view class="list">
+        发送
+      </view>
+      <view class="list">
+        不发送
+      </view>
+      <view class="list">
+        继续编辑
+      </view>
+      
+    </view>
+    
+  </view>
 </block>
\ No newline at end of file

pages/createOrEditSchedule/createOrEditSchedule.js

@@ -31,7 +31,8 @@ create.Page({
     isRepeat: '',
     permissions: '',
     showPage: false,
-    isClicked: false
+    isClicked: false,
+    popupWindowList: [{id: 0}]
   },
   onLoad(event) {
     let index = new Date().getDay()

pages/scheduleDetail/scheduleDetail.axml

@@ -28,7 +28,8 @@
               ${time2.substring(5, 7)}月${time2.substring(8, 10)}日 ${time2.substring(11, 16)}
             `}}
             <view class="repeatTip" a:if="{{!!isRepeatable}}">
-              每周三重复，截止到2020年3月29
+              {{recModel.model=='day_in_week'?(recModel.weekDayList.length==5?'每周的工作日重复':'每'+week+'重复'):'每天重复'}},
+              {{recModel.forever=='1'? '永不截止':'截止到'+recModel.terminateTime}}
             </view>
           </view>
         </view>
@@ -104,7 +105,7 @@
                 {{item2.fileName}}
               </view>
             </view>
-            <view class="modFile" a:if="{{organizer == pemissions?(item.meetingLogId == meetingLogId):(item.meetingLogId == meetingLogId&&item.scheduleAccessory.uploaderInfo.userId==pemissions)}}" >
+            <view class="modFile" a:if="{{organizer == pemissions?(item.meetingLogId == meetingLogId):(item.meetingLogId == meetingLogId&&item.scheduleAccessory.uploaderInfo.userId==pemissions)}}">
               <view class="ediFile" data-nextPage="editFile" catchTap="nextPage" data-file="{{item.scheduleAccessory}}">
                 编辑
               </view>
@@ -140,7 +141,7 @@
         </view>
       </picker>
       <view class="buttonGroup" data-value=0 onTap="confirmAtten" a:if="{{!(organizer == pemissions)&&isRepeatable == 0}}">
-        <text class="iconbucanjia2 iconfont" a:if="{{currentParStaus == 0}}" ></text>
+        <text class="iconbucanjia2 iconfont" a:if="{{currentParStaus == 0}}"></text>
         <text class="iconbucanjia3 iconfont" a:else></text>
         <text class="{{currentParStaus == 0?'red': ''}}">不参加</text>
       </view>