Skip to content

S
schedule
Commit cadcb690 by fengzhaoyu
Options

弹窗

parent 5252d5ad
Showing with 323 additions and 183 deletions
app.json
{
"pages": [
"pages/createOrEditSchedule/createOrEditSchedule",
"pages/index/index",
"pages/createOrEditSchedule/createOrEditSchedule",
"pages/createOrEditSchedule/createOrEditSchedule",
"pages/uploadFile/uploadFile",
"pages/meetingRoomList/meetingRoomList",
"pages/repetitionTime/repetitionTime",
......
pages/createOrEditSchedule/createOrEditSchedule.acss
......@@ -179,7 +179,7 @@ page {
.scrollPeople image, .name {
text-align: center;
line-height: 58rpx;
font-size: 28rpx;
font-size: 24rpx;
display: inline-block;
color: white;
margin: 27rpx 16rpx 27rpx 0;
......@@ -333,7 +333,7 @@ page {
height: auto;
}
.repeat .iconshanchu {
.repeat .iconshanchu-1 {
float: right;
margin-right: 24rpx;
}
......@@ -413,7 +413,7 @@ page {
height: auto;
position: absolute;
border-radius: 10rpx;
top: 450rpx;
top: 400rpx;
background: #fff;
}
......@@ -423,4 +423,8 @@ page {
line-height: 96rpx;
text-align: center;
border-bottom: 1rpx solid rgba(25, 31, 37, 0.12);
}
.list:nth-child(2) {
color: #3296FA;
}
\ No newline at end of file
pages/createOrEditSchedule/createOrEditSchedule.axml
......@@ -8,6 +8,24 @@
<view class="permissions" a:if="{{!!scheduleItem?(organizer==permissions?false:true):false}}">
</view>
</view>
<!-- 地点 -->
<view class="container {{!!scheduleItem?(organizer==permissions?'':'noPermissions'):''}}">
<view class="permissions" a:if="{{!!scheduleItem?(organizer==permissions?false:true):false}}">
</view>
<view class="place" a:if="{{!!scheduleItem?!!locationName:true}}">
<view class="icon iconfont icondingwei1">
</view>
<view class="text" data-nextPage="place" onTap="nextPage">
<view class="selectPlace" a:if="{{!!locationName}}">
<text>{{locationName}}</text>
<text class="iconshanchu-1 iconfont" a:if="{{!!scheduleItem?(organizer==permissions?true:false):true}}" data-icon="icondingwei" catchTap="closeEditList"></text>
</view>
<text a:else>
添加地点
</text>
</view>
</view>
</view>
<!-- 时间 -->
<view class="container {{!!scheduleItem?(organizer==permissions?'':'noPermissions'):''}}">
<view class="permissions" a:if="{{!!scheduleItem?(organizer==permissions?false:true):false}}">
......@@ -43,24 +61,6 @@
</view>
</view>
</view>
<!-- 地点 -->
<view class="container {{!!scheduleItem?(organizer==permissions?'':'noPermissions'):''}}">
<view class="permissions" a:if="{{!!scheduleItem?(organizer==permissions?false:true):false}}">
</view>
<view class="place" a:if="{{!!scheduleItem?!!locationName:true}}">
<view class="icon iconfont icondingwei1">
</view>
<view class="text" data-nextPage="place" onTap="nextPage">
<view class="selectPlace" a:if="{{!!locationName}}">
<text>{{locationName}}</text>
<text class="iconshanchu-1 iconfont" a:if="{{!!scheduleItem?(organizer==permissions?true:false):true}}" data-icon="icondingwei" catchTap="closeEditList"></text>
</view>
<text a:else>
添加地点
</text>
</view>
</view>
</view>
<!-- 参会人 -->
<view class="participants">
<view class="icon iconfont iconcanhuiren">
......@@ -129,7 +129,7 @@
<view class="repeatContaint">
<view class="repeatTime" data-nextPage="repeatMechanism" onTap="nextPage">
<text>{{recurrenceModel.model=='day_in_week'?(recurrenceModel.weekDayList.length==1?repeatWeek:'每周的工作日重复'):recurrenceModel.model=='every_day'?'每天重复': '不重复'}}</text>
<view class="iconfont iconshanchu" data-icon="iconchongfu" catchTap="closeEditList" a:if="{{!!scheduleItem?(organizer==permissions?true:false):true}}">
<view class="iconshanchu-1 iconfont" data-icon="iconchongfu" catchTap="closeEditList" a:if="{{!!scheduleItem?(organizer==permissions?true:false):true}}">
</view>
</view>
<view class="terminationTime" onTap="selectTerminal" a:if="{{ recurrenceModel.model !== 'no_repeat' }}">
......@@ -214,29 +214,18 @@
</picker>
<!-- 保存 -->
<view class="save" a:else>
<view onTap="saveCreate">
<view onTap="showModel">
{{buttonText}}
</view>
</view>
</view>
<mw-modal isShowModal="{{isShowModal}}" time="{{propsTime}}" onChange="changeSelectTime">
</mw-modal>
<view class="popupWindow">
<view class="popupWindow" a:if="{{isShowPopupWindowList}}">
<view class="popupWindowCenter">
<view class="list">
向参会人发送通知？
</view>
<view class="list">
发送
</view>
<view class="list">
不发送
</view>
<view class="list">
继续编辑
<view class="list" a:for="{{popupWindowList}}" onTap="selectSend" data-item="{{item}}">
{{item.text}}
</view>
</view>
</view>
</block>
\ No newline at end of file
pages/createOrEditSchedule/createOrEditSchedule.js
......@@ -2,6 +2,7 @@ import create from 'dd-store'
import exampleStore from '/stores/exampleStore'
import { deleteSchedule, modifySchedule, addSchedule, getUserScheduleInTime, getHomeUserSchedule, getScheduleDetail } from '../../api/request.js'
import { stringify } from 'querystring';
import { resolve } from 'url';
create.Page({
store: exampleStore,
useAll: true,
......@@ -30,7 +31,14 @@ create.Page({
isRepeat: '',
permissions: '',
showPage: false,
popupWindowList: [{id: 0}]
popupWindowList: [
{ id: 0, text: '向参会人发送通知？' },
{ id: 1, text: '发送' },
{ id: 2, text: '不发送' },
{ id: 3, text: '继续编辑' },
],
needNotice: '',
isShowPopupWindowList: false
},
onLoad(event) {
let index = new Date().getDay()
......@@ -56,8 +64,8 @@ create.Page({
var h = date.getHours()
var min = date.getMinutes();
this.setData({
time1: `${y}/${m}/${d} ${min<30 ? h<10?'0'+h:h : (h+1)<10?'0'+(h+1): h+1}:${min<30? '30': '00'}:00`,
time2: `${y}/${m}/${d} ${(h+1)<10?'0'+(h+1):h+1}:${min<30 ? '00':'30'}:00`,
time1: `${y}/${m}/${d} ${min < 30 ? h < 10 ? '0' + h : h : (h + 1) < 10 ? '0' + (h + 1) : h + 1}:${min < 30 ? '30' : '00'}:00`,
time2: `${y}/${m}/${d} ${(h + 1) < 10 ? '0' + (h + 1) : h + 1}:${min < 30 ? '00' : '30'}:00`,
week1: w,
week2: w,
type: event.type,
......@@ -141,7 +149,7 @@ create.Page({
isShowModal: false,
week1: w1,
week2: w2
},() => {
}, () => {
that.conflict()
})
} else {
......@@ -149,7 +157,7 @@ create.Page({
time1: `${e.time}:00`,
isShowModal: false,
week1: w1
},() => {
}, () => {
that.conflict()
})
}
......@@ -167,7 +175,7 @@ create.Page({
time2: `${e.time}:00`,
isShowModal: false,
week2: w1
},() => {
}, () => {
that.conflict()
})
}
......@@ -221,7 +229,7 @@ create.Page({
_that.store.data.participatorUserId.push(item.userId)
})
} else {
_that.store.data.participatorList = []
_that.store.data.participatorList = []
_that.store.data.participatorUserId = []
_that.data.requireUsersInfo.forEach((item, index) => {
_that.store.data.participatorList.push({ userId: item.userId, username: item.username, headUrl: item.headUrl })
......@@ -309,7 +317,7 @@ create.Page({
this.update()
},
// 保存
saveCreate() {
saveCreate(e) {
if (!!this.data.scheduleItem) {
if (this.store.data.recurrenceModel.forever == '1') {
this.store.data.recurrenceModel.terminateTime = this.getTwoYearToday();
......@@ -338,11 +346,9 @@ create.Page({
aheadTimes: this.store.data.aheadTimes,
recurrenceModel: this.store.data.recurrenceModel,
meetingRoomId: this.store.data.roomId,
remark: this.store.data.remark
remark: this.store.data.remark,
needNotice: this.data.needNotice
}
console.log(111111)
console.log(JSON.stringify(this.store.data.roomId))
console.log(22222)
this.resetStore()
modifySchedule(data).then(res => {
dd.navigateBack({
......@@ -366,7 +372,8 @@ create.Page({
repeatable: this.store.data.repeatable,
aheadTimes: this.store.data.aheadTimes,
recurrenceModel: this.store.data.recurrenceModel,
meetingRoomId: this.store.data.roomId
meetingRoomId: this.store.data.roomId,
needNotice: this.data.needNotice
}
addSchedule(data).then(res => {
dd.navigateBack({
......@@ -500,8 +507,8 @@ create.Page({
deleteModel: 'only'
}
dd.confirm({
title: '温馨提示',
content: '确认删除本次日程吗',
title: '删除会议',
content: '确认删除本次日程吗？',
confirmButtonText: '确定',
cancelButtonText: '取消',
success: (success) => {
......@@ -561,7 +568,7 @@ create.Page({
this.setData({
modifyModel: modifyModel
})
this.saveCreate()
this.showModel()
},
// 删除重复日程
deleteRepeatSchedule(event) {
......@@ -610,5 +617,50 @@ create.Page({
requiredUsers: req,
pickedUsers: pic
}
},
// 选择发送不发送通知
selectSend(event) {
let needNotice = ''
let isShowPopupWindowList = false
switch (event.target.dataset.item.id) {
case 1:
needNotice = '1'
isShowPopupWindowList = false
this.setData({
needNotice: needNotice,
isShowPopupWindowList: isShowPopupWindowList
})
this.saveCreate()
break;
case 2:
needNotice = ''
isShowPopupWindowList = false
this.setData({
needNotice: needNotice,
isShowPopupWindowList: isShowPopupWindowList
})
this.saveCreate()
break;
case 3:
needNotice = ''
isShowPopupWindowList = false
break;
}
this.setData({
needNotice: needNotice,
isShowPopupWindowList: isShowPopupWindowList
})
},
// 展示弹窗
showModel() {
if (!!this.data.scheduleItem) {
this.setData({
isShowPopupWindowList: true
})
}
else {
this.saveCreate()
}
}
});
pages/meetingRoomList/meetingRoomList.acss
/* 预定会议列表 */
.searchHeader {
box-sizing: border-box;
background: #fff;
......@@ -8,8 +9,9 @@
top: 0;
z-index: 99;
}
.searchHeader1 {
border-bottom: 1px solid rgba(25,31,37,0.12);
border-bottom: 1px solid rgba(25, 31, 37, 0.12);
font-size: 26rpx;
letter-spacing: -0.31rpx;
height: 96rpx;
......@@ -18,67 +20,80 @@
display: flex;
align-items: center;
}
.searchHeader1 > view {
.searchHeader1>view {
display: flex;
justify-content: flex-end;
}
.searchHeader2 {
width: 750rpx;
height: 96rpx;
overflow: hidden;
border-bottom: 1px solid rgba(25,31,37,0.12);
border-bottom: 1px solid rgba(25, 31, 37, 0.12);
box-sizing: border-box;
}
.searchTime {
width: 200rpx;
height: 96rpx;
line-height: 96rpx;
font-size: 26rpx;
}
.searchTime>view:nth-of-type(1) {
flex: 1;
font-size: 26rpx;
}
.searchTime>view:nth-of-type(2) {
margin: 0 10rpx 0 16rpx;
color: rgba(25,31,37,0.40);
color: rgba(25, 31, 37, 0.40);
}
.xialakuangSize .iconxialakuang {
font-size: 24rpx !important;
color: rgba(25,31,37,0.40);
color: rgba(25, 31, 37, 0.40);
}
.searchLocation {
width: 200rpx;
height: 96rpx;
line-height: 96rpx;
}
.searchLocation>view:nth-of-type(1) {
flex: 1;
overflow:hidden;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
text-align: right;
text-align: right;
}
.searchLocation>view:nth-of-type(2) {
margin: 0 10rpx 0 16rpx;
width: 24rpx;
}
.reserveMeeting {
width: 100%;
}
.meetingRoomContent{
.meetingRoomContent {
padding: 32rpx 32rpx 28rpx 32rpx;
margin-top: 16rpx;
background: #ffffff;
}
.searchHeader2 > scroll-view{
.searchHeader2>scroll-view {
overflow-x: scroll;
display: flex;
height: 100%;
padding: 0 32rpx;
align-items: center;
}
.equipFacilityList{
.equipFacilityList {
margin-right: 24rpx;
white-space: nowrap;
display: flex;
......@@ -86,90 +101,112 @@
font-size: 26rpx;
line-height: 96rpx;
}
.selectListcheck{
.selectListcheck {
margin-right: 8rpx;
}
.selectListcheck .iconfont {
font-size: 32rpx;
}
.selectListcheck .iconweigouxuan {
color: rgba(25,31,37,0.12);
color: rgba(25, 31, 37, 0.12);
}
.selectListcheck .iconxuanzhong2 {
color: #3296FA;
}
.roomMessage {
width: 100%;
align-items: center
}
.reserveRoomTitle {
font-size: 32rpx;
color: #191F25;
line-height: 34rpx;
margin-bottom: 16rpx;
}
.reserveRoomEquipFacility {
font-size: 24rpx;
color: rgba(25,31,37,0.56);
color: rgba(25, 31, 37, 0.56);
letter-spacing: 0;
line-height: 26rpx;
margin-bottom: 16rpx;
}
.reserveRoomEquipFacility text {
color: rgba(25,31,37,0.56);
color: rgba(25, 31, 37, 0.56);
}
.reserveRoomNumAndLocation {
display: flex;
font-size: 24rpx;
color: rgba(25,31,37,0.56);
color: rgba(25, 31, 37, 0.56);
letter-spacing: 0;
}
.reserveRoomNum {
margin-right: 16rpx;
color: rgba(25,31,37,0.56);
color: rgba(25, 31, 37, 0.56);
}
.reserveRoomLocation {
color: rgba(25,31,37,0.56);
color: rgba(25, 31, 37, 0.56);
}
.reserveRoomTimeBarBg{
.reserveRoomTimeBarBg {
width: 100%;
display: flex;
margin-top: 32rpx;
border: 1px solid rgba(25,31,37,0.08);
border: 1px solid rgba(25, 31, 37, 0.08);
box-sizing: border-box;
}
.reserveRoomTimeBarBg>view{
.reserveRoomTimeBarBg>view {
flex: 1;
height: 32rpx;
border-right: 1px solid #ffffff;
box-sizing: border-box;
}
.reserveRoomTimeBarBg>view:nth-of-type(48){
.reserveRoomTimeBarBg>view:nth-of-type(48) {
border-right: none !important;
}
.preemption {
background: #FFFFFF;
}
.expired {
background: #EDEDEE;
}
.reservation {
background: #FFFFFF;
}
.occupied {
background: #3296FA;
}
.reserveRoomTimeBarNum {
display: flex;
margin-top: 12rpx;
font-size: 20rpx;
color: #A3A5A8;
}
.reserveRoomTimeBarNum > view {
.reserveRoomTimeBarNum>view {
flex: 1;
}
/* 弹框的样式 */
.modal{
.modal {
position: fixed;
left: 0;
top: 0;
......@@ -177,57 +214,66 @@
height: 100%;
display: flex;
align-items: flex-end;
background: rgba(0,0,0,.15);
background: rgba(0, 0, 0, .15);
}
.modalContent{
.modalContent {
width: 100%;
height: 838rpx;
background: #FFFFFF;
box-shadow: 0 -2px 20px 0 rgba(25,31,37,0.12);
box-shadow: 0 -2px 20px 0 rgba(25, 31, 37, 0.12);
}
.modalHeader{
.modalHeader {
height: 104rpx;
line-height: 104rpx;
font-size: 34rpx;
display: flex;
padding: 0 32rpx;
box-sizing: border-box;
border-bottom: 1px solid rgba(25,31,37,0.12);
border-bottom: 1px solid rgba(25, 31, 37, 0.12);
}
.modalHeader>view{
.modalHeader>view {
flex: 1;
}
.modalHeader>view:nth-of-type(1){
.modalHeader>view:nth-of-type(1) {
color: #191F25;
text-align: left;
}
.modalHeader>view:nth-of-type(2){
.modalHeader>view:nth-of-type(2) {
color: #3296FA;
text-align: right;
}
.changeDay{
.changeDay {
width: 100%;
border-bottom: 1px solid rgba(25,31,37,0.12);
border-bottom: 1px solid rgba(25, 31, 37, 0.12);
font-size: 30rpx;
text-align: center;
display: flex;
height: 104rpx;
line-height: 104rpx;
}
.changeDay>view {
flex: 1;
}
.modalOccupyTimeSlot{
.modalOccupyTimeSlot {
height: 504rpx;
width: 100%;
}
.modalOccupyTimeSlot>view{
.modalOccupyTimeSlot>view {
height: 100rpx;
width: 100%;
padding-left: 32rpx;
}
.OccupyTimeList{
.OccupyTimeList {
height: 100rpx;
width: 100%;
box-sizing: border-box;
......@@ -235,75 +281,88 @@
display: flex;
align-items: center;
}
.OccupyTimeList>view:nth-of-type(1){
.OccupyTimeList>view:nth-of-type(1) {
width: 40rpx;
height: 40rpx;
border-radius: 50%;
margin-right: 32rpx;
}
.OccupyTimeList>view:nth-of-type(2){
.OccupyTimeList>view:nth-of-type(2) {
flex: 1;
display: flex;
height: 100rpx;
line-height: 100rpx;
box-sizing: border-box;
border-bottom: 1px solid rgba(25,31,37,0.12);
border-bottom: 1px solid rgba(25, 31, 37, 0.12);
}
.OccupyTimeList>view:nth-of-type(2) view{
.OccupyTimeList>view:nth-of-type(2) view {
flex: 1;
}
.OccupyTimeList>view:nth-of-type(2) view:nth-of-type(1){
.OccupyTimeList>view:nth-of-type(2) view:nth-of-type(1) {
color: #000000;
font-size: 34rpx;
font-weight: bold;
}
.OccupyTimeList>view:nth-of-type(2) view:nth-of-type(2){
.OccupyTimeList>view:nth-of-type(2) view:nth-of-type(2) {
text-align: right;
margin-right: 32rpx;
}
.beOverdue{
width: 40rpx;
height: 40rpx;
border-radius: 50%;
background: rgba(25,31,37,0.12);
box-sizing: border-box;
}
.Unchecked{
width: 40rpx;
height: 40rpx;
border-radius: 50%;
box-sizing: border-box;
border: 3px solid #979797;
}
.checked{
width: 40rpx;
height: 40rpx;
border-radius: 50%;
background: #3296FA;
box-sizing: border-box;
}
.iconyigouxuan{
.beOverdue {
width: 40rpx;
height: 40rpx;
border-radius: 50%;
background: rgba(25, 31, 37, 0.12);
box-sizing: border-box;
}
.Unchecked {
width: 40rpx;
height: 40rpx;
border-radius: 50%;
box-sizing: border-box;
border: 3px solid #979797;
}
.checked {
width: 40rpx;
height: 40rpx;
border-radius: 50%;
background: #3296FA;
box-sizing: border-box;
}
.iconyigouxuan {
color: #3296FA;
}
/* 区域选择样式 */
.lableTreeBox{
.lableTreeBox {
position: fixed;
left: 0;
top: 0;
width: 100%;
height: 100%;
background: rgba(0,0,0,.1);
background: rgba(0, 0, 0, .1);
display: flex;
align-items: flex-end;
}
.lableTreeContent{
.lableTreeContent {
width: 100%;
height: 527rpx;
background: #FFFFFF;
box-shadow: 0 -2rpx 20rpx 0 rgba(25,31,37,0.12);
box-shadow: 0 -2rpx 20rpx 0 rgba(25, 31, 37, 0.12);
border-radius: 19rpx 19rpx 0px 0px;
}
.lableTreeHeader{
.lableTreeHeader {
width: 100%;
height: 104rpx;
padding: 0 32rpx;
......@@ -311,28 +370,40 @@
font-size: 34rpx;
display: flex;
box-sizing: border-box;
border-bottom: 1px solid rgba(25,31,37,0.12);
border-bottom: 1px solid rgba(25, 31, 37, 0.12);
}
.lableTreeHeader>view{
.lableTreeHeader>view {
flex: 1;
height: 104rpx;
}
.lableTreeHeader>view:nth-of-type(1) {
color: #191F25;
}
.lableTreeHeader>view:nth-of-type(2) {
color: #3296FA;
text-align: right
}
.dataNumSelected {
color: #3296FA;
}
.roomScrollView{
.roomScrollView {
height: 100vh;
padding-top: 192rpx;
box-sizing: border-box;
}
.reserveRoomMsg .iconfont{
.reserveRoomMsg .iconfont {
font-size: 24rpx;
margin-right: 8rpx;
}
.occupiedStatus {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
\ No newline at end of file
pages/place/place.acss
......@@ -8,7 +8,7 @@ page {
.icon {
text-align: left;
font-size: 40rpx;
font-size: 32rpx;
color: rgba(25, 31, 37, 0.40);
vertical-align: center;
margin-right: 24rpx;
......@@ -17,9 +17,8 @@ page {
.search {
background: white;
display: flex;
padding: 38rpx 32rpx;
padding: 0 32rpx;
border-bottom: 1rpx solid rgba(25, 31, 37, 0.12);
align-items: center;
}
.search input {
......@@ -45,7 +44,7 @@ page {
color: #191F25;
}
.iconhuiyishi {
.iconhuiyishi2 {
line-height: 112rpx;
}
......
pages/place/place.axml
<view class="place">
<view class="search">
<view class="icon iconfont iconsousuo">
<view class="icon iconfont iconsousuo1">
</view>
<input placeholder="搜索地点" onInput="inputPlace"/>
<input placeholder="搜索地点" onInput="inputPlace"/>
</view>
<view class="availableList" a:if="{{!place}}">
<view class="title">
......@@ -10,7 +10,7 @@
</view>
<block a:for="{{availableMeetingRoom}}">
<view class="mettingRoom" data-locationName="{{item.name}}" data-locationid="{{item.meetingRoomId}}" onTap="selectMeetingRoom">
<view class="icon iconfont iconhuiyishi">
<view class="icon iconfont iconhuiyishi2">
</view>
<view class="mettingRoomRight">
<view class="name">
......
pages/remind/remind.axml
......@@ -4,7 +4,7 @@
<view class="remindText">
{{item.text}}
</view>
<view class="iconfont iconxuanzhong1 {{aheadTimes.includes(item.time)?'select':''}}">
<view class="iconfont iconxuanzhong1 {{saveTime.includes(item.time)?'select':''}}">
</view>
</view>
</view>
......
pages/remind/remind.js
......@@ -13,28 +13,35 @@ create.Page({
{ time: 1440, text: '1天前' },
{ time: 2880, text: '2天前' },
{ time: 10080, text: '1周前' }
]
],
saveTime: []
},
onLoad() {
dd.setNavigationBar({
title: '会前提醒'
})
this.setData({
saveTime: [...this.store.data.aheadTimes]
})
},
selectTimes(event) {
if (this.store.data.aheadTimes.includes(event.target.dataset.item.time)) {
this.store.data.aheadTimes.forEach((item, index) => {
if (this.data.saveTime.includes(event.target.dataset.item.time)) {
this.data.saveTime.forEach((item, index) => {
if (item == event.target.dataset.item.time) {
this.store.data.aheadTimes.splice(index, 1)
this.data.saveTime.splice(index, 1)
}
return
})
}
else {
this.store.data.aheadTimes.push(event.target.dataset.item.time)
this.data.saveTime.push(event.target.dataset.item.time)
}
this.update()
this.setData({
saveTime: this.data.saveTime
})
},
save() {
this.store.data.aheadTimes = this.data.saveTime
this.update()
dd.navigateBack({
delta: 1
......
pages/repeatMechanism/repeatMechanism.acss
......@@ -16,11 +16,11 @@ page {
}
.repeatRight {
border-bottom: 1rpx solid;
border-bottom: 1rpx solid rgba(25, 31, 37, 0.12);
height: 112rpx;
margin-bottom: 10rpx;
padding-right: 32rpx;
border-bottom: rgba(25, 31, 37, 0.12)
margin-top: 1rpx;
}
.icon {
......
pages/scheduleDetail/scheduleDetail.acss
......@@ -235,20 +235,24 @@ page {
.bottom {
width: 686rpx;
display: flex;
line-height: 112rpx;
padding: 0 32rpx;
position: fixed;
background: white;
height: 112rpx;
height: 100rpx;
line-height: 100rpx;
bottom: 0;
justify-content: space-around;
color: rgba(25, 31, 37, 0.56);
font-size: 28rpx;
box-shadow: 0 -2px 16px 0 rgba(25,31,37,0.10);
}
.bottom .iconfont {
margin-right: 12rpx;
}
.buttonGroup {
flex: 1;
text-align: center;}
.buttonGroup text {
vertical-align: top;
......@@ -378,6 +382,7 @@ page {
.dynamicContent {
width: 750rpx;
background: #fff;
padding-bottom: 48rpx;
display: inline-block;
}
......@@ -399,10 +404,10 @@ page {
color: #15BC83;
}
.iconbucanjia2 {
color: #E60012;
color:#F25643;
}
.red {
color: #E60012;
color: #F25643;
}
.green {
color: #15BC83;
......
pages/scheduleDetail/scheduleDetail.axml
......@@ -45,7 +45,7 @@
</view>
</view>
<!-- 参会人 -->
<view class="participants" onTap="nextPage" data-nextPage="participants">
<view class="participants" onTap="nextPage" data-nextPage="participants" a:if="{{!(userList.length == 1)}}">
<view class="icon iconcanhuiren iconfont"></view>
<view class="scroll" v-if="{{!!userList.length}}">
<text class="imageGroup" a:for="{{userList}}" a:for-item="item">
......@@ -86,7 +86,7 @@
<text class="line">|</text>
<text class="iconshangchuanwenjian1 iconfont"></text></view></view>
<!-- 动态详情展示 -->
<view class="dynamicContent">
<view class="dynamicContent" a:if="{{!!allFileInfo.length}}">
<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">
......@@ -105,7 +105,8 @@
{{item2.fileName}}
</view>
</view>
<view class="modFile" a:if="{{organizer == pemissions?(item.meetingLogId == meetingLogId):(item.meetingLogId == meetingLogId&&item.scheduleAccessory.uploaderInfo.userId==pemissions)}}">
<!-- a:if="{{organizer == pemissions?(item.meetingLogId == meetingLogId):(item.meetingLogId == meetingLogId&&item.scheduleAccessory.uploaderInfo.userId==pemissions)}}" -->
<view class="modFile" >
<view class="ediFile" data-nextPage="editFile" catchTap="nextPage" data-file="{{item.scheduleAccessory}}">
编辑
</view>
......@@ -126,34 +127,34 @@
</view>
<!-- 底部按钮 -->
<view class="bottom">
<view class="buttonGroup" data-value=1 onTap="confirmAtten" a:if="{{!(organizer == pemissions)&&isRepeatable == 0}}">
<view class="buttonGroup" data-value=1 onTap="confirmAtten" a:if="{{(organizer != pemissions)&&isRepeatable == 0}}">
<text class="iconcanjia2 iconfont" a:if="{{currentParStaus == 1}}"></text>
<text class="iconcanjia3 iconfont" a:else ></text>
<text class="{{currentParStaus == 1?'green': ''}}">参加</text>
</view>
<picker range="{{['仅参加本次', '参加所有']}}" a:if="{{!(organizer == pemissions)&&isRepeatable == 1}}" data-value=1 onChange="confirmRepeatAtten">
<view>
<view class="buttonGroup">
<view class="buttonGroup" a:if="{{(organizer != pemissions)&&isRepeatable == 1}}">
<picker range="{{['仅参加本次', '参加所有']}}" data-value=1 onChange="confirmRepeatAtten">
<view>
<text class="iconcanjia2 iconfont" a:if="{{currentParStaus == 1}}"></text>
<text class="iconcanjia3 iconfont" a:else></text>
<text class="{{currentParStaus == 1?'green': ''}}">参加</text>
</view>
</view>
</picker>
<view class="buttonGroup" data-value=0 onTap="confirmAtten" a:if="{{!(organizer == pemissions)&&isRepeatable == 0}}">
</picker>
</view>
<view class="buttonGroup" data-value=0 onTap="confirmAtten" a:if="{{(organizer != pemissions)&&isRepeatable == 0}}">
<text class="iconbucanjia2 iconfont" a:if="{{currentParStaus == 0}}"></text>
<text class="iconbucanjia3 iconfont" a:else></text>
<text class="{{currentParStaus == 0?'red': ''}}">不参加</text>
</view>
<picker range="{{['仅不参加本次', '不参加所有']}}" data-value=0 onChange="cancelRepeatAtten" a:if="{{!(organizer == pemissions)&&isRepeatable == 1}}">
<view>
<view class="buttonGroup">
<view class="buttonGroup" a:if="{{(organizer != pemissions)&&isRepeatable == 1}}">
<picker range="{{['仅不参加本次', '不参加所有']}}" data-value=0 onChange="cancelRepeatAtten" a:if="{{!(organizer == pemissions)&&isRepeatable == 1}}">
<view>
<text class="iconbucanjia2 iconfont" a:if="{{currentParStaus == 0}}"></text>
<text class="iconbucanjia3 iconfont" a:else></text>
<text class="{{currentParStaus == 0?'red': ''}}">不参加</text>
</view>
</view>
</picker>
</picker>
</view>
<view class="buttonGroup" data-nextPage="edit" onTap="nextPage">
<text class="iconbianji iconfont"></text>
<text>编辑</text>
......
pages/scheduleDetail/scheduleDetail.js
......@@ -59,7 +59,7 @@ create.Page({
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]
week: this.data.weeks[new Date(res.data.data.startTime.replace(/\-/g, '/')).getDay() - 1]
})
this.store.data.userList = res.data.data.userList
this.store.data.aheadTimes = res.data.data.aheadTimes
......@@ -119,12 +119,12 @@ create.Page({
space: { spaceId: _that.data.uploadSpaceId, compress: true, isCopy: 1, max: 9 },
types: ["photo", "camera", "space"],
success: (res) => {
dd.navigateTo({ url: `./../uploadFile/uploadFile?scheduleItem=${JSON.stringify(_that.data.scheduleItem)}&upLoadInfo=${JSON.stringify(res)}` })
dd.navigateTo({ url: `./../uploadFile/uploadFile?scheduleItem=${JSON.stringify(_that.data.scheduleItem)}&upLoadInfo=${encodeURIComponent(JSON.stringify(res))}` })
},
fail: (err) => {
dd.alert({
content: JSON.stringify(err)
})
// dd.alert({
// content: JSON.stringify(err)
// })
}
})
},
......@@ -154,8 +154,8 @@ create.Page({
})
let data = event.target.dataset.file.id
dd.confirm({
title: '温馨提示',
content: '确认删除本次上传文件吗',
title: '删除文件',
content: '确认删除文件吗？',
confirmButtonText: '确定',
cancelButtonText: '取消',
success: (success) => {
......@@ -238,17 +238,30 @@ create.Page({
},
// 判断是刚刚 五分钟以内 十分钟以内 正常时间年月日
dealFileTime(creatTime) {
creatTime = creatTime.replace(/\-/g, "/")
let nowTime = new Date().getTime()
let time = new Date(creatTime).getTime()
console.log(creatTime, 111111)
let timeResule = ''
if ((nowTime - time) / 1000 < 60) {
timeResule = '刚刚'
} else if ((nowTime - time) / 1000 < 60 * 5 || (nowTime - time) / 1000 == 60) {
timeResule = '5分钟以内'
creatTime = creatTime.replace(/\-/g, "/")
let year = new Date().getFullYear()
let month = new Date().getMonth() + 1
let day = new Date().getDate()
let creatYear = new Date(creatTime).getFullYear()
let creatMonth = new Date(creatTime).getMonth() + 1
let creatDay = new Date(creatTime).getDate()
if (year == creatYear) {
if (day == creatDay) {
if (new Date().getTime() - new Date(creatTime).getTime() > 60 * 2 * 1000) {
timeResule = `${creatTime.substring(11, 16)}`
} else {
timeResule = '刚刚'
}
} else {
timeResule = `${creatTime.substring(5, 7)}月${creatTime.substring(8, 10)}日 ${creatTime.substring(11, 16)}`
}
} else {
timeResule = creatTime.substring(0, 16)
timeResule = `${creatTime.substring(0, 4)}年${creatTime.substring(5, 7)}月${creatTime.substring(8, 10)}日 ${creatTime.substring(11, 16)}`
}
return timeResule
},
// 确认参加不参加 单次的会议
......@@ -348,6 +361,4 @@ create.Page({
})
})
}
});
})
pages/uploadFile/uploadFile.js
......@@ -12,7 +12,7 @@ create.Page({
},
onLoad(event) {
let scheduleItem = JSON.parse(event.scheduleItem)
let upLoadInfo = JSON.parse(event.upLoadInfo)
let upLoadInfo = JSON.parse(decodeURIComponent(event.upLoadInfo))
this.setData({
scheduleItem: scheduleItem,
upLoadInfo: upLoadInfo
......
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