Skip to content

S
schedule
Commit 2981bc71 by liang ce
Options

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

parents 18126bcf 79ca60bc
Showing with 117 additions and 94 deletions
pages/createOrEditSchedule/createOrEditSchedule.axml
......@@ -78,7 +78,7 @@
</view>
<view class="addPeople iconfont icontianjia" onTap="addParticipants">
</view>
<view class="rightPeople">
<view class="rightPeople" catchTap="nextPage" data-nextPage="participantsDetail">
<text>{{participatorList.length}}人</text>
<text class="iconfont iconyoujinru"></text>
</view>
......
pages/createOrEditSchedule/createOrEditSchedule.js
......@@ -78,6 +78,10 @@ create.Page({
this.getScheduleInfo()
this.update()
} else {
this.store.data.startTime = this.data.time1
this.store.data.endTime = this.data.time2
this.store.data.week1 = this.data.week1
this.store.data.week2 = this.data.week2
this.store.data.aheadTimes = [15]
this.update()
}
......@@ -278,7 +282,7 @@ create.Page({
let day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate()
return year + '-' + month + '-' + day
},
resetStore(){
resetStore() {
this.store.data = {
participatorList: [], // 参会人列表
locationName: '',
......@@ -286,9 +290,9 @@ create.Page({
participatorUserId: [], // 参会人的userId
userList: [],
// 重复 重复机制
repeatable:0,
recurrenceModel:{
model:"no_repeat",
repeatable: 0,
recurrenceModel: {
model: "no_repeat",
},
editList: [{ icon: 'icondingwei', text: '地点' }, { icon: 'iconhuiqiantixing', text: '提醒' }, { icon: 'iconchongfu', text: '重复' }, { icon: 'icondidianmiaoshu', text: '描述' }, { icon: 'iconshanchu', text: '删除' }],
remark: '', // 会议描述
......@@ -347,16 +351,15 @@ create.Page({
latitude: '10',
locationName: this.store.data.locationName || ''
},
shcheduleType: 'common',
startTime: `${this.data.time1.replace(/\//g, "-")}`,
endTime: `${this.data.time2.replace(/\//g, '-')}`,
scheduleType: 'common',
scheduleType: this.store.data.roomId ? 'meeting' : 'common',
noticeType: 'dd_notice',
participatorList: this.store.data.participatorList,
repeatable: this.store.data.repeatable,
aheadTimes: this.store.data.aheadTimes,
recurrenceModel: this.store.data.recurrenceModel,
meetingRoomId: null
meetingRoomId: this.store.data.roomId
}
addSchedule(data).then(res => {
dd.navigateBack({
......
pages/editFile/editFile.js
......@@ -5,15 +5,18 @@ create.Page({
store: exampleStore,
useAll: true,
data: {
id: '',
descript: '',
fileInfos: ''
fileInfos: '',
scheduleId: ''
},
onLoad(event) {
dd.setNavigationBar({
title: '编辑文件'
})
this.setData({
fileInfos: JSON.parse(event.file),
id:JSON.parse(event.file).id,
fileInfos: JSON.parse(event.file).fileInfos,
descript: JSON.parse(event.file).descript
})
},
......@@ -27,7 +30,7 @@ create.Page({
// 点击保存
save() {
let data = {
id: this.data.fileInfos.id,
id: this.data.id,
uploader: getApp().globalData.userid,
uploaderInfo: JSON.stringify({
userId: getApp().globalData.userid,
......
pages/index/index.axml
<!-- <mw-select></mw-select> -->
版本号：94版
版本号：98版
<scroll-view a:if="{{todayStr !== ''}}" scroll-y="{{true}}" upper-threshold="50" lower-threshold="50" onScrollToLower="lower" style="height: 100vh;" scroll-into-view="{{todayStr}}">
<block a:for="{{scheduleList}}" a:for-item="scheduleYearList">
<block a:for="{{scheduleYearList}}">
......
pages/place/place.axml
......@@ -9,6 +9,7 @@
可用会议室
</view>
<block a:for="{{availableMeetingRoom}}">
{{item.meetingRoomId}}
<view class="mettingRoom" data-locationName="{{item.name}}" data-locationid="{{item.meetingRoomId}}" onTap="selectMeetingRoom">
<view class="icon iconfont iconhuiyishi">
</view>
......@@ -36,7 +37,6 @@
<view class="tip">
自定义位置
</view>
</view>
<view class="allMettingRoom" a:if="{{true}}" onTap="toRoomList">
查看所有会议室
......
pages/scheduleDetail/scheduleDetail.acss
......@@ -19,7 +19,6 @@ page {
}
.title, .place, .time, .remind {
height: 112rpx;
display: flex;
background: white;
}
......@@ -36,12 +35,13 @@ page {
.title .text, .place .text, .time .text, .remind .text {
line-height: 112rpx;
width: 100%;
height: 112rpx;
border-bottom: 1rpx solid rgba(25, 31, 37, 0.12);
}
.time .text {
.scheduleInfo .time .text {
border: none;
line-height: 48rpx;
padding: 32rpx 0;
}
.participants {
......@@ -91,7 +91,6 @@ page {
.right {
position: absolute;
right: 32rpx;
;
opacity: 0.56;
font-family: PingFangSC-Regular;
font-size: 28rpx;
......@@ -141,8 +140,8 @@ page {
.dynamicDetail {
background: #fff;
overflow: hidden;
padding: 48rpx 32rpx;
margin-top: 32rpx;
position: relative;
}
.latestTip {
......@@ -154,6 +153,7 @@ page {
.dynamicList {
display: flex;
margin-top: 32rpx;
padding: 0 32rpx;
}
.dynamicleft {
......@@ -222,11 +222,12 @@ page {
}
.otherTip {
width: 100%;
text-align: center;
font-size: 26rpx;
color: rgba(25, 31, 37, 0.40);
line-height: 37rpx;
margin-top: 32rpx;
margin-top: 10rpx;
}
.bottom {
......@@ -238,7 +239,7 @@ page {
background: white;
height: 112rpx;
bottom: 0;
justify-content: space-between;
justify-content: space-around;
color: rgba(25, 31, 37, 0.56);
font-size: 28rpx;
}
......@@ -304,7 +305,6 @@ page {
width: 20rpx;
height: 20rpx;
border-radius: 50%;
background: red;
position: absolute;
bottom: 2rpx;
right: -5rpx;
......@@ -331,6 +331,7 @@ page {
.pdf {
background: url(../../assests/pdf.png) center /100% 100%;
}
.image {
background: url(../../assests/image.png) center /100% 100%;
}
......@@ -342,6 +343,7 @@ page {
.mov {
background: url(../../assests/mp4.png) center /100% 100%;
}
.mp4 {
background: url(../../assests/mp4.png) center /100% 100%;
}
......@@ -349,6 +351,7 @@ page {
.ppt {
background: url(../../assests/ppt.png) center /100% 100%;
}
.pptx {
background: url(../../assests/ppt.png) center /100% 100%;
}
......@@ -363,4 +366,26 @@ page {
.zip {
background: url(../../assests/zip.png) center /100% 100%;
}
.scheduleInfo .text .repeatTip {
font-size: 24rpx;
color: rgba(25, 31, 37, 0.51)
}
.dynamicContent {
width: 750rpx;
background: #fff;
display: inline-block;
}
.dynamicright {
position: relative;
}
.selectDynamicright {
position: absolute;
top: 0;
height: 100%;
width: 100%;
background: rgba(25, 31, 37, 0.12)
}
\ No newline at end of file
pages/scheduleDetail/scheduleDetail.axml
<view class="scheduleDetail">
{{startTime}}
<view class="scheduleInfo">
<!-- 标题 -->
<view class="title">
......@@ -27,35 +26,37 @@
${time1.substring(5, 7)}月${time1.substring(8, 10)}日 ${time1.substring(11, 16)} 至
${time2.substring(5, 7)}月${time2.substring(8, 10)}日 ${time2.substring(11, 16)}
`}}
<view class="repeatTip" a:if="{{!!isRepeatable}}">
每周三重复，截止到2020年3月29
</view>
</view>
</view>
<view class="text" a:else>
{{`${time1.substring(5, 7)}月${time1.substring(8, 10)}日 ${week} ${time1.substring(11, 16)}-${time2.substring(11, 16)}`}}
<text>
{{`${time1.substring(5, 7)}月${time1.substring(8, 10)}日 ${week} ${time1.substring(11, 16)}-${time2.substring(11, 16)}`}}
</text>
<view class="repeatTip" a:if="{{!!isRepeatable}}">
{{recModel.model=='day_in_week'?(recModel.weekDayList.length==5?'每周的工作日重复':'每'+week+'重复'):'每天重复'}},
{{recModel.forever=='0'? '永不截止':'截止到'+recModel.terminateTime}}
</view>
</view>
</view>
</view>
<!-- 参会人 -->
<view class="participants" onTap="nextPage" data-nextPage="participants">
<view class="icon iconcanhuiren1 iconfont">
</view>
<view class="icon iconcanhuiren1 iconfont"></view>
<view class="scroll" v-if="{{!!userList.length}}">
<text class="imageGroup" a:for="{{userList}}" a:for-item="item">
<text>
<image a:if="{{!!item.participator.headUrl}}" mode="scaleToFill" src="{{item.participator.headUrl}}"/>
<text a:else class="name">{{item.participator.username.substring(item.participator.username.length - 2, item.participator.username.length)}}</text>
<text a:if="{{!!item.participator.confirmAttendance}}" class="participatorStaus {{item.participator.confirmAttendance==1?'accept':'cancel'}} "></text>
</text>
</text>
</view>
<text a:if="{{!!item.participator.confirmAttendance}}" class="participatorStaus {{item.participator.confirmAttendance==1?'accept':'cancel'}} "></text></text></text></view>
<view class="right">
<text class="number">{{userList.length}}人参与</text>
<text class="iconyoujinru iconfont"></text>
</view>
</view>
<text class="iconyoujinru iconfont"></text></view></view>
<!-- 重复 -->
<view class="remind" a:if="{{aheadTimes.length}}">
<view class="icon iconshijian iconfont">
</view>
<view class="icon iconshijian iconfont"></view>
<view class="text blank">
<text a:if="{{aheadTimes.includes(0)}}">立即提醒</text>
<text a:if="{{aheadTimes.includes(5)}}">5分钟前</text>
......@@ -66,73 +67,59 @@
<text a:if="{{aheadTimes.includes(2880)}}">两天前</text>
<text a:if="{{aheadTimes.includes(10080)}}">1周前</text>
提醒
</view>
</view>
</view></view>
<!-- 会议描述 -->
<view class="describe" a:if="{{!!remark}}">
<view class="icon iconhuiyimiaoshu iconfont">
</view>
<view class="icon iconhuiyimiaoshu iconfont"></view>
<view class="text">
{{remark}}
</view>
</view>
</view></view>
<!-- 会议动态 -->
<view class="dynamic">
<view class="icon iconhuiyimiaoshu iconfont">
</view>
<view class="icon iconhuiyimiaoshu iconfont"></view>
<view class="text">
会议动态
</view>
<view class="upload" onTap="upload">
<text>文件上传</text>
<text class="icontianjia iconfont"></text>
</view>
</view>
<text class="icontianjia iconfont"></text></view></view>
<!-- 动态详情展示 -->
<view class="dynamicDetail">
<view class="latestTip">
李文 修改了会议 2月12日 12:10
</view>
<view class="dynamicList" a:for="{{allFileInfo}}">
<view class="dynamicleft">
<image a:if="{{!!item.uploaderInfo.headUrl}}" mode="scaleToFill" src="{{item.uploaderInfo.headUrl}}"/>
<text a:else>{{item.uploaderInfo.username.substring(0,1)}}</text>
</view>
<view class="dynamicright">
<view class="dynamicMinutes">
<text>{{item.username}}</text>
<text>{{item.time}}</text>
</view>
<view class="describe" a:if="{{!!item.descript}}">
{{item.descript}}
</view>
<view class="file" data-file="{{item2}}" onTap="preview" a:for="{{item.fileInfos}}" a:for-item="item2" onTouchStart="touchStart" onTouchEnd="touchEnd" onLongTap="longPress">
<view class="fileImage {{item2.fileType==('png' || 'jpg' || 'svg' || 'jpeg') ?'image': item2.fileType}}">
<view class="dynamicContent">
<view class="dynamicDetail" a:for="{{allFileInfo}}" onTouchStart="touchStart" onTouchEnd="touchEnd" onLongTap="longPress" data-id="{{item.meetingLogId}}">
<view class="dynamicList" a:if="{{!!item.scheduleAccessory}}">
<view class="dynamicleft">
<image a:if="{{!!item.scheduleAccessory.uploaderInfo.headUrl}}" mode="scaleToFill" src="{{item.scheduleAccessory.uploaderInfo.headUrl}}"/>
<text a:else>{{item.scheduleAccessory.uploaderInfo.username.substring(0,1)}}</text></view>
<view class="dynamicright">
<view class="dynamicMinutes">
<text>{{item.scheduleAccessory.uploaderInfo.username}}</text>
<text>{{item.scheduleAccessory.time}}</text></view>
<view class="describe">
{{item.scheduleAccessory.descript}}
</view>
<view class="fileName">
{{item2.fileName}}
<view class="file" data-file="{{item2}}" onTap="preview" a:for="{{item.scheduleAccessory.fileInfos}}" a:for-item="item2">
<view class="fileImage {{item2.fileType==('png' || 'jpg' || 'svg' || 'jpeg') ?'image': item2.fileType}}"></view>
<view class="fileName">
{{item2.fileName}}
</view>
</view>
<view class="modFile" a:if="{{organizer == pemissions?(item2.fileId == fileId):(item2.fileId == fileId&&item.uploaderInfo.userId==pemissions)}}">
<view class="ediFile" data-nextPage="editFile" catchTap="nextPage" data-file="{{item}}">
<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>
<view class="delFile" catchTap="delFile" data-file="{{item}}">
<view class="delFile" catchTap="delFile" data-file="{{item.scheduleAccessory}}">
删除
</view>
<view class="triangle">
</view>
<view class="triangle"></view>
</view>
<view class="selectDynamicright">
</view>
</view>
</view>
</view>
<view class="otherTip">
大鹏 将 海棠 添加到会议 17:03
</view>
<view class="otherTip">
大鹏 修改了会议 今天 16:14
</view>
<view class="otherTip">
大鹏 修改了会议 今天 16:14
<view class="otherTip">
{{item.content}}
{{item.time}}
</view>
</view>
</view>
<!-- 底部按钮 -->
......@@ -141,11 +128,11 @@
<text class="icondidianmiaoshu iconfont"></text>
<text>编辑</text>
</view>
<view class="buttonGroup" data-nextPage="edit" onTap="nextPage">
<view class="buttonGroup" data-nextPage="edit" onTap="nextPage" a:if="{{!(organizer == pemissions)}}">
<text class="icondidianmiaoshu iconfont"></text>
<text>参加</text>
</view>
<view class="buttonGroup" data-nextPage="edit" onTap="nextPage">
<view class="buttonGroup" data-nextPage="edit" onTap="nextPage" a:if="{{!(organizer == pemissions)}}">
<text class="icondidianmiaoshu iconfont"></text>
<text>不参加</text>
</view>
......
pages/scheduleDetail/scheduleDetail.js
......@@ -19,9 +19,11 @@ create.Page({
allFileInfo: '',
scheduleTemplateId: '',
getDynamicTip: [],
fileId: '',
meetingLogId: '',
organizer: '',
pemissions: ''
pemissions: '',
isRepeatable: '',
recModel: ''
},
onLoad(event) {
let scheduleItem = JSON.parse(event.scheduleItem)
......@@ -35,7 +37,7 @@ create.Page({
},
onShow() {
this.setData({
fileId: ''
meetingLogId: ''
})
let data = {
id: this.data.scheduleItem.id,
......@@ -45,10 +47,12 @@ create.Page({
getScheduleDetail(data).then(res => {
this.setData({
title: res.data.data.title,
isRepeatable: res.data.data.repeatable,
location: res.data.data.location,
time1: res.data.data.startTime,
time2: res.data.data.endTime,
organizer: res.data.data.organizer,
recModel: res.data.data.recurrenceModel,
week: this.data.weeks[new Date(res.data.data.startTime).getDay() - 1]
})
this.store.data.userList = res.data.data.userList
......@@ -129,7 +133,6 @@ create.Page({
_that.setData({
previewSpaceId: res.data.data
})
console.log(res.data.data)
dd.previewFileInDingTalk({
corpId: dd.corpId,
spaceId: _that.data.previewSpaceId,
......@@ -144,7 +147,7 @@ create.Page({
delFile(event) {
const _that = this
this.setData({
fileId: ''
meetingLogId: ''
})
let data = event.target.dataset.file.id
dd.confirm({
......@@ -183,12 +186,13 @@ create.Page({
let allFileInfo = []
if (!!res.data.data) {
res.data.data.forEach((item, index) => {
item.time = this.dealFileTime(item.createTime)
if (!!item.scheduleAccessory) {
item.scheduleAccessory.time = this.dealFileTime(item.createTime)
item.scheduleAccessory.fileInfos = JSON.parse(item.scheduleAccessory.fileInfos)
item.scheduleAccessory.uploaderInfo = JSON.parse(item.scheduleAccessory.uploaderInfo)
allFileInfo.push(item.scheduleAccessory)
}
allFileInfo.push(item)
})
}
this.setData({
......@@ -203,7 +207,7 @@ create.Page({
// 长按事件
longPress(event) {
this.setData({
fileId: event.target.dataset.file.fileId
meetingLogId: event.target.dataset.id
})
},
// 跳转下一页
......@@ -216,8 +220,9 @@ create.Page({
dd.navigateTo({ url: `./../createOrEditSchedule/createOrEditSchedule?scheduleItem=${JSON.stringify(this.data.scheduleItem)}` })
break;
case 'editFile':
console.log(event.target.dataset.file)
this.setData({
fileId: ''
meetingLogId: ''
})
dd.navigateTo({ url: `./../editFile/editFile?file=${JSON.stringify(event.target.dataset.file)}` })
break;
......@@ -225,12 +230,13 @@ create.Page({
},
// 判断是刚刚 五分钟以内 十分钟以内 正常时间年月日
dealFileTime(creatTime) {
creatTime = creatTime.replace(/\-/g, "/")
let nowTime = new Date().getTime()
let time = new Date(creatTime).getTime()
let timeResule = ''
if ((nowTime - time) / 1000 < 60) {
timeResule = '刚刚'
} else if((nowTime - time) / 1000 < 60*5 || (nowTime - time) / 1000==60 ){
} else if ((nowTime - time) / 1000 < 60 * 5 || (nowTime - time) / 1000 == 60) {
timeResule = '5分钟以内'
} else {
timeResule = creatTime.substring(0, 16)
......
pages/uploadFile/uploadFile.js
......@@ -62,9 +62,7 @@ create.Page({
fail: (err) => {
}
})
})
},
// 点击保存
save() {
......
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