Skip to content

S
schedule
Commit c3fcb0ac by fengzhaoyu
Options

feat 加loading

parent dbb96ef0
Showing with 178 additions and 145 deletions
PageComponents/myDynamic/myDynamic.acss
@import "../../template/affairBlank/index.acss"; @import "../../template/affairBlank/index.acss";
@import "../../template/loading/loading.acss";
.dynamicBox { .dynamicBox {
width: 100%; width: 100%;
overflow: hidden; overflow: hidden;
......
PageComponents/myDynamic/myDynamic.axml
<import src="../../template/affairBlank/index.axml"/> <import src="../../template/affairBlank/index.axml"/>
<view class="{{isStopBodyScroll ? 'scroll-lock' : ''}}" onTap="closeSwipe" onTouchStart="closeSwipe" onTouchMove="closeSwipe" onTouchEnd="closeSwipe"> <import src="../../template/loading/loading.axml"/>
<block a:if="{{!loading}}"> <view class="{{isStopBodyScroll ? 'scroll-lock' : ''}}" onTap="closeSwipe" onTouchStart="closeSwipe">
<scroll-view a:if="{{dynamicList.length > 0}}" scroll-y="{{true}}" class="dynamicBox" onScrollToLower="onScrollToLower"> <template is="loading" a:if="{{loading}}"/>
<view a:if="{{dynamicList.length !== 0}}" scroll-y="{{true}}" class="dynamicBox" onScrollToLower="onScrollToLower">
<view class="dynamicList"> <view class="dynamicList">
<swipe onSetBodyDisableScroll="setBodyDisableScroll" rightWidth="{{ 78 }}" leftWidth="{{ 0 }}" a:for="{{dynamicList}}" class="dynamicContent"> <swipe onSetBodyDisableScroll="setBodyDisableScroll" rightWidth="{{ 78 }}" leftWidth="{{ 0 }}" a:for="{{dynamicList}}" class="dynamicContent">
<view class="dynamicDetails"> <view class="dynamicDetails">
...@@ -32,11 +33,9 @@ ...@@ -32,11 +33,9 @@
</swipe> </swipe>
</view> </view>
</scroll-view> </scroll-view>
<view class="noDate" a:else> <view class="noDate" a:if="{{dynamicList.length == 0}}">
<template is="affair-placeholder" data="{{title: '展示安排的所有动态', tip: '实时同步所有事件的最新动态，便于随时处理工作内容'}}"/> <template is="affair-placeholder" data="{{title: '展示安排的所有动态', tip: '实时同步所有事件的最新动态，便于随时处理工作内容'}}"/>
</view> </view>
</block> </block>
<view class="noDate" a:else>
正在加载
</view> </view>
</view> </view>
\ No newline at end of file
PageComponents/myDynamic/myDynamic.js
...@@ -15,8 +15,9 @@ create.Component({ ...@@ -15,8 +15,9 @@ create.Component({
dynamicList: [], dynamicList: [],
current: 1, current: 1,
pages: 1, pages: 1,
size: 10 size: 10,
noData: false,
loading: true
}, },
props: {}, props: {},
didMount() { didMount() {
...@@ -103,8 +104,11 @@ create.Component({ ...@@ -103,8 +104,11 @@ create.Component({
this.setData({ this.setData({
current: res.data.data.current, current: res.data.data.current,
pages: res.data.data.pages, pages: res.data.data.pages,
loading: false
}); });
this.setData({
loading: false
})
}); });
}, },
changeCollection(e) { changeCollection(e) {
......
PageComponents/scheduleList/scheduleList.acss
@import "../../template/loading/loading.acss";
.index { .index {
background: #FFFFFF; background: #FFFFFF;
} }
......
PageComponents/scheduleList/scheduleList.axml
<view class="scheduleHeader"> <import src="../../template/loading/loading.axml"/>
<view a:if="{{!loading}}">
<view class="scheduleHeader">
<view>2020年3月</view> <view>2020年3月</view>
<view onTap="changesidebar" class="headerIcon"> <view onTap="changesidebar" class="headerIcon">
<text class="iconfont iconicon_app1"> <text class="iconfont iconicon_app1">
...@@ -6,8 +8,8 @@ ...@@ -6,8 +8,8 @@
<view> <view>
</view> </view>
</view> </view>
</view> </view>
<scroll-view class="indexScrollView" scroll-y="{{true}}" style="background: #FFFFFF" lower-threshold="1000" onScrollToLower="lower" scroll-into-view="{{todayStr}}"> <scroll-view class="indexScrollView" scroll-y="{{true}}" style="background: #FFFFFF" lower-threshold="1000" onScrollToLower="lower" scroll-into-view="{{todayStr}}">
<block a:for="{{scheduleList}}" a:for-item="scheduleYearList"> <block a:for="{{scheduleList}}" a:for-item="scheduleYearList">
<block a:for="{{scheduleYearList}}"> <block a:for="{{scheduleYearList}}">
<block a:if="{{item.type == 'year'}}"> <block a:if="{{item.type == 'year'}}">
...@@ -26,15 +28,6 @@ ...@@ -26,15 +28,6 @@
{{item.value}} {{item.value}}
</view> </view>
</view> </view>
</block>
<block a:elif="{{item.type == 'day'}}">
<view class="date">
<view class="dateTime {{item.isThisDay}}">
<view>
{{item.value.week}}
</view>
<text>{{item.value.day}}</text>
</view>
<view class="dataSchedule"> <view class="dataSchedule">
<view a:for="{{item.value.value}}" a:for-item="item2" data-item="{{item2}}" class="{{ item2.isBeOverdue ? 'overdue' : item2.confirmAttendance === 0 ? 'cancel' : '' }}" onTap="nextDetail"> <view a:for="{{item.value.value}}" a:for-item="item2" data-item="{{item2}}" class="{{ item2.isBeOverdue ? 'overdue' : item2.confirmAttendance === 0 ? 'cancel' : '' }}" onTap="nextDetail">
<view class="dataScheduleName"> <view class="dataScheduleName">
...@@ -48,7 +41,6 @@ ...@@ -48,7 +41,6 @@
</view> </view>
</view> </view>
</view> </view>
</view>
</block> </block>
<block a:elif="{{item.type == 'today'}}"> <block a:elif="{{item.type == 'today'}}">
<view class="date" id="{{item.value.dateStr}}"> <view class="date" id="{{item.value.dateStr}}">
...@@ -72,7 +64,6 @@ ...@@ -72,7 +64,6 @@
</view> </view>
</view> </view>
</view> </view>
</view>
</block> </block>
<block a:elif="{{item.type == 'thisDay'}}"> <block a:elif="{{item.type == 'thisDay'}}">
<view class="date" id="{{item.value.dateStr}}"> <view class="date" id="{{item.value.dateStr}}">
...@@ -93,8 +84,8 @@ ...@@ -93,8 +84,8 @@
</block> </block>
</block> </block>
</block> </block>
</scroll-view> </scroll-view>
<popup show="{{show}}" onClose="closePop" position="left"> <popup show="{{show}}" onClose="closePop" position="left">
<view class="sidebarContent" catchTap="preventSort"> <view class="sidebarContent" catchTap="preventSort">
<view class="sidebarLogo"> <view class="sidebarLogo">
<view> <view>
...@@ -184,4 +175,6 @@ ...@@ -184,4 +175,6 @@
</view> </view>
</view> </view>
</view> </view>
</popup> </popup>
\ No newline at end of file </view>
<template is="loading" a:if="{{loading}}"/>
\ No newline at end of file
PageComponents/scheduleList/scheduleList.js
...@@ -23,7 +23,8 @@ create.Component({ ...@@ -23,7 +23,8 @@ create.Component({
show: false, show: false,
scrollHeight: "", scrollHeight: "",
timeStamp: "", timeStamp: "",
userMsg: {} userMsg: {},
loading: true
}, },
props: {}, props: {},
didMount() { didMount() {
...@@ -45,15 +46,16 @@ create.Component({ ...@@ -45,15 +46,16 @@ create.Component({
this.getDate(); this.getDate();
} }
}, },
didUnmount() {}, didUnmount() { },
methods: { methods: {
getDate: throttle(function(e) { getDate: throttle(function (e) {
let data = { let data = {
startTime: "2020-01-01 00:00:00", startTime: "2020-01-01 00:00:00",
endTime: "2025-12-30 23:59:59" endTime: "2025-12-30 23:59:59"
}; };
let that = this; let that = this;
getHomeUserSchedule1(data).then(res => { getHomeUserSchedule1(data).then(res => {
console.log(this)
that.setData( that.setData(
{ {
response: res.data.data response: res.data.data
...@@ -71,13 +73,18 @@ create.Component({ ...@@ -71,13 +73,18 @@ create.Component({
scheduleList: scheduleList, scheduleList: scheduleList,
todayStr: finalDate.toLocaleDateString(), todayStr: finalDate.toLocaleDateString(),
thisYear: year, thisYear: year,
maxYear: year maxYear: year,
loading: false
}); });
} }
); );
that.setData({
loading: false
})
}); });
}, 1000), }, 1000),
nextDetail: throttle(function(e) { nextDetail: throttle(function (e) {
let item = e.target.dataset.item; let item = e.target.dataset.item;
dd.navigateTo({ dd.navigateTo({
url: `./../meetingDetail/meetingDetail?scheduleItem=${JSON.stringify( url: `./../meetingDetail/meetingDetail?scheduleItem=${JSON.stringify(
...@@ -233,7 +240,7 @@ create.Component({ ...@@ -233,7 +240,7 @@ create.Component({
); );
} }
}); });
scheduleMap.forEach(function(value, key, map) { scheduleMap.forEach(function (value, key, map) {
scheduleList.push(value); scheduleList.push(value);
}); });
return scheduleList; return scheduleList;
...@@ -305,7 +312,7 @@ create.Component({ ...@@ -305,7 +312,7 @@ create.Component({
// 第一个月的第一天 // 第一个月的第一天
let listWeek = new Date(year, 0, 1).getDay() === 0 ? 0 : 1; let listWeek = new Date(year, 0, 1).getDay() === 0 ? 0 : 1;
let thisDay = new Date().toLocaleDateString(); let thisDay = new Date().toLocaleDateString();
DateMap.forEach(function(value, key, map) { DateMap.forEach(function (value, key, map) {
const keyDate = new Date(key); const keyDate = new Date(key);
if (keyDate.getDay() === 0) { if (keyDate.getDay() === 0) {
let rangeYear1 = keyDate.getFullYear(); let rangeYear1 = keyDate.getFullYear();
......
api/http.js
...@@ -15,11 +15,19 @@ export default function http(data) { ...@@ -15,11 +15,19 @@ export default function http(data) {
success: function (res) { success: function (res) {
if (res.data.code == 0) { if (res.data.code == 0) {
resolve(res); resolve(res);
} else {
dd.alert({
content: '网络异常',
buttonText: '确定'
})
} }
}, },
fail: function (res) { fail: function (res) {
dd.alert({
content: '网络异常',
buttonText: '确定'
})
rejects(res) rejects(res)
console.log(res)
} }
}) })
}) })
......
assests/all.png
assests/all.png

888 Bytes | W: | H:

assests/all.png

962 Bytes | W: | H:

assests/all.png
assests/all.png
assests/all.png
assests/all.png
  • 2-up
  • Swipe
  • Onion skin
assests/docx.png
assests/docx.png

1.25 KB | W: | H:

assests/docx.png

939 Bytes | W: | H:

assests/docx.png
assests/docx.png
assests/docx.png
assests/docx.png
  • 2-up
  • Swipe
  • Onion skin
assests/image.png
assests/image.png

1.25 KB | W: | H:

assests/image.png

1.58 KB | W: | H:

assests/image.png
assests/image.png
assests/image.png
assests/image.png
  • 2-up
  • Swipe
  • Onion skin
assests/mp4.png
assests/mp4.png

974 Bytes | W: | H:

assests/mp4.png

902 Bytes | W: | H:

assests/mp4.png
assests/mp4.png
assests/mp4.png
assests/mp4.png
  • 2-up
  • Swipe
  • Onion skin
assests/pdf.png
assests/pdf.png

1.52 KB | W: | H:

assests/pdf.png

1.95 KB | W: | H:

assests/pdf.png
assests/pdf.png
assests/pdf.png
assests/pdf.png
  • 2-up
  • Swipe
  • Onion skin
assests/xlsx.png
assests/xlsx.png

1.52 KB | W: | H:

assests/xlsx.png

982 Bytes | W: | H:

assests/xlsx.png
assests/xlsx.png
assests/xlsx.png
assests/xlsx.png
  • 2-up
  • Swipe
  • Onion skin
assests/zip.png
assests/zip.png

715 Bytes | W: | H:

assests/zip.png

1 KB | W: | H:

assests/zip.png
assests/zip.png
assests/zip.png
assests/zip.png
  • 2-up
  • Swipe
  • Onion skin
components/fileList/fileList.acss
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
} }
.task-list { .task-list {
border: 1rpx solid rgba(245, 246, 247, 1); border: 1rpx solid rgba(10, 10, 10, 0.14);
border-radius: 16rpx; border-radius: 16rpx;
border-radius: 16rpx; border-radius: 16rpx;
padding: 24rpx 22rpx 0 22rpx; padding: 24rpx 22rpx 0 22rpx;
...@@ -107,41 +107,29 @@ ...@@ -107,41 +107,29 @@
} }
.pdf { .pdf {
background: url(../../assests/pdf.png) center /100% 100%; background: url(../../assests/pdf.png) center /100% 100% !important;
} }
.png, .jpg, .svg, .jpeg { .png, .jpg, .svg, .jpeg {
background: url(../../assests/image.png) center /100% 100%; background: url(../../assests/image.png) center /100% 100% !important;
} }
.docx { .docx, .txt, .doc, .pages, .wps {
background: url(../../assests/docx.png) center /100% 100%; background: url(../../assests/docx.png) center /100% 100% !important;
} }
.mov { .mov, .mp4 {
background: url(../../assests/mp4.png) center /100% 100%; background: url(../../assests/mp4.png) center /100% 100% !important;
} }
.mp4 { .pptx, .ppt, .key {
background: url(../../assests/mp4.png) center /100% 100%; background: url(../../assests/ppt.png) center /100% 100% !important;
} }
.ppt { .xlsx, .numbers {
background: url(../../assests/ppt.png) center /100% 100%; background: url(../../assests/xlsx.png) center /100% 100% !important;
} }
.pptx { .zip, .rar {
background: url(../../assests/ppt.png) center /100% 100%; background: url(../../assests/zip.png) center /100% 100% !important;
}
.pdf {
background: url(../../assests/pdf.png) center /100% 100%;
}
.xlsx {
background: url(../../assests/xlsx.png) center /100% 100%;
}
.zip {
background: url(../../assests/zip.png) center /100% 100%;
} }
\ No newline at end of file
components/taskList/taskList.acss
@import "../../template/avater/index.acss"; @import "../../template/avater/index.acss";
@import "../../template/checkbox/index.acss"; @import "../../template/checkbox/index.acss";
.task-list { .task-list {
border: 1rpx solid rgba(245, 246, 247, 1); border: 1rpx solid rgba(10, 10, 10, 0.14);
border-radius: 16rpx; border-radius: 16rpx;
border-radius: 16rpx; border-radius: 16rpx;
padding: 14rpx 16rpx 0; padding: 14rpx 16rpx 0;
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
.task-list>.task-box { .task-list>.task-box {
background: rgba(255, 255, 255, 1); background: rgba(255, 255, 255, 1);
border-radius: 8rpx; border-radius: 8rpx;
box-shadow: 0 0 8rpx 0rpx rgba(0, 0, 0, 0.04); box-shadow: 0 0 8rpx 0rpx rgba(0, 0, 0, 0.14);
padding: 0 16rpx; padding: 0 16rpx;
height: 80rpx; height: 80rpx;
color: rgba(27, 38, 61, 1); color: rgba(27, 38, 61, 1);
......
pages/createMeeting/createMeeting.acss
...@@ -9,7 +9,7 @@ page { ...@@ -9,7 +9,7 @@ page {
.icon { .icon {
vertical-align: middle; vertical-align: middle;
color: #0a0a0a; color: #0a0a0a;
font-size: 40rpx; font-size: 36rpx;
line-height: 50rpx; line-height: 50rpx;
} }
...@@ -43,9 +43,8 @@ input { ...@@ -43,9 +43,8 @@ input {
.remark>input { .remark>input {
padding-left: 0; padding-left: 0;
width: 100%; width: 100%;
opacity: 0.72;
font-size: 28rpx; font-size: 28rpx;
color: rgba(3, 3, 3, 1) color: rgba(10, 10, 10, 0.4)
} }
.placeholder { .placeholder {
...@@ -94,6 +93,11 @@ input { ...@@ -94,6 +93,11 @@ input {
color: #9599A2; color: #9599A2;
} }
.close {
font-size: 32rpx;
color: rgba(10, 10, 10, 0.4)
}
.repeatModal { .repeatModal {
color: #191F25; color: #191F25;
margin-top: 24rpx; margin-top: 24rpx;
...@@ -196,8 +200,8 @@ input { ...@@ -196,8 +200,8 @@ input {
text-align: center; text-align: center;
line-height: 78rpx; line-height: 78rpx;
font-size: 50rpx; font-size: 50rpx;
height: 80rpx; height: 78rpx;
border: 1rpx solid #F6F6F6; border: 1rpx solid rgba(10, 10, 10, 0.14);
border-radius: 50%; border-radius: 50%;
color: #BBBEC5; color: #BBBEC5;
} }
......
pages/index/index.axml
<!--<<<<<<< Updated upstream<view a:if="{{tabBarIndex === '0'}}">
=======<view style="position:absolute"></view> -->
<view a:if="{{$data.tabBarIndex === '0'}}"> <view a:if="{{$data.tabBarIndex === '0'}}">
<!-- >>>>>>> Stashed changes -->
<my-dynamic> <my-dynamic>
</my-dynamic> </my-dynamic>
</view> </view>
......
pages/meetingDetail/meetingDetail.acss
...@@ -143,7 +143,7 @@ page { ...@@ -143,7 +143,7 @@ page {
.icon { .icon {
vertical-align: middle; vertical-align: middle;
color: #0a0a0a; color: #0a0a0a;
font-size: 40rpx; font-size: 36rpx;
line-height: 50rpx; line-height: 50rpx;
line-height: 50rpx; line-height: 50rpx;
} }
...@@ -184,9 +184,8 @@ input { ...@@ -184,9 +184,8 @@ input {
.remark>input { .remark>input {
padding-left: 0; padding-left: 0;
width: 100%; width: 100%;
opacity: 0.72;
font-size: 28rpx; font-size: 28rpx;
color: rgba(3, 3, 3, 1) color: rgba(10, 10, 10, 0.4)
} }
.placeholder { .placeholder {
...@@ -239,6 +238,11 @@ input { ...@@ -239,6 +238,11 @@ input {
color: #9599A2; color: #9599A2;
} }
.close {
font-size: 32rpx;
color: rgba(10, 10, 10, 0.4)
}
.repeatModal { .repeatModal {
color: #191F25; color: #191F25;
margin-top: 24rpx; margin-top: 24rpx;
...@@ -341,8 +345,8 @@ input { ...@@ -341,8 +345,8 @@ input {
text-align: center; text-align: center;
line-height: 78rpx; line-height: 78rpx;
font-size: 50rpx; font-size: 50rpx;
height: 80rpx; height: 78rpx;
border: 1rpx solid #F6F6F6; border: 1rpx solid rgba(10, 10, 10, 0.14);
border-radius: 50%; border-radius: 50%;
color: #BBBEC5; color: #BBBEC5;
} }
...@@ -385,7 +389,7 @@ input { ...@@ -385,7 +389,7 @@ input {
.originStaus>view>.iconfont { .originStaus>view>.iconfont {
margin-right: 12rpx; margin-right: 12rpx;
color: #A9ACB4; color: rgba(10, 10, 10, 0.4);
vertical-align: middle; vertical-align: middle;
} }
...@@ -456,6 +460,7 @@ input { ...@@ -456,6 +460,7 @@ input {
align-items: center; align-items: center;
justify-content: flex-end; justify-content: flex-end;
width: 100%; width: 100%;
color: rgba(10, 10, 10, 0.4);
} }
.footerBottom>view { .footerBottom>view {
...@@ -549,3 +554,26 @@ input { ...@@ -549,3 +554,26 @@ input {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
.loading {
width: 100vw;
height: 100%;
background: #fff;
position: fixed;
top: 0;
left: 0;
right: 0;
}
.loading .image {
width: 56rpx;
height: 56rpx;
position: absolute;
left: 50%;
top: 50%;
margin-left: -28rpx;
margin-top: -28rpx;
text-align: center;
background: url(../../assests/loading.gif) center / 100% 100%;
vertical-align: middle;
}
\ No newline at end of file
pages/meetingDetail/meetingDetail.axml
...@@ -238,4 +238,9 @@ ...@@ -238,4 +238,9 @@
<task-panel a:if="{{pop.type === 'updateTask'}}" action='update' onDeleteTask="deleteTask"/> <task-panel a:if="{{pop.type === 'updateTask'}}" action='update' onDeleteTask="deleteTask"/>
</popup> </popup>
</view> </view>
</block> </view>
\ No newline at end of file </block>
<view class="loading" a:if="{{loading || !getData}}">
<view class="image">
</view>
</view>
\ No newline at end of file
pages/meetingDetail/meetingDetail.js
...@@ -18,6 +18,7 @@ create.Page({ ...@@ -18,6 +18,7 @@ create.Page({
title: '', title: '',
type: '' type: ''
}, },
loading: false,
// 传给组件list 的所有数据 comListData // 传给组件list 的所有数据 comListData
comListData: { comListData: {
repeatList: [ repeatList: [
...@@ -124,7 +125,7 @@ create.Page({ ...@@ -124,7 +125,7 @@ create.Page({
}) })
this.setData({ this.setData({
placeholder: `${getApp().globalData.name}创建的会议`, placeholder: `${getApp().globalData.name}创建的会议`,
scheduleItem: JSON.parse(event.scheduleItem), scheduleItem: JSON.parse(event.scheduleItem) || JSON.parse(Object.keys(event)[0].split('=')[1]),
currentPeople: getApp().globalData.userid currentPeople: getApp().globalData.userid
}) })
this.getDetail() this.getDetail()
...@@ -135,7 +136,6 @@ create.Page({ ...@@ -135,7 +136,6 @@ create.Page({
_that.setData({ _that.setData({
'scheduleItem.scheduleTemplateId': scheduleItem 'scheduleItem.scheduleTemplateId': scheduleItem
}) })
console.log(scheduleItem);
} }
}) })
}, },
...@@ -205,6 +205,8 @@ create.Page({ ...@@ -205,6 +205,8 @@ create.Page({
this.store.data.groupId = res.data.data.groupId; this.store.data.groupId = res.data.data.groupId;
this.update(); this.update();
this.reload(this.data.scheduleItem.id); this.reload(this.data.scheduleItem.id);
} else {
} }
}) })
}, },
...@@ -509,7 +511,6 @@ create.Page({ ...@@ -509,7 +511,6 @@ create.Page({
_that.conflictPeople() _that.conflictPeople()
if (_that.data.repeatable) { if (_that.data.repeatable) {
_that.setData({ _that.setData({
'conSelectPopupData.showSelectPopup': true, 'conSelectPopupData.showSelectPopup': true,
editType: 'operate_user' editType: 'operate_user'
}) })
...@@ -582,10 +583,6 @@ create.Page({ ...@@ -582,10 +583,6 @@ create.Page({
that.$store.data.indexNeedUpdate = true that.$store.data.indexNeedUpdate = true
that.$store.data.tabBarIndex = '1' that.$store.data.tabBarIndex = '1'
that.update() that.update()
this.setData({
'conToastData.showToast': true,
'conToastData.title': '保存成功'
})
if (this.$store.data.originalData.repeatable === 1 && !!res.data.data) { if (this.$store.data.originalData.repeatable === 1 && !!res.data.data) {
observer.notice(res.data.data) observer.notice(res.data.data)
} }
...@@ -680,10 +677,9 @@ create.Page({ ...@@ -680,10 +677,9 @@ create.Page({
this.$store.data.tabBarIndex = '1' this.$store.data.tabBarIndex = '1'
this.update() this.update()
this.setData({ this.setData({
confirmAttendance: 0, confirmAttendance: 0
'conToastData.showToast': true,
'conToastData.title': '保存成功'
}) })
this.conflictPeople()
} }
}) })
break break
...@@ -701,10 +697,9 @@ create.Page({ ...@@ -701,10 +697,9 @@ create.Page({
this.$store.data.tabBarIndex = '1' this.$store.data.tabBarIndex = '1'
this.update() this.update()
this.setData({ this.setData({
confirmAttendance: 1, confirmAttendance: 1
'conToastData.showToast': true,
'conToastData.title': '保存成功'
}) })
this.conflictPeople()
} }
}) })
break break
...@@ -826,9 +821,7 @@ create.Page({ ...@@ -826,9 +821,7 @@ create.Page({
} }
this.modifySchedule(dataTitle).catch(err => { this.modifySchedule(dataTitle).catch(err => {
this.setData({ this.setData({
title: this.$store.data.originalData.title, title: this.$store.data.originalData.title
'conToastData.showToast': true,
'conToastData.title': ' 网络异常'
}) })
}).then(res => { }).then(res => {
this.$store.data.originalData.title = this.data.title this.$store.data.originalData.title = this.data.title
...@@ -845,9 +838,7 @@ create.Page({ ...@@ -845,9 +838,7 @@ create.Page({
} }
this.modifySchedule(dataRemark).catch(err => { this.modifySchedule(dataRemark).catch(err => {
this.setData({ this.setData({
remark: this.$store.data.originalData.remark, remark: this.$store.data.originalData.remark
'conToastData.showToast': true,
'conToastData.title': ' 网络异常'
}) })
}).then(res => { }).then(res => {
this.$store.data.originalData.remark = this.data.remark this.$store.data.originalData.remark = this.data.remark
...@@ -863,9 +854,7 @@ create.Page({ ...@@ -863,9 +854,7 @@ create.Page({
} }
this.modifySchedule(dataWay).catch(err => { this.modifySchedule(dataWay).catch(err => {
this.setData({ this.setData({
'comListData.meetingWayModelId': this.$store.data.originalData.meetingWayModel === null ? null : (this.$store.data.originalData.meetingWayModel.model === 'dingtalk' ? 2 : (this.$store.data.originalData.meetingWayModel.model === 'zoom' ? 1 : 0)), 'comListData.meetingWayModelId': this.$store.data.originalData.meetingWayModel === null ? null : (this.$store.data.originalData.meetingWayModel.model === 'dingtalk' ? 2 : (this.$store.data.originalData.meetingWayModel.model === 'zoom' ? 1 : 0))
'conToastData.showToast': true,
'conToastData.title': ' 网络异常'
}) })
}).then(res => { }).then(res => {
this.$store.data.originalData.meetingWay = !!this.data.comListData.meetingWayModelId ? this.data.comListData.meetingWayList[this.data.comListData.meetingWayModelId] : null this.$store.data.originalData.meetingWay = !!this.data.comListData.meetingWayModelId ? this.data.comListData.meetingWayList[this.data.comListData.meetingWayModelId] : null
...@@ -885,10 +874,6 @@ create.Page({ ...@@ -885,10 +874,6 @@ create.Page({
this.$store.data.participatorList = this.$store.data.originUsers this.$store.data.participatorList = this.$store.data.originUsers
this.$store.data.participatorUserId = this.$store.data.originUsersId this.$store.data.participatorUserId = this.$store.data.originUsersId
this.update() this.update()
this.setData({
'conToastData.showToast': true,
'conToastData.title': ' 网络异常'
})
}).then(res => { }).then(res => {
this.$store.data.originUsers = this.$store.data.participatorList this.$store.data.originUsers = this.$store.data.participatorList
this.$store.data.originUsersId = this.$store.data.participatorUserId this.$store.data.originUsersId = this.$store.data.participatorUserId
...@@ -915,9 +900,7 @@ create.Page({ ...@@ -915,9 +900,7 @@ create.Page({
this.setData({ this.setData({
'comListData.comSelectListId': this.$store.data.originalData.recurrenceModel.model === 'weekly' ? (this.$store.data.originalData.recurrenceModel.weekDayList.length > 1 ? 3 : 2) : repeatListMap.get(this.$store.data.originalData.recurrenceModel.model), 'comListData.comSelectListId': this.$store.data.originalData.recurrenceModel.model === 'weekly' ? (this.$store.data.originalData.recurrenceModel.weekDayList.length > 1 ? 3 : 2) : repeatListMap.get(this.$store.data.originalData.recurrenceModel.model),
repeatable: this.$store.data.originalData.repeatable, repeatable: this.$store.data.originalData.repeatable,
recurrenceModel: this.$store.data.originalData.repeatable ? { model: this.storer.data.originalData.recurrenceModel.model, daysOfMonth: this.$store.data.originalData.recurrenceModel.daysOfMonth, interval: 1, initialTime: this.$store.data.originalData.recurrenceModel.initialTime, terminateTime: this.$store.data.originalData.recurrenceModel.terminateTime, weekDayList: this.$store.data.originalData.recurrenceModel.weekDayList } : { model: 'no_repeat' }, recurrenceModel: this.$store.data.originalData.repeatable ? { model: this.storer.data.originalData.recurrenceModel.model, daysOfMonth: this.$store.data.originalData.recurrenceModel.daysOfMonth, interval: 1, initialTime: this.$store.data.originalData.recurrenceModel.initialTime, terminateTime: this.$store.data.originalData.recurrenceModel.terminateTime, weekDayList: this.$store.data.originalData.recurrenceModel.weekDayList } : { model: 'no_repeat' }
'conToastData.showToast': true,
'conToastData.title': ' 网络异常'
}) })
}).then(res => { }).then(res => {
this.$store.data.originalData.recurrenceModel = this.data.recurrenceModel this.$store.data.originalData.recurrenceModel = this.data.recurrenceModel
...@@ -938,9 +921,7 @@ create.Page({ ...@@ -938,9 +921,7 @@ create.Page({
this.setData({ this.setData({
'comListData.comSelectListId': this.$store.data.originalData.recurrenceModel.model === 'weekly' ? (this.$store.data.originalData.recurrenceModel.weekDayList.length > 1 ? 3 : 2) : repeatListMap.get(this.$store.data.originalData.recurrenceModel.model), 'comListData.comSelectListId': this.$store.data.originalData.recurrenceModel.model === 'weekly' ? (this.$store.data.originalData.recurrenceModel.weekDayList.length > 1 ? 3 : 2) : repeatListMap.get(this.$store.data.originalData.recurrenceModel.model),
repeatable: this.$store.data.originalData.repeatable, repeatable: this.$store.data.originalData.repeatable,
recurrenceModel: this.$store.data.originalData.repeatable ? { model: this.$store.data.originalData.recurrenceModel.model, daysOfMonth: this.$store.data.originalData.recurrenceModel.daysOfMonth, interval: 1, initialTime: this.$store.data.originalData.recurrenceModel.initialTime, terminateTime: this.$store.data.originalData.recurrenceModel.terminateTime, weekDayList: this.$store.data.originalData.recurrenceModel.weekDayList } : { model: 'no_repeat' }, recurrenceModel: this.$store.data.originalData.repeatable ? { model: this.$store.data.originalData.recurrenceModel.model, daysOfMonth: this.$store.data.originalData.recurrenceModel.daysOfMonth, interval: 1, initialTime: this.$store.data.originalData.recurrenceModel.initialTime, terminateTime: this.$store.data.originalData.recurrenceModel.terminateTime, weekDayList: this.$store.data.originalData.recurrenceModel.weekDayList } : { model: 'no_repeat' }
'conToastData.showToast': true,
'conToastData.title': ' 网络异常'
}) })
}).then(res => { }).then(res => {
this.$store.data.originalData.recurrenceModel = this.data.recurrenceModel this.$store.data.originalData.recurrenceModel = this.data.recurrenceModel
...@@ -960,9 +941,7 @@ create.Page({ ...@@ -960,9 +941,7 @@ create.Page({
this.modifySchedule(dataRepeat3).catch(err => { this.modifySchedule(dataRepeat3).catch(err => {
this.setData({ this.setData({
'comListData.comSelectListId': this.$store.data.originalData.recurrenceModel.model === 'weekly' ? (this.$store.data.originalData.recurrenceModel.weekDayList.length > 1 ? 3 : 2) : repeatListMap.get(this.$store.data.originalData.recurrenceModel.model), 'comListData.comSelectListId': this.$store.data.originalData.recurrenceModel.model === 'weekly' ? (this.$store.data.originalData.recurrenceModel.weekDayList.length > 1 ? 3 : 2) : repeatListMap.get(this.$store.data.originalData.recurrenceModel.model),
repeatable: this.$store.data.originalData.repeatable, repeatable: this.$store.data.originalData.repeatable
'conToastData.showToast': true,
'conToastData.title': ' 网络异常'
}) })
}).then(res => { }).then(res => {
this.$store.data.originalData.recurrenceModel = this.data.recurrenceModel this.$store.data.originalData.recurrenceModel = this.data.recurrenceModel
...@@ -983,10 +962,6 @@ create.Page({ ...@@ -983,10 +962,6 @@ create.Page({
meetingRoomId: this.$store.data.meetingRoomId meetingRoomId: this.$store.data.meetingRoomId
} }
this.modifySchedule(dataLocation, needNotice).catch(err => { this.modifySchedule(dataLocation, needNotice).catch(err => {
this.setData({
'conToastData.showToast': true,
'conToastData.title': ' 网络异常'
})
this.$store.data.locationName = this.$store.data.originalData.location.locationName this.$store.data.locationName = this.$store.data.originalData.location.locationName
this.$store.data.roomId = this.$store.data.originalData.meetingRoomId this.$store.data.roomId = this.$store.data.originalData.meetingRoomId
this.update() this.update()
...@@ -1008,10 +983,6 @@ create.Page({ ...@@ -1008,10 +983,6 @@ create.Page({
modifyContent: 'modify_time' modifyContent: 'modify_time'
} }
this.modifySchedule(data, needNotice).catch(err => { this.modifySchedule(data, needNotice).catch(err => {
this.setData({
'conToastData.showToast': true,
'conToastData.title': ' 网络异常'
})
this.$store.data.startTime = this.$store.data.originalData.startTime.replace(/'-'/g, '/') this.$store.data.startTime = this.$store.data.originalData.startTime.replace(/'-'/g, '/')
this.$store.data.endTime = this.$store.data.originalData.endTime.replace(/'-'/g, '/') this.$store.data.endTime = this.$store.data.originalData.endTime.replace(/'-'/g, '/')
this.update() this.update()
...@@ -1029,9 +1000,7 @@ create.Page({ ...@@ -1029,9 +1000,7 @@ create.Page({
} }
this.modifySchedule(dataAheadTimes).catch(err => { this.modifySchedule(dataAheadTimes).catch(err => {
this.setData({ this.setData({
aheadTimes: this.$store.data.originalData.aheadTimes, aheadTimes: this.$store.data.originalData.aheadTimes
'conToastData.showToast': true,
'conToastData.title': ' 网络异常'
}) })
}).then(res => { }).then(res => {
this.$store.data.originalData.aheadTimes = (this.data.aheadTimes.length === 0 ? null : this.data.aheadTimes) this.$store.data.originalData.aheadTimes = (this.data.aheadTimes.length === 0 ? null : this.data.aheadTimes)
...@@ -1134,10 +1103,9 @@ create.Page({ ...@@ -1134,10 +1103,9 @@ create.Page({
this.$store.data.tabBarIndex = '1' this.$store.data.tabBarIndex = '1'
this.update() this.update()
this.setData({ this.setData({
confirmAttendance: 1, confirmAttendance: 1
'conToastData.showToast': true,
'conToastData.title': '保存成功',
}) })
this.conflictPeople()
} }
}) })
} }
...@@ -1161,10 +1129,9 @@ create.Page({ ...@@ -1161,10 +1129,9 @@ create.Page({
this.$store.data.tabBarIndex = '1' this.$store.data.tabBarIndex = '1'
this.update() this.update()
this.setData({ this.setData({
confirmAttendance: 0, confirmAttendance: 0
'conToastData.showToast': true,
'conToastData.title': '保存成功'
}) })
this.conflictPeople()
} }
}) })
} }
...@@ -1191,6 +1158,7 @@ create.Page({ ...@@ -1191,6 +1158,7 @@ create.Page({
this.setData({ this.setData({
confirmAttendance: -9 confirmAttendance: -9
}) })
this.conflictPeople()
} }
}) })
}, },
...@@ -1239,7 +1207,6 @@ create.Page({ ...@@ -1239,7 +1207,6 @@ create.Page({
this.update(); this.update();
}) })
}, },
showPop(e) { showPop(e) {
this.setData({ this.setData({
pop: e.target.dataset.pop, pop: e.target.dataset.pop,
...@@ -1303,6 +1270,9 @@ create.Page({ ...@@ -1303,6 +1270,9 @@ create.Page({
// 添加文件 // 添加文件
addMeetingFile() { addMeetingFile() {
//重置 //重置
this.setData({
loading: true
})
this.store.data.description = ''; this.store.data.description = '';
this.store.data.fileInfos = null; this.store.data.fileInfos = null;
let data = { let data = {
...@@ -1312,6 +1282,9 @@ create.Page({ ...@@ -1312,6 +1282,9 @@ create.Page({
} }
uploadPermissions(data).then(res => { uploadPermissions(data).then(res => {
if (res.data.code === 0) { if (res.data.code === 0) {
this.setData({
loading: false
})
dd.uploadAttachmentToDingTalk({ dd.uploadAttachmentToDingTalk({
image: { multiple: true, compress: true, max: 9, spaceId: res.data.data }, image: { multiple: true, compress: true, max: 9, spaceId: res.data.data },
space: { spaceId: res.data.data, compress: true, isCopy: 1, max: 9 }, space: { spaceId: res.data.data, compress: true, isCopy: 1, max: 9 },
......
pages/outLookContact/outLookContact.js
...@@ -218,10 +218,6 @@ create.Page({ ...@@ -218,10 +218,6 @@ create.Page({
if (res.data.code === 0) { if (res.data.code === 0) {
this.$store.data.indexNeedUpdate = true this.$store.data.indexNeedUpdate = true
this.update() this.update()
this.setData({
'conToastData.showToast': true,
'conToastData.title': '保存成功'
})
if (this.$store.data.originalData.repeatable === 1) { if (this.$store.data.originalData.repeatable === 1) {
observer.notice(res.data.data) observer.notice(res.data.data)
} }
......
pages/participantsDetail/participantsDetail.js
...@@ -252,10 +252,6 @@ create.Page({ ...@@ -252,10 +252,6 @@ create.Page({
if (res.data.code === 0) { if (res.data.code === 0) {
this.$store.data.indexNeedUpdate = true this.$store.data.indexNeedUpdate = true
this.update() this.update()
this.setData({
'conToastData.showToast': true,
'conToastData.title': '保存成功'
})
this.operateUserS() this.operateUserS()
if (this.$store.data.originalData.repeatable === 1) { if (this.$store.data.originalData.repeatable === 1) {
observer.notice(res.data.data) observer.notice(res.data.data)
......
pages/place/place.js
...@@ -161,10 +161,6 @@ create.Page({ ...@@ -161,10 +161,6 @@ create.Page({
return new Promise((resolve, rejects) => { return new Promise((resolve, rejects) => {
modifySchedule(Object.assign(data, obj)).then(res => { modifySchedule(Object.assign(data, obj)).then(res => {
if (res.data.code === 0) { if (res.data.code === 0) {
this.setData({
'conToastData.showToast': true,
'conToastData.title': '保存成功'
})
if (this.$store.data.originalData.repeatable === 1) { if (this.$store.data.originalData.repeatable === 1) {
observer.notice(res.data.data) observer.notice(res.data.data)
} }
......
template/deleteBtn/index.acss
...@@ -19,3 +19,7 @@ ...@@ -19,3 +19,7 @@
font-size: 28rpx; font-size: 28rpx;
margin-right: 18rpx; margin-right: 18rpx;
} }
.delete-task-text {
color: #0a0a0a;
}
\ No newline at end of file
template/deleteBtn/index.axml
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<view class="delete-task-wrap"> <view class="delete-task-wrap">
<view class="delete-task" onTap="handleDelete"> <view class="delete-task" onTap="handleDelete">
<text class="iconfont iconicon_delete"></text> <text class="iconfont iconicon_delete"></text>
{{title}} <text class="delete-task-text">{{title}}</text>
</view> </view>
</view> </view>
</template> </template>
\ No newline at end of file
template/loading/loading.acss 0 → 100644
.loading {
width: 100vw;
height: 100vh;
background: #fff;
position: fixed;
top: 0;
left: 0;
right: 0;
}
.loading .image {
width: 56rpx;
height: 56rpx;
position: absolute;
left: 50%;
top: 50%;
margin-left: -28rpx;
margin-top: -28rpx;
text-align: center;
background: url(../../assests/loading.gif) center / 100% 100%;
vertical-align: middle;
}
\ No newline at end of file
template/loading/loading.axml 0 → 100644
<template name="loading">
<view class="loading">
<view class="image">
</view>
</view>
</template>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment