修改问题

PageComponents/scheduleList/scheduleList.js

@@ -47,9 +47,9 @@ create.Component({
       this.getDate();
     }
   },
-  didUnmount() {},
+  didUnmount() { },
   methods: {
-    getDate: throttle(function(e) {
+    getDate: throttle(function (e) {
       let data = {
         startTime: "2020-01-01 00:00:00",
         endTime: "2025-12-30 23:59:59"
@@ -79,7 +79,7 @@ create.Component({
         );
       });
     }, 1000),
-    nextDetail: throttle(function(e) {
+    nextDetail: throttle(function (e) {
       let item = e.target.dataset.item;
       dd.navigateTo({
         url: `./../meetingDetail/meetingDetail?scheduleItem=${JSON.stringify(
@@ -204,8 +204,8 @@ create.Component({
                 item.recurrenceModel.startTime;
               let endTime = new Date(
                 getFormatDate(item2, "yyyyMMdd") +
-                  " " +
-                  item.recurrenceModel.startTime
+                " " +
+                item.recurrenceModel.startTime
               );
               endTime.setMinutes(
                 endTime.getMinutes() + item.recurrenceModel.duration
@@ -240,7 +240,7 @@ create.Component({
             );
           }
         });
-        scheduleMap.forEach(function(value, key, map) {
+        scheduleMap.forEach(function (value, key, map) {
           scheduleList.push(value);
         });
         return scheduleList;
@@ -322,9 +322,9 @@ create.Component({
               thisDayEndTime: AllScheduleList[y].endTime.slice(11, 16),
               isBeOverdue:
                 new Date().getTime() >
-                new Date(
-                  AllScheduleList[y].endTime.replace(/-/g, "/")
-                ).getTime()
+                  new Date(
+                    AllScheduleList[y].endTime.replace(/-/g, "/")
+                  ).getTime()
                   ? true
                   : false
             });
@@ -359,9 +359,9 @@ create.Component({
                 duration: count + 1,
                 isBeOverdue:
                   new Date().getTime() >
-                  new Date(
-                    AllScheduleList[y].endTime.replace(/-/g, "/")
-                  ).getTime()
+                    new Date(
+                      AllScheduleList[y].endTime.replace(/-/g, "/")
+                    ).getTime()
                     ? true
                     : false
               });
@@ -378,7 +378,7 @@ create.Component({
         value: year
       });
       let thisDay = new Date().toLocaleDateString();
-      DateMap.forEach(function(value, key, map) {
+      DateMap.forEach(function (value, key, map) {
         if (
           new Date(key).getDay() === 0 &&
           that.count(
@@ -404,7 +404,7 @@ create.Component({
               type: "week",
               value: `第${listWeek}周，${rangeMonth1 + 1}月${rangeDay1}日 - ${
                 rangeMonth2 == rangeMonth1 ? "" : rangeMonth2 + 1 + "月"
-              }${rangeDay2}日`,
+                }${rangeDay2}日`,
               dayStr: key
             });
           }
@@ -420,7 +420,7 @@ create.Component({
               type: "week",
               value: `第${listWeek}周，${rangeMonth1 + 1}月${rangeDay1}日 - ${
                 rangeMonth2 == rangeMonth1 ? "" : rangeMonth2 + 1 + "月"
-              }${rangeDay2}日`,
+                }${rangeDay2}日`,
               dayStr: key
             });
           }
@@ -442,7 +442,7 @@ create.Component({
             type: "week",
             value: `第${listWeek}周，${rangeMonth1 + 1}月${rangeDay1}日 - ${
               rangeMonth2 == rangeMonth1 ? "" : rangeMonth2 + 1 + "月"
-            }${rangeDay2}日`,
+              }${rangeDay2}日`,
             dayStr: key
           });
         }

components/list/list.js

@@ -49,7 +49,6 @@ Component({
         this.setData({
           comSelectList: [-1]
         })
-        this.props.onCompelete([-1])
       }
       else if (!this.props.multiple) {
         this.setData({

pages/createMeeting/createMeeting.acss

@@ -9,7 +9,8 @@ page {
 .icon {
     vertical-align: middle;
     color: #0a0a0a;
-    font-size: 34rpx;
+    font-size: 40rpx;
+    line-height: 50rpx;
 }
 
 input {
@@ -18,7 +19,7 @@ input {
 }
 
 .createTitle {
-    padding: 28rpx 36rpx 16rpx;
+    padding: 28rpx 32rpx 16rpx;
 }
 
 .title {
@@ -60,22 +61,21 @@ input {
 
 .place, .time, .participator, .meetingWay {
     display: flex;
-    padding: 0 36rpx;
+    padding: 0 32rpx;
     font-family: PingFangSC-Regular;
     color: #191F25;
     overflow: hidden;
-    margin-top: 54rpx;
+    margin-top: 48rpx;
 }
 
 .place>.icon, .time>.icon, .participator>.icon, .meetingWay>.icon {
-    margin-right: 26rpx;
+    margin-right: 24rpx;
 }
 
 .noPlace, .hasplace, .timeText, .participatorText, .noWay, .hasWay {
-    height: 38rpx;
     font-size: 34rpx;
     width: 100%;
-    line-height: 38rpx;
+    line-height: 1.5;
 }
 
 .hasplace, .timeText {
@@ -85,7 +85,7 @@ input {
 }
 
 .placeContaint, .timeContaint, .participatorContaint, .meetingWayContent {
-    width: 678rpx;
+    width: 622rpx;
     display: flex;
     justify-content: space-between;
 }
@@ -128,7 +128,6 @@ input {
 .participatorText {
     display: flex;
     align-items: center;
-    height: 38rpx;
 }
 
 .participatorListBottom {
@@ -233,4 +232,18 @@ input {
 
 .footNavTop .devider {
     margin: 0!important;
+}
+
+.meetingWayImageUrl {
+    flex-grow: 0;
+    width: 40rpx;
+    height: 40rpx;
+    margin-right: 24rpx;
+}
+
+.meetingWayImageUrl>image {
+    margin-top: 5rpx;
+    vertical-align: top;
+    width: 100%;
+    height: 100%;
 }
\ No newline at end of file

pages/createMeeting/createMeeting.axml

@@ -2,8 +2,8 @@
     <!-- title remark 标题 描述 -->
     <view class="createTitle">
         <view class="title">
-            <input placeholder-class="placeholder" placeholder="{{placeholder}}" class="text" onInput="onInput" data-type="title" value="{{title}}" focus="{{true}}"/>
-            <view class="icon iconfont iconicon_description1 {{remark ? '' : 'noValueIcon'}}" onTap="addRemark">
+            <input placeholder-class="placeholder" placeholder="{{placeholder}}" class="text" onInput="onInput" data-type="title" value="{{title}}" focus="{{false}}"/>
+            <view class="icon iconfont iconicon_description1" onTap="addRemark" a:if="{{!isShowRemark}}">
             </view>
         </view>
         <view class="remark" a:if="{{isShowRemark}}">
@@ -89,7 +89,10 @@
     </view>
     <!-- meetingWay 会议方式 -->
     <view class="meetingWay">
-        <view class="iconicon_meet iconfont icon {{comListData.meetingWayModelId ? '' : 'noValueIcon'}}">
+        <view a:if="{{comListData.meetingWayModelId === null}}" class="iconicon_meet iconfont icon noValueIcon">
+        </view>
+        <view a:else class="meetingWayImageUrl">
+            <image mode="scaleToFill" src="{{comListData.meetingWayList[comListData.meetingWayModelId].imageUrl}}"/>
         </view>
         <view class="meetingWayContent">
             <view class="noWay" a:if="{{comListData.meetingWayModelId == null}}" catchTap="showPopup" data-type='meetingWayModel'>

pages/createMeeting/createMeeting.js

@@ -80,9 +80,8 @@ create.Page({
   },
   // 添加描述
   addRemark() {
-    let isShowRemark = !this.data.isShowRemark
     this.setData({
-      isShowRemark: isShowRemark
+      isShowRemark: true
     })
     this.update()
 

pages/index/index.axml

-版本175
+版本176
 {{tabBarIndex}}
 <view a:if="{{tabBarIndex === '0'}}">
     <my-dynamic>

pages/index/index.js

@@ -11,6 +11,9 @@ create.Page({
     this.setData({
       iconDay: iconDay
     });
+    dd.setNavigationBar({
+      title: '动态'
+    })
   },
   onShow() {
     setTimeout(res => {
@@ -22,6 +25,18 @@ create.Page({
     this.setData({
       tabBarIndex: e.currentTarget.dataset.tabbar
     });
+    let title = '动态'
+    switch (e.currentTarget.dataset.tabbar) {
+      case '0':
+        title = '动态';
+        break;
+      case '1':
+        title = '日程';
+        break;
+    }
+    dd.setNavigationBar({
+      title: title
+    })
   },
   createMeeting() {
     // isClicked(this)

pages/meetingDetail/meetingDetail.acss

@@ -138,7 +138,9 @@ page {
 .icon {
     vertical-align: middle;
     color: #0a0a0a;
-    font-size: 34rpx;
+    font-size: 40rpx;
+    line-height: 50rpx;
+    line-height: 50rpx;
 }
 
 input {
@@ -149,7 +151,7 @@ input {
 }
 
 .createTitle {
-    padding: 14rpx 36rpx 16rpx;
+    padding: 14rpx 32rpx 16rpx;
     position: relative;
     min-height: 90rpx;
     overflow: hidden;
@@ -199,22 +201,21 @@ input {
 
 .place, .time, .participator, .meetingWay {
     display: flex;
-    padding: 0 36rpx;
+    padding: 0 32rpx;
     font-family: PingFangSC-Regular;
     color: #191F25;
     overflow: hidden;
-    margin-top: 54rpx;
+    margin-top: 48rpx;
 }
 
 .place>.icon, .time>.icon, .participator>.icon, .meetingWay>.icon {
-    margin-right: 26rpx;
+    margin-right: 24rpx;
 }
 
 .noPlace, .hasplace, .timeText, .participatorText, .noWay, .hasWay {
-    height: 38rpx;
     font-size: 34rpx;
     width: 100%;
-    line-height: 38rpx;
+    line-height: 1.5;
 }
 
 .hasplace, .timeText {
@@ -224,7 +225,7 @@ input {
 }
 
 .placeContaint, .timeContaint, .participatorContaint, .meetingWayContent {
-    width: 678rpx;
+    width: 622rpx;
     display: flex;
     justify-content: space-between;
 }
@@ -267,7 +268,6 @@ input {
 .participatorText {
     display: flex;
     align-items: center;
-    height: 38rpx;
 }
 
 .participatorListBottom {
@@ -545,4 +545,18 @@ input {
 .metingDetail {
     overflow: hidden;
     height: 100vh;
+}
+
+.meetingWayImageUrl {
+    flex-grow: 0;
+    width: 40rpx;
+    height: 40rpx;
+    margin-right: 24rpx;
+}
+
+.meetingWayImageUrl>image {
+    margin-top: 5rpx;
+    vertical-align: top;
+    width: 100%;
+    height: 100%;
 }
\ No newline at end of file

pages/meetingDetail/meetingDetail.axml

@@ -21,12 +21,12 @@
       <view class="permissionContant">
         <view class="createTitle">
           <view class="title">
-            <input placeholder-class="placeholder" placeholder="{{placeholder}}" class="text" onInput="onInput" data-type="title" data-selectType="common" value="{{title}}" onConfirm="onConfirm" focus="{{true}}"/>
-            <view class="icon iconfont iconicon_description1 {{remark ? '' : 'noValueIcon'}}" onTap="addRemark">
+            <input placeholder-class="placeholder" placeholder="{{placeholder}}" class="text" onInput="onInput" data-type="title" data-selectType="common" value="{{title}}" onConfirm="onConfirm" focus="{{false}}" onBlur="onBlur"/>
+            <view class="icon iconfont iconicon_description1" a:if="{{!isShowRemark}}" onTap="addRemark">
             </view>
           </view>
           <view class="remark" a:if="{{isShowRemark}}">
-            <input placeholder-class="placeholder" placeholder="请添加描述" class="text" onInput="onInput" data-type="remark" value="{{remark}}" onConfirm="onConfirm"/>
+            <input placeholder-class="placeholder" placeholder="请添加描述" class="text" onInput="onInput" data-type="remark" value="{{remark}}" onConfirm="onConfirm" onBlur="onBlur" focus="{{false}}"/>
           </view>
         </view>
         <view class="permission" a:if="{{currentPeople != organizer}}">
@@ -120,7 +120,10 @@
       <view class="permissionContant" a:if="{{comListData.meetingWayList[comListData.meetingWayModelId].text || currentPeople === organizer}}">
         <!--<view class="iconicon_attender iconfont icon {{$data.participatorList.length>1 ? '' : 'noValueIcon'}}"></view> -->
         <view class="meetingWay">
-          <view class="iconicon_meet iconfont icon {{comListData.meetingWayModelId ? '' : 'noValueIcon'}}">
+          <view a:if="{{comListData.meetingWayModelId === null}}" class="iconicon_meet iconfont icon noValueIcon">
+          </view>
+          <view a:else class="meetingWayImageUrl">
+            <image mode="scaleToFill" src="{{comListData.meetingWayList[comListData.meetingWayModelId].imageUrl}}"/>
           </view>
           <view class="meetingWayContent">
             <view class="noWay" a:if="{{comListData.meetingWayModelId == null}}" catchTap="showPopup" data-type='meetingWayModel'>
@@ -142,7 +145,8 @@
     <!-- 底部导航栏 -->
     <view class="footNav">
       <view class="footNavTop" a:if="{{!isExpand}}">
-        <view class="originStaus" a:if="{{confirmAttendance === null}}">
+        <!-- 待定状态 -->
+        <view class="originStaus" a:if="{{confirmAttendance === -9}}">
           <view catchTap="participate">
             <text class="iconfont iconicon_Agreed1"></text>
             <text>参加</text></view>
@@ -152,6 +156,7 @@
             <text>不参加</text>
           </view>
         </view>
+        <!--参加状态-->
         <view class="participateStatus" a:if="{{confirmAttendance === 1}}">
           <view class="remind" catchTap="showPopup" data-type="aheadTime">
             <text class="iconfont iconicon_time1"></text>
@@ -164,10 +169,13 @@
             <text class="iconfont iconicon_share"></text>
           </view>
           <text class="devider"></text>
-          <view class="participate" catchTap="noParticipate">
+          <view class="participate" catchTap="initialState">
             <text class="iconfont iconicon_Agreed1"></text>
-            <text>参加</text></view></view>
-        <view class="noParticipateStatus" a:if="{{confirmAttendance === 0}}" catchTap="participate">
+            <text>参加</text>
+          </view>
+        </view>
+        <!--不参加状态  -->
+        <view class="noParticipateStatus" a:if="{{confirmAttendance === 0}}" catchTap="initialState">
           <text class="iconfont iconicon_noAgreed1"></text>
           <text>不参加</text>
         </view>

pages/meetingDetail/meetingDetail.js

@@ -210,9 +210,8 @@ create.Page({
   },
   // 添加描述
   addRemark() {
-    let isShowRemark = !this.data.isShowRemark
     this.setData({
-      isShowRemark: isShowRemark
+      isShowRemark: true
     })
     this.update()
 
@@ -810,38 +809,42 @@ create.Page({
     let modifyContent = ''
     switch (value) {
       case 'title':
-        let dataTitle = {
-          title: this.data.title,
-          modifyModel: modifyModel,
-          modifyContent: 'title'
-        }
-        this.modifySchedule(dataTitle).catch(err => {
-          this.setData({
-            title: this.$store.data.originalData.title,
-            'conToastData.showToast': true,
-            'conToastData.title': ' 网络异常'
+        if (this.data.title !== this.$store.data.originalData.title) {
+          let dataTitle = {
+            title: this.data.title,
+            modifyModel: modifyModel,
+            modifyContent: 'title'
+          }
+          this.modifySchedule(dataTitle).catch(err => {
+            this.setData({
+              title: this.$store.data.originalData.title,
+              'conToastData.showToast': true,
+              'conToastData.title': ' 网络异常'
+            })
+          }).then(res => {
+            this.$store.data.originalData.title = this.data.title
+            this.update()
           })
-        }).then(res => {
-          this.$store.data.originalData.title = this.data.title
-          this.update()
-        })
+        }
         break
       case 'remark':
-        let dataRemark = {
-          remark: this.data.remark,
-          modifyModel: modifyModel,
-          modifyContent: 'remark'
-        }
-        this.modifySchedule(dataRemark).catch(err => {
-          this.setData({
-            remark: this.$store.data.originalData.remark,
-            'conToastData.showToast': true,
-            'conToastData.title': ' 网络异常'
+        if (this.data.remark !== this.$store.data.originalData.remark) {
+          let dataRemark = {
+            remark: this.data.remark,
+            modifyModel: modifyModel,
+            modifyContent: 'remark'
+          }
+          this.modifySchedule(dataRemark).catch(err => {
+            this.setData({
+              remark: this.$store.data.originalData.remark,
+              'conToastData.showToast': true,
+              'conToastData.title': ' 网络异常'
+            })
+          }).then(res => {
+            this.$store.data.originalData.remark = this.data.remark
+            this.update()
           })
-        }).then(res => {
-          this.$store.data.originalData.remark = this.data.remark
-          this.update()
-        })
+        }
         break
       case 'meeting_way':
         let dataWay = {
@@ -1151,6 +1154,28 @@ create.Page({
       })
     }
   },
+  initialState() {
+    let data = {
+      templateId: this.data.scheduleItem.scheduleTemplateId,
+      planDate: this.data.scheduleItem.planDate,
+      scheduleId: this.data.scheduleItem.id,
+      value: -9,
+      type: 'only'
+    }
+    if (this.data.repeatable === 1) {
+      data.type = 'all'
+
+    } else {
+      data.type = 'only'
+    }
+    isParticipate(data).then(res => {
+      if (res.data.code === 0) {
+        this.setData({
+          confirmAttendance: -9
+        })
+      }
+    })
+  },
   // 页面卸载
   onUnload() {
     // 页面被关闭

pages/outLookContact/outLookContact.acss

@@ -75,23 +75,22 @@ input {
     bottom: 0;
     left: 0;
     right: 0;
-    padding: 16rpx 32rpx;
+    padding: 32rpx;
     background: #fff;
     box-shadow: 0 -2px 4px 0 rgba(0, 0, 0, 0.04);
-    position: fixed;
     bottom: 0;
 }
 
 .button {
     font-family: PingFangSC-Regular;
     width: 686rpx;
-    height: 96rpx;
-    background: #4D88FF;
+    height: 72rpx;
+    background: #EA0C28;
     border-radius: 48rpx;
-    font-size: 34rpx;
+    font-size: 32rpx;
     color: #FFFFFF;
     text-align: center;
-    line-height: 96rpx;
+    line-height: 72rpx;
 }
 
 .conflict {