Skip to content

S
schedule
Commit ece1c00f by liang ce
Options

Merge branch 'dev' of http://gitlab.roboming.com/fengzhaoyu/schedule into dev 

# Conflicts:
#	PageComponents/scheduleList/scheduleList.axml
#	PageComponents/scheduleList/scheduleList.js
parents 5f231fd0 2e078179
Showing with 156 additions and 91 deletions
PageComponents/myDynamic/myDynamic.acss
@import "../../template/affairBlank/index.acss";
@import "../../template/loading/loading.acss";
.dynamicBox {
width: 100%;
overflow: hidden;
......
PageComponents/myDynamic/myDynamic.axml
<import src="../../template/affairBlank/index.axml"/>
<import src="../../template/loading/loading.axml"/>
<view class="{{isStopBodyScroll ? 'scroll-lock' : ''}}" onTap="closeSwipe" onTouchStart="closeSwipe" onTouchMove="closeSwipe" onTouchEnd="closeSwipe">
<block a:if="{{!loading}}">
<scroll-view a:if="{{dynamicList.length > 0}}" scroll-y="{{true}}" class="dynamicBox" onScrollToLower="onScrollToLower">
<view class="dynamicList">
<swipe onSetBodyDisableScroll="setBodyDisableScroll" rightWidth="{{ 78 }}" leftWidth="{{ 0 }}" a:for="{{dynamicList}}" class="dynamicContent">
<view class="dynamicDetails">
<view class="meetingtitle">
<view class="meetingtitle" catchTap="nextPage" data-item="{{item}}">
<view>
{{item.title}}
</view>
......@@ -15,7 +16,7 @@
</view>
<block a:for="{{item.meetingLogDataList.slice(0,2)}}" a:for-item="dynamicItem">
<view class="userDynamic">
<view class="dynamicTime">
<view class="dynamicTime" catchTap="nextPage" data-item="{{dynamicItem}}">
<text>{{dynamicItem.content}}</text>
<text>{{dynamicItem.createTime}}</text>
</view>
......@@ -36,7 +37,6 @@
<template is="affair-placeholder" data="{{title: '展示安排的所有动态', tip: '实时同步所有事件的最新动态，便于随时处理工作内容'}}"/>
</view>
</block>
<view class="noDate" a:else>
正在加载
</view>
<template is="loading" a:else>
</template>
</view>
\ No newline at end of file
PageComponents/myDynamic/myDynamic.js
......@@ -11,12 +11,12 @@ create.Component({
data: {
traceTime: '1970-03-01 00:00:00',
isStopBodyScroll: false,
loading: true,
dynamicList: [],
current: 1,
pages: 1,
size: 10
size: 10,
noData: false,
loading: true
},
props: {},
didMount() {
......@@ -41,11 +41,12 @@ create.Component({
current,
size: 10
}).then(res => {
if (!res.data.data) {
this.setData({
loading: false
})
return;
}
// 第一层日程数据处理
const dynamicList = res.data.data.records.map((item, index) => {
// 第二层日程下的动态数据处理
......@@ -101,9 +102,9 @@ create.Component({
});
}
this.setData({
loading: false,
current: res.data.data.current,
pages: res.data.data.pages,
loading: false
});
});
},
......@@ -167,7 +168,11 @@ create.Component({
});
}
});
}
},
nextPage(event) {
console.log(event.currentTarget.dataset.item)
dd.navigateTo({ url: `./../meetingDetail/meetingDetail?scheduleItem=${JSON.stringify(event.currentTarget.dataset.item)}` });
},
}
});
PageComponents/scheduleList/scheduleList.acss
@import "../../template/loading/loading.acss";
.index {
background: #FFFFFF;
}
......
PageComponents/scheduleList/scheduleList.js
......@@ -23,7 +23,8 @@ create.Component({
show: false,
scrollHeight: "",
timeStamp: "",
userMsg: {}
userMsg: {},
loading: true
},
props: {},
didMount() {
......@@ -60,13 +61,10 @@ create.Component({
},
() => {
let now = new Date();
let year = now.getFullYear();
let year = now.getUTCFullYear();
let scheduleList = [];
for (let i = -1; i <= year - 2020; i++) {
scheduleList.push.apply(
scheduleList,
that.returnScheduleList(2020 + i)
);
scheduleList.push(that.returnScheduleList(2020 + i));
}
let scheduleList2 = scheduleList;
// 第一次加载
......@@ -79,6 +77,9 @@ create.Component({
});
}
);
that.setData({
loading: false
});
});
}, 1000),
nextDetail: throttle(function(e) {
......@@ -138,7 +139,7 @@ create.Component({
parseInt(initialTime[1]) - 1,
parseInt(initialTime[2])
);
let initialTimeDateyear = initialTimeDate.getFullYear();
let initialTimeDateyear = new Date(initialTimeDate).getUTCFullYear();
let initialTimeDatemonth =
initialTimeDate.getMonth() + 1 < 10
? "0" + (initialTimeDate.getMonth() + 1)
......@@ -160,24 +161,24 @@ create.Component({
item.excludePlanDates.split(",")
);
rule.all().map(item2 => {
let excludeDate = getFormatDate(item2, "yyyyMMdd", "-");
let time = new Date(item2);
time.setHours(time.getHours() - 8);
let startTime =
getFormatDate(time, "yyyyMMdd") +
" " +
item.recurrenceModel.startTime;
let endTime = new Date(
getFormatDate(time, "yyyyMMdd") +
" " +
item.recurrenceModel.startTime
);
let excludeDate = getFormatDate(time, "yyyyMMdd", "-");
let hasExclude =
excludeDateList.scheduleList.indexOf(excludeDate) === -1;
if (
new Date(time).getTime() < excludeDateList.templateList &&
hasExclude
) {
let startTime =
getFormatDate(time, "yyyyMMdd") +
" " +
item.recurrenceModel.startTime;
let endTime = new Date(
getFormatDate(time, "yyyyMMdd") +
" " +
item.recurrenceModel.startTime
);
endTime.setMinutes(
endTime.getMinutes() + item.recurrenceModel.duration
);
......@@ -189,7 +190,7 @@ create.Component({
scheduleTemplateId: item.id,
startTime: startTime,
title: item.title,
planDate: getFormatDate(time, "yyyyMMdd", "-")
planDate: getFormatDate(startTime, "yyyyMMdd", "-")
}
);
}
......@@ -211,14 +212,14 @@ create.Component({
endTime.getMinutes() + item.recurrenceModel.duration
);
scheduleMap.set(
`${new Date(item2).toLocaleDateString()}/${item.id}`,
`${new Date(time).toLocaleDateString()}/${item.id}`,
{
confirmAttendance: item.confirmAttendance,
endTime: getFormatDate(endTime, "yyyyMMdd HH:mm:ss"),
scheduleTemplateId: item.id,
startTime: startTime,
title: item.title,
planDate: getFormatDate(item2, "yyyyMMdd", "-")
planDate: getFormatDate(time, "yyyyMMdd", "-")
}
);
});
......@@ -326,7 +327,7 @@ create.Component({
DateMap.forEach(function(value, key, map) {
const keyDate = new Date(key);
if (keyDate.getDay() === 0) {
let rangeYear1 = keyDate.getFullYear();
let rangeYear1 = keyDate.getUTCFullYear();
let rangeMonth1 = keyDate.getMonth();
let rangeDay1 = keyDate.getDate();
let rangeDate = new Date(rangeYear1, rangeMonth1, rangeDay1 + 6);
......
api/http.js
......@@ -15,11 +15,19 @@ export default function http(data) {
success: function (res) {
if (res.data.code == 0) {
resolve(res);
} else {
dd.alert({
content: '网络异常',
buttonText: '确定'
})
}
},
fail: function (res) {
dd.alert({
content: '网络异常',
buttonText: '确定'
})
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 @@
}
.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;
padding: 24rpx 22rpx 0 22rpx;
......@@ -107,41 +107,29 @@
}
.pdf {
background: url(../../assests/pdf.png) center /100% 100%;
background: url(../../assests/pdf.png) center /100% 100% !important;
}
.png, .jpg, .svg, .jpeg {
background: url(../../assests/image.png) center /100% 100%;
background: url(../../assests/image.png) center /100% 100% !important;
}
.docx {
background: url(../../assests/docx.png) center /100% 100%;
.docx, .txt, .doc, .pages, .wps {
background: url(../../assests/docx.png) center /100% 100% !important;
}
.mov {
background: url(../../assests/mp4.png) center /100% 100%;
.mov, .mp4 {
background: url(../../assests/mp4.png) center /100% 100% !important;
}
.mp4 {
background: url(../../assests/mp4.png) center /100% 100%;
.pptx, .ppt, .key {
background: url(../../assests/ppt.png) center /100% 100% !important;
}
.ppt {
background: url(../../assests/ppt.png) center /100% 100%;
.xlsx, .numbers {
background: url(../../assests/xlsx.png) center /100% 100% !important;
}
.pptx {
background: url(../../assests/ppt.png) center /100% 100%;
}
.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%;
.zip, .rar {
background: url(../../assests/zip.png) center /100% 100% !important;
}
\ No newline at end of file
components/taskList/taskList.acss
@import "../../template/avater/index.acss";
@import "../../template/checkbox/index.acss";
.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;
padding: 14rpx 16rpx 0;
......@@ -11,7 +11,7 @@
.task-list>.task-box {
background: rgba(255, 255, 255, 1);
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;
height: 80rpx;
color: rgba(27, 38, 61, 1);
......
pages/createMeeting/createMeeting.acss
......@@ -9,7 +9,7 @@ page {
.icon {
vertical-align: middle;
color: #0a0a0a;
font-size: 40rpx;
font-size: 36rpx;
line-height: 50rpx;
}
......@@ -43,9 +43,8 @@ input {
.remark>input {
padding-left: 0;
width: 100%;
opacity: 0.72;
font-size: 28rpx;
color: rgba(3, 3, 3, 1)
color: rgba(10, 10, 10, 0.4)
}
.placeholder {
......@@ -94,6 +93,11 @@ input {
color: #9599A2;
}
.close {
font-size: 32rpx;
color: rgba(10, 10, 10, 0.4)
}
.repeatModal {
color: #191F25;
margin-top: 24rpx;
......@@ -196,8 +200,8 @@ input {
text-align: center;
line-height: 78rpx;
font-size: 50rpx;
height: 80rpx;
border: 1rpx solid #F6F6F6;
height: 78rpx;
border: 1rpx solid rgba(10, 10, 10, 0.14);
border-radius: 50%;
color: #BBBEC5;
}
......
pages/index/index.axml
<!--<<<<<<< Updated upstream<view a:if="{{tabBarIndex === '0'}}">
=======<view style="position:absolute"></view> -->
<view a:if="{{$data.tabBarIndex === '0'}}">
<!-- >>>>>>> Stashed changes -->
<my-dynamic>
</my-dynamic>
</view>
......
pages/index/index.js
......@@ -28,7 +28,7 @@ create.Page({
let title = "动态";
switch (e.currentTarget.dataset.tabbar) {
case '0':
title = '动态177';
title = '动态180';
break;
case "1":
title = "日程";
......
pages/meetingDetail/meetingDetail.acss
......@@ -143,7 +143,7 @@ page {
.icon {
vertical-align: middle;
color: #0a0a0a;
font-size: 40rpx;
font-size: 36rpx;
line-height: 50rpx;
line-height: 50rpx;
}
......@@ -184,9 +184,8 @@ input {
.remark>input {
padding-left: 0;
width: 100%;
opacity: 0.72;
font-size: 28rpx;
color: rgba(3, 3, 3, 1)
color: rgba(10, 10, 10, 0.4)
}
.placeholder {
......@@ -239,6 +238,11 @@ input {
color: #9599A2;
}
.close {
font-size: 32rpx;
color: rgba(10, 10, 10, 0.4)
}
.repeatModal {
color: #191F25;
margin-top: 24rpx;
......@@ -341,8 +345,8 @@ input {
text-align: center;
line-height: 78rpx;
font-size: 50rpx;
height: 80rpx;
border: 1rpx solid #F6F6F6;
height: 78rpx;
border: 1rpx solid rgba(10, 10, 10, 0.14);
border-radius: 50%;
color: #BBBEC5;
}
......@@ -385,7 +389,7 @@ input {
.originStaus>view>.iconfont {
margin-right: 12rpx;
color: #A9ACB4;
color: rgba(10, 10, 10, 0.4);
vertical-align: middle;
}
......@@ -456,6 +460,7 @@ input {
align-items: center;
justify-content: flex-end;
width: 100%;
color: rgba(10, 10, 10, 0.4);
}
.footerBottom>view {
......@@ -548,4 +553,27 @@ input {
vertical-align: top;
width: 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
......@@ -241,4 +241,9 @@
<task-panel a:if="{{pop.type === 'updateTask'}}" action='update' onDeleteTask="deleteTask"/>
</popup>
</view>
</block>
\ No newline at end of file
</view>
</block>
<view class="loading" a:if="{{loading || !getData}}">
<view class="image">
</view>
</view>
\ No newline at end of file
pages/outLookContact/outLookContact.js
......@@ -218,10 +218,6 @@ create.Page({
if (res.data.code === 0) {
this.$store.data.indexNeedUpdate = true
this.update()
this.setData({
'conToastData.showToast': true,
'conToastData.title': '保存成功'
})
if (this.$store.data.originalData.repeatable === 1) {
observer.notice(res.data.data)
}
......
pages/participantsDetail/participantsDetail.js
......@@ -252,10 +252,6 @@ create.Page({
if (res.data.code === 0) {
this.$store.data.indexNeedUpdate = true
this.update()
this.setData({
'conToastData.showToast': true,
'conToastData.title': '保存成功'
})
this.operateUserS()
if (this.$store.data.originalData.repeatable === 1) {
observer.notice(res.data.data)
......
pages/place/place.js
......@@ -161,10 +161,6 @@ create.Page({
return new Promise((resolve, rejects) => {
modifySchedule(Object.assign(data, obj)).then(res => {
if (res.data.code === 0) {
this.setData({
'conToastData.showToast': true,
'conToastData.title': '保存成功'
})
if (this.$store.data.originalData.repeatable === 1) {
observer.notice(res.data.data)
}
......
template/deleteBtn/index.acss
......@@ -18,4 +18,8 @@
color: rgba(242, 86, 67, 1);
font-size: 28rpx;
margin-right: 18rpx;
}
.delete-task-text {
color: #0a0a0a;
}
\ No newline at end of file
template/deleteBtn/index.axml
......@@ -2,7 +2,7 @@
<view class="delete-task-wrap">
<view class="delete-task" onTap="handleDelete">
<text class="iconfont iconicon_delete"></text>
{{title}}
<text class="delete-task-text">{{title}}</text>
</view>
</view>
</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