Skip to content

S
schedule
Commit 5091d12e by xiexiaoqin
Options

拼接代码

parent bdb33035
Showing with 449 additions and 48 deletions
PageComponents/scheduleList/scheduleList.js
......@@ -34,7 +34,7 @@ Component({
this.getDate();
}
},
didUnmount() {},
didUnmount() { },
methods: {
getDate() {
// 页面显示
......@@ -75,10 +75,10 @@ Component({
);
});
},
nextDetail: throttle(function(e) {
nextDetail: throttle(function (e) {
let item = e.target.dataset.item;
dd.navigateTo({
url: `./../editMeeting/editMeeting?scheduleItem=${JSON.stringify(item)}`
url: `./../meetingDetail/meetingDetail?scheduleItem=${JSON.stringify(item)}`
});
}, 1000),
closePop() {
......@@ -176,8 +176,8 @@ Component({
item.recurrenceModel.startTime;
let endTime = new Date(
getFormatDate(item2, "yyyyMMdd") +
" " +
item.recurrenceModel.startTime
" " +
item.recurrenceModel.startTime
);
endTime.setMinutes(
endTime.getMinutes() + item.recurrenceModel.duration
......@@ -212,7 +212,7 @@ Component({
);
}
});
scheduleMap.forEach(function(value, key, map) {
scheduleMap.forEach(function (value, key, map) {
scheduleList.push(value);
});
return scheduleList;
......@@ -294,9 +294,9 @@ 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
});
......@@ -331,9 +331,9 @@ 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
});
......@@ -350,7 +350,7 @@ 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(
......@@ -376,7 +376,7 @@ Component({
type: "week",
value: `第${listWeek}周，${rangeMonth1 + 1}月${rangeDay1}日 - ${
rangeMonth2 == rangeMonth1 ? "" : rangeMonth2 + 1 + "月"
}${rangeDay2}日`,
}${rangeDay2}日`,
dayStr: key
});
}
......@@ -392,7 +392,7 @@ Component({
type: "week",
value: `第${listWeek}周，${rangeMonth1 + 1}月${rangeDay1}日 - ${
rangeMonth2 == rangeMonth1 ? "" : rangeMonth2 + 1 + "月"
}${rangeDay2}日`,
}${rangeDay2}日`,
dayStr: key
});
}
......@@ -414,7 +414,7 @@ Component({
type: "week",
value: `第${listWeek}周，${rangeMonth1 + 1}月${rangeDay1}日 - ${
rangeMonth2 == rangeMonth1 ? "" : rangeMonth2 + 1 + "月"
}${rangeDay2}日`,
}${rangeDay2}日`,
dayStr: key
});
}
......
components/fileList/fileList.axml
<view class="{{fileView.logId == logId ? 'file-box-mask' : ''}}" data-logId="{{fileView.logId}}" catchLongTap="showOperate">
<view class="{{fileView.logId == logId ? 'file-box-mask' : ''}}" data-logId="{{fileView.logId}}" catchLongTap="showOperate" catchTap="test">
<view class="desc" meeta:if='{{fileView.description}}'>
{{fileView.description}}
</view>
<view class="task-list" a:if="{{fileView.fileInfos && fileView.fileInfos.length > 0}}">
<view class="file-box {{isCanDelete ? 'file-box-close': ''}}" a:for="{{ fileView.fileInfos}}" onTap="preview" data-file="{{item}}">
<view class="file-box {{isCanDelete ? 'file-box-close': ''}}" a:for="{{ fileView.fileInfos}}" catchTap="preview" data-file="{{item}}">
<view class="file-icon {{item.fileType}}"></view>
<view class="file-title">
<text>{{item.fileName.slice(0, item.fileName.length - 5)}}</text>
......
components/fileList/fileList.js
......@@ -19,6 +19,9 @@ create.Component({
},
didUnmount() { },
methods: {
test(e) {
console.log(e)
},
//移除文件
removeFile(e) {
const fileInfos = this.store.data.fileInfos.filter(it => it.fileId !== e.target.dataset.id);
......
components/selectPopup/selectPopup.acss
......@@ -4,6 +4,7 @@
top: 0;
height: 100vh;
width: 100%;
z-index: 101;
}
.selectContent {
......@@ -25,9 +26,9 @@
color: #1B263D;
border-bottom: 1px solid rgba(25, 31, 37, 0.12);
}
.selectPopupItem:last-child {
border-bottom: none;
}
.selectPopupCancel {
......
pages/attendeeList/attendeeList.js
......@@ -9,22 +9,13 @@ create.Page({
participatorList: null,
},
currentTask: null, //store
// action: ''
},
onLoad(query) {
// this.setData({
// action: query.action
// })
},
radioChange(e) {
const item = e.target.dataset.item;
this.store.data.currentTask.acceptorInfo = item;
this.store.data.currentTask.acceptorId = item.userId;
// //更新保存添加标示
// if (this.data.action == 'update') {
// this.store.data.isAddAcceptorInfo = true;
// }
this.update();
dd.navigateBack();
}
......
pages/editMeeting/editMeeting.axml
......@@ -46,10 +46,10 @@
<view>
<view class="timeText" catchTap="showPopup" data-type='time'>
<text a:if="{{isAcrossDay}}">
{{`${startTime.substring(5, 7)}月${startTime.substring(8, 10)}日 ${startTime.substring(11, 16)}`}}-{{`${endTime.substring(5, 7)}月${endTime.substring(8, 10)}日 ${endTime.substring(11, 16)}`}}
{{`${$data.startTime.substring(5, 7)}月${$data.startTime.substring(8, 10)}日 ${$data.startTime.substring(11, 16)}`}}-{{`${$data.endTime.substring(5, 7)}月${$data.endTime.substring(8, 10)}日 ${$data.endTime.substring(11, 16)}`}}
</text>
<text a:else>
{{`${startTime.substring(5, 7)}月${startTime.substring(8, 10)}日 ${week} ${startTime.substring(11, 16)}-${endTime.substring(11, 16)}`}}
{{`${$data.startTime.substring(5, 7)}月${$data.startTime.substring(8, 10)}日 ${week} ${$data.startTime.substring(11, 16)}-${$data.endTime.substring(11, 16)}`}}
</text>
<!-- 3月1日 周日 14:00-16:00 -->
</view>
......@@ -63,17 +63,17 @@
</view>
<!-- participatorList participatorUserId 参会人 -->
<view class="participator">
<view class="iconicon_attender iconfont icon {{participatorList.length>1 ? '' : 'noValueIcon'}}">
<view class="iconicon_attender iconfont icon {{$data.participatorList.length>1 ? '' : 'noValueIcon'}}">
</view>
<view class="participatorContaint">
<view class="participatorText" a:if="{{participatorList.length < 2}}" catchTap="showPopup" data-type='participator'>
<view class="participatorText" a:if="{{$data.participatorList.length < 2}}" catchTap="showPopup" data-type='participator'>
添加参会人
</view>
<view class="participatorList" a:else>
<view class="participatorListTop">
<view class="participatorText">
<view>
{{participatorList.length}}位参会人
{{$data.participatorList.length}}位参会人
</view>
<view class="conflictStatus" a:if="{{conflictPeople.length}}">
{{conflictPeople.length}}人会议安排冲突
......@@ -82,7 +82,7 @@
<view class="iconicon_open iconfont icon" style=" vertical-align: middle" catchTap="nextPage" data-nextPage="participantsDetail"></view>
</view>
<view class="participatorListBottom">
<view class="people" a:for="{{participatorList.length > 10 ? [...participatorList].splice(0, 11) : participatorList}}">
<view class="people" a:for="{{$data.participatorList.length > 10 ? [...$data.participatorList].splice(0, 11) : $data.participatorList}}">
<view class="headUrl">
<image a:if="{{item.headUrl}}" mode="scaleToFill" src="{{item.headUrl}}" />
<text
......
pages/editMeeting/editMeeting.js
......@@ -8,6 +8,7 @@ create.Page({
store: exampleStore,
useAll: true,
data: {
$data: null,
// 传给组件list 的所有数据 comListData
comListData: {
repeatList: [
......
pages/meetingDetail/meetingDetail.acss
page {
background: #fff;
background: rgba(232, 237, 240, 1);
}
.list {
padding: 48rpx 32rpx;
.affair-list {
background: #fff;
padding: 48rpx 32rpx 220rpx 32rpx;
margin-top: 16rpx;
}
.list>view {
.affair-list>view {
margin-bottom: 48rpx;
}
......@@ -22,13 +24,6 @@ page {
padding-left: 104rpx;
}
/* .compose-column .desc {
color: rgba(10, 10, 10, 1);
font-size: 32rpx;
line-height: 48rpx;
margin-top: 10rpx;
} */
.compose-column>.avater {
width: 80rpx;
height: 80rpx;
......@@ -101,4 +96,406 @@ page {
height: 48rpx;
width: 1rpx;
margin: 0 28rpx;
}
/* das */
@import "../../template/deleteBtn/index.acss";
page {
font-size: 28rpx;
color: #0a0a0a;
}
.hideDetail {
padding: 28rpx 32rpx 24rpx;
border-bottom: 1rpx solid rgba(25, 31, 37, 0.12);
box-shadow: 0 1px 4px 0 rgba(0, 0, 0, 0.08);
}
.hideTitle {
font-family: PingFangSC-Medium;
font-size: 40rpx;
line-height: 56rpx;
color: #1B263D;
}
.hideTime {
margin-top: 16rpx;
opacity: 0.72;
font-family: PingFangSC-Regular;
font-size: 28rpx;
color: #030303;
line-height: 28rpx;
}
.hideIcon {
color: #A7ABB3;
margin-top: 28rpx;
text-align: center;
}
.icon {
vertical-align: middle;
color: #0a0a0a;
font-size: 34rpx;
}
input {
caret-color: #3070F2;
padding-left: 0;
height: 52rpx;
line-height: 52rpx;
}
.createTitle {
padding: 14rpx 36rpx 16rpx;
position: relative;
min-height: 90rpx;
overflow: hidden;
}
.createTitle>.title {
display: flex;
line-height: 1.5;
justify-content: space-between;
text-align: left;
}
.createTitle>.title>input {
padding-left: 0;
font-size: 40rpx;
font-family: PingFangSC-Medium;
width: 100%;
}
.createTitle>.title>.icon {
color: #0a0a0a;
line-height: 58rpx;
}
.remark>input {
padding-left: 0;
width: 100%;
opacity: 0.72;
font-size: 28rpx;
color: rgba(3, 3, 3, 1)
}
.placeholder {
opacity: 0.4;
font-family: PingFangSC-Medium;
font-size: 40rpx;
color: #1B263D;
position: relative;
}
.remark .placeholder {
font-size: 28rpx
}
.meetingWay {
position: relative;
}
.place, .time, .participator, .meetingWay {
display: flex;
padding: 0 36rpx;
font-family: PingFangSC-Regular;
color: #191F25;
overflow: hidden;
margin-top: 54rpx;
}
.place>.icon, .time>.icon, .participator>.icon, .meetingWay>.icon {
margin-right: 26rpx;
}
.noPlace, .hasplace, .timeText, .participatorText, .noWay, .hasWay {
height: 38rpx;
font-size: 34rpx;
width: 100%;
line-height: 38rpx;
}
.hasplace, .timeText {
word-break: break-all;
max-width: 540rpx;
overflow: hidden;
}
.placeContaint, .timeContaint, .participatorContaint, .meetingWayContent {
width: 678rpx;
display: flex;
justify-content: space-between;
}
.meetingWay .close, .place .close, .participator .iconicon_open {
color: #9599A2;
}
.repeatModal {
color: #191F25;
margin-top: 24rpx;
font-size: 28Îpx;
opacity: 0.56;
}
.time .iconicon_cycle {
color: #3070F2
}
.conflictStatus {
color: #FF943E;
font-size: 24rpx;
margin-left: 24rpx;
}
.participatorList {
width: 100%;
}
.participatorList>.icon {
color: #1b263d;
}
.participatorListTop {
width: 100%;
display: flex;
justify-content: space-between;
}
.participatorText {
display: flex;
align-items: center;
height: 38rpx;
}
.participatorListBottom {
margin-top: 11rpx;
display: flex;
flex-wrap: wrap;
}
.people, .addPeople {
margin-right: 27rpx;
text-align: center;
width: 80rpx;
height: auto;
margin-top: 22rpx;
}
.people:nth-child(6n) {
margin-right: 0;
}
.headUrl {
width: 80rpx;
height: 80rpx;
border-radius: 50%;
background: #3070F2;
color: white;
line-height: 80rpx;
text-align: center;
position: relative;
}
.conflict {
line-height: 13px;
vertical-align: top;
width: 13px;
height: 13px;
position: absolute;
background: #fff;
bottom: 0rpx;
color: #FF943E;
font-size: 12px;
right: -3rpx;
border-radius: 50%;
text-align: center;
}
.headUrl>image {
vertical-align: top;
width: 100%;
height: 100%;
border-radius: 50%;
}
.name {
font-size: 24rpx;
margin-top: 8rpx;
opacity: 0.56;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.addPeople {
margin-right: 0;
width: 78rpx;
text-align: center;
line-height: 78rpx;
font-size: 50rpx;
height: 80rpx;
border: 1rpx solid #F6F6F6;
border-radius: 50%;
color: #BBBEC5;
}
.editeMeeting {
background: #fff;
}
.editeMeeting .delete-task-wrap {
padding: 74rpx 0 32rpx 0;
}
.delete-task {
color: #EA0C28!important;
}
.footNav {
position: fixed;
bottom: 0;
left: 0;
right: 0;
border-top: 1rpx solid rgba(25, 31, 37, 0.12);
box-shadow: 1rpx 1rpx 4rpx 0 rgba(0, 0, 0, 0.08);
background: rgb(255, 255, 255);
z-index: 100
}
.originStaus, .participateStatus, .noParticipateStatus {
display: flex;
line-height: 96rpx;
font-family: PingFangSC-Medium;
font-size: 28rpx;
align-items: center;
}
.originStaus>view, .participateStatus>view {
height: 96rpx;
line-height: 96rpx;
width: 49%;
text-align: center;
}
.originStaus>view>.iconfont {
margin-right: 12rpx;
color: #A9ACB4;
vertical-align: middle;
}
.participateStatus .remind {
width: 580rpx;
}
.participateStatus .participate {
width: 168rpx;
}
.remind {
font-family: PingFangSC-Regular;
font-size: 28rpx;
color: #1B263D;
}
.remind>text {
display: inline-block;
vertical-align: top;
}
.remindTimeContaint {
display: inline-block;
max-width: 400rpx;
overflow: scroll;
white-space: nowrap;
margin: 0 20rpx;
text-align: center;
}
.remindTimeContaint>text {
margin: 0 8rpx;
}
.noRemind {
margin: 0 20rpx;
}
.remindTime {
margin-right: 4rpx;
}
.participate>text {
margin-right: 10rpx;
color: #15BC83;
}
.noParticipateStatus {
font-family: PingFangSC-Medium;
font-size: 14px;
color: #F25643;
}
.noParticipateStatus {
justify-content: center;
}
.noParticipateStatus>text {
margin-right: 10rpx;
}
.footerBottom {
background: #fff;
border-top: 2rpx solid rgba(25, 31, 37, 0.12);
height: 94rpx;
display: flex;
align-items: center;
justify-content: flex-end;
width: 100%;
}
.footerBottom>view {
width: 35rpx;
margin: 0 38rpx;
font-size: 16rpx;
text-align: center;
}
.footerBottom>view>.iconfont {
font-size: 36rpx;
}
.footerBottom>view:last-child {
margin: 0 24rpx 0 0;
}
.devider {
background: rgba(227, 228, 228, 1);
height: 48rpx;
width: 1rpx;
margin: 0 28rpx;
}
.noValueIcon {
color: rgba(216, 216, 216, 1)!important;
}
.footNavTop .devider {
margin: 0;
}
.permissions {
background: rgba(0, 0, 0, 0);
position: fixed;
top: 0;
z-index: 10;
height: 100%;
width: 100%;
background: red;
}
.affair-list-title {
font-size: 40rpx;
color: rgba(25, 31, 37, 1);
}
\ No newline at end of file
pages/meetingDetail/meetingDetail.json
......@@ -3,6 +3,12 @@
"popup": "../../components/popup/index",
"task-list": "../../components/taskList/taskList",
"file-list": "../../components/fileList/fileList",
"task-panel": "../../components/taskPanel/taskPanel"
"task-panel": "../../components/taskPanel/taskPanel",
"list": "../../components/list/list",
"hlist": "../../components/hList/hList",
"toast": "../../components/toast/toast",
"selectpopup": "../../components/selectPopup/selectPopup",
"centerpopup": "../../components/centerPopup/centerPopup",
"meeting-time-picker": "../../components/meetingTimePicker/meetingTimePicker"
}
}
\ No newline at end of file
pages/uploadFile/uploadFile.axml
......@@ -3,7 +3,7 @@
<textarea value="{{description}}" class="textarea" onInput="inputChange" placeholder="添加文件描述..." maxlength="-1" />
</view>
<file-list fileView="{{{fileInfos: fileInfos}}}" isCanEdit="{{false}}" isCanDelete="{{true}}"/>
<view class="addText" onTap="{{add}}">继续添加</view>
<view class="addText" onTap="add">继续添加</view>
</view>
<view class="saveButton" onTap="saveUpload">
保存
......
pages/uploadFile/uploadFile.js
......@@ -15,7 +15,7 @@ create.Page({
title: '添加会议文件'
});
// 编辑的时候传action=update
if (query) {
if (query && query.action == 'update') {
this.setData({
action: query.action
});
......
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