Commit e953b9b0 by fengzhaoyu

加上了权限

parent 224a17bf
...@@ -28,7 +28,7 @@ page { ...@@ -28,7 +28,7 @@ page {
text-align: center; text-align: center;
} }
.headImg image { .headImg image {
vertical-align: middle; vertical-align: top;
width: 64rpx; width: 64rpx;
height: 64rpx; height: 64rpx;
border-radius: 50%; border-radius: 50%;
......
...@@ -22,6 +22,7 @@ page { ...@@ -22,6 +22,7 @@ page {
color: #191F25; color: #191F25;
padding: 30rpx 32rpx; padding: 30rpx 32rpx;
border-bottom: 1rpx solid rgba(25, 31, 37, 0.12); border-bottom: 1rpx solid rgba(25, 31, 37, 0.12);
position: relative;
} }
.theme input { .theme input {
...@@ -81,7 +82,7 @@ page { ...@@ -81,7 +82,7 @@ page {
.startTime { .startTime {
width: 355rpx; width: 355rpx;
text-indent: 32rpx; text-indent: 32rpx;
position: relative; /* position: relative; */
/* border-right: 1rpx solid rgba(25, 31, 37, 0.12); */ /* border-right: 1rpx solid rgba(25, 31, 37, 0.12); */
} }
...@@ -273,16 +274,20 @@ page { ...@@ -273,16 +274,20 @@ page {
} }
.editList { .editList {
padding: 24rpx 16rpx; width: 670rpx;
padding: 0 16rpx;
box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.13); box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.13);
background: #fff; background: #fff;
display: flex; display: flex;
width: 670rpx; width: 670rpx;
border-radius: 6rpx; border-radius: 6rpx;
margin: 24rpx 0 0 24rpx; margin: 24rpx 24rpx 0 24rpx;
justify-content: space-around; justify-content: space-around;
} }
.editList>view {
margin: 24rpx 0;
}
.listIcon { .listIcon {
line-height: 30rpx; line-height: 30rpx;
text-align: center; text-align: center;
...@@ -322,6 +327,7 @@ page { ...@@ -322,6 +327,7 @@ page {
.repeatContaint { .repeatContaint {
width: 100%; width: 100%;
height: auto;
} }
.repeat .iconshanchu { .repeat .iconshanchu {
...@@ -363,4 +369,18 @@ page { ...@@ -363,4 +369,18 @@ page {
.blank>text { .blank>text {
margin-right: 10rpx; margin-right: 10rpx;
} }
\ No newline at end of file .container {
position: relative;
}
.permissions {
width: 100%;
background:rgba(0, 0, 0, 0);
position: absolute;
height: 100%;
top: 0;
z-index: 10;
}
.noPermissions {
opacity: 0.6;
}
...@@ -6,8 +6,8 @@ create.Page({ ...@@ -6,8 +6,8 @@ create.Page({
store: exampleStore, store: exampleStore,
useAll: true, useAll: true,
data: { data: {
modifyModel: '', modifyModel: 'only',
deleteModel: '', deleteModel: 'only',
timeStaus: '', timeStaus: '',
isShowModal: false, isShowModal: false,
title: '', title: '',
...@@ -32,6 +32,7 @@ create.Page({ ...@@ -32,6 +32,7 @@ create.Page({
}, },
onLoad(event) { onLoad(event) {
let index = new Date().getDay() let index = new Date().getDay()
let title = `${getApp().globalData.name}创建的会议`
this.data.repeatWeek = this.data.repeatWeek[index - 1] this.data.repeatWeek = this.data.repeatWeek[index - 1]
this.store.data.remark = '' this.store.data.remark = ''
this.store.data.recurrenceModel = { this.store.data.recurrenceModel = {
...@@ -62,7 +63,8 @@ create.Page({ ...@@ -62,7 +63,8 @@ create.Page({
week2: w, week2: w,
type: event.type, type: event.type,
permissions: getApp().globalData.userid, permissions: getApp().globalData.userid,
repeatWeek: this.data.repeatWeek repeatWeek: this.data.repeatWeek,
title:title
}) })
if (!!event.scheduleItem) { if (!!event.scheduleItem) {
let scheduleItem = JSON.parse(event.scheduleItem) let scheduleItem = JSON.parse(event.scheduleItem)
...@@ -400,6 +402,7 @@ create.Page({ ...@@ -400,6 +402,7 @@ create.Page({
week1: this.data.weekList[new Date(res.data.data.startTime.replace(/\//g, "-")).getDay()], week1: this.data.weekList[new Date(res.data.data.startTime.replace(/\//g, "-")).getDay()],
week2: this.data.weekList[new Date(res.data.data.endTime.replace(/\//g, "-")).getDay()] week2: this.data.weekList[new Date(res.data.data.endTime.replace(/\//g, "-")).getDay()]
}) })
console.log(this.data.organizer, 1111111)
this.update() this.update()
this.conflict() this.conflict()
...@@ -494,13 +497,13 @@ create.Page({ ...@@ -494,13 +497,13 @@ create.Page({
saveRepeat(event) { saveRepeat(event) {
let modifyModel = '' let modifyModel = ''
switch (event.detail.value) { switch (event.detail.value) {
case 0: case '0':
modifyModel = 'only' modifyModel = 'only'
break; break;
case 1: case '1':
modifyModel = 'future' modifyModel = 'future'
break; break;
case 2: case '2':
modifyModel = 'all' modifyModel = 'all'
break; break;
} }
...@@ -512,22 +515,21 @@ create.Page({ ...@@ -512,22 +515,21 @@ create.Page({
// 删除重复日程 // 删除重复日程
deleteRepeatSchedule(event) { deleteRepeatSchedule(event) {
let deleteModel = '' let deleteModel = ''
console.log(event.detail.value)
switch (event.detail.value) { switch (event.detail.value) {
case 0 || '0': case '0':
deleteModel = 'only' deleteModel = 'only';
break; break;
case 1 || '1': case '1':
deleteModel = 'future' deleteModel = 'future';
break; break;
case 2 || '2': case '2':
deleteModel = 'all' deleteModel = 'all';
break; break;
} }
this.setData({ this.setData({
deleteModel: deleteModel deleteModel: deleteModel
}) })
console.log(11111)
console.log(JSON.stringify(this.data.scheduleItem.planDate))
let data = { let data = {
planDate: this.data.scheduleItem.planDate, planDate: this.data.scheduleItem.planDate,
templateId: this.data.scheduleItem.scheduleTemplateId, templateId: this.data.scheduleItem.scheduleTemplateId,
...@@ -539,7 +541,6 @@ create.Page({ ...@@ -539,7 +541,6 @@ create.Page({
delta: 2 delta: 2
}) })
}) })
}, },
// 已选用户去中去掉必选用户 // 已选用户去中去掉必选用户
selectedelRequired(req, pic) { selectedelRequired(req, pic) {
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
</view> </view>
<view class="info"> <view class="info">
<text class="name">{{item.username}}</text> <text class="name">{{item.username}}</text>
<text class="close iconshanchu iconfont" data-userId="{{item.userId}}" onTap="delParticipants"></text> <text class="close iconshanchu iconfont" a:if="{{!!scheduleItem?(organizer == permissions?(permissions!=item.userId):(permissions!=item.userId&&!requireUsers.includes(item.userId))):(permissions!=item.userId)}}" data-userId="{{item.userId}}" onTap="delParticipants"></text>
</view> </view>
</view> </view>
<view class="button"> <view class="button">
......
...@@ -10,11 +10,11 @@ create.Page({ ...@@ -10,11 +10,11 @@ create.Page({
scheduleItem: '', scheduleItem: '',
requireUsers: [], requireUsers: [],
organizer: '', organizer: '',
myself: '', permissions: '',
requireUsersInfo: [] requireUsersInfo: []
}, },
onLoad(event) { onLoad(event) {
let myself = getApp().globalData.userid let permissions = getApp().globalData.userid
let scheduleItem = JSON.parse(event.scheduleItem) let scheduleItem = JSON.parse(event.scheduleItem)
let organizer = event.organizer let organizer = event.organizer
let requireUsers = JSON.parse(event.requireUsers) let requireUsers = JSON.parse(event.requireUsers)
...@@ -25,7 +25,7 @@ create.Page({ ...@@ -25,7 +25,7 @@ create.Page({
scheduleItem: scheduleItem, scheduleItem: scheduleItem,
time1: scheduleItem.startTime, time1: scheduleItem.startTime,
time2: scheduleItem.endTime, time2: scheduleItem.endTime,
myself: myself, permissions: permissions,
requireUsersInfo: requireUsersInfo requireUsersInfo: requireUsersInfo
}) })
dd.setNavigationBar({ dd.setNavigationBar({
......
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