Commit cadcb690 by fengzhaoyu

弹窗

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