Commit 10dee20f by fengzhaoyu

隐藏编辑删除

parent c0b0cdab
{ {
"pages": [ "pages": [
"pages/index/index", "pages/index/index",
"pages/meetingRoomList/meetingRoomList",
"pages/uploadFile/uploadFile", "pages/uploadFile/uploadFile",
"pages/meetingRoomList/meetingRoomList",
"pages/repetitionTime/repetitionTime", "pages/repetitionTime/repetitionTime",
"pages/createOrEditSchedule/createOrEditSchedule", "pages/createOrEditSchedule/createOrEditSchedule",
"pages/repeatMechanism/repeatMechanism", "pages/repeatMechanism/repeatMechanism",
......
<!-- <mw-select></mw-select> --> <!-- <mw-select></mw-select> -->
版本号:112 版本号:115
<scroll-view a:if="{{todayStr !== ''}}" scroll-y="{{true}}" upper-threshold="50" lower-threshold="50" onScrollToLower="lower" onScroll="onScroll" style="height: 100vh;" scroll-into-view="{{todayStr}}"> <scroll-view a:if="{{todayStr !== ''}}" scroll-y="{{true}}" upper-threshold="50" lower-threshold="50" onScrollToLower="lower" onScroll="onScroll" style="height: 100vh;" scroll-into-view="{{todayStr}}">
<block a:for="{{scheduleList}}" a:for-item="scheduleYearList"> <block a:for="{{scheduleList}}" a:for-item="scheduleYearList">
<block a:for="{{scheduleYearList}}"> <block a:for="{{scheduleYearList}}">
......
...@@ -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" 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> <text class="close iconshanchu-1 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">
......
...@@ -8,6 +8,7 @@ page { ...@@ -8,6 +8,7 @@ page {
} }
.iconfont { .iconfont {
font-size: 32rpx; font-size: 32rpx;
vertical-align: top;
} }
::-webkit-scrollbar { ::-webkit-scrollbar {
display: none display: none
...@@ -34,6 +35,7 @@ page { ...@@ -34,6 +35,7 @@ page {
} }
.title .text, .place .text, .time .text, .remind .text { .title .text, .place .text, .time .text, .remind .text {
vertical-align: top;
line-height: 112rpx; line-height: 112rpx;
width: 100%; width: 100%;
border-bottom: 1rpx solid rgba(25, 31, 37, 0.12); border-bottom: 1rpx solid rgba(25, 31, 37, 0.12);
...@@ -261,7 +263,8 @@ page { ...@@ -261,7 +263,8 @@ page {
.describe .text { .describe .text {
padding: 27rpx 0; padding: 27rpx 0;
line-height: 44rpx; margin-top: 10rpx;
} }
.modFile { .modFile {
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
</view> </view>
<!-- 地址 --> <!-- 地址 -->
<view class="place" a:if="{{!!location.locationName}}"> <view class="place" a:if="{{!!location.locationName}}">
<view class="icon icondingwei iconfont"> <view class="icon iconhuiyishi2 iconfont">
</view> </view>
<view class="text"> <view class="text">
{{location.locationName}} {{location.locationName}}
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
</view></view> </view></view>
<!-- 会议描述 --> <!-- 会议描述 -->
<view class="describe" a:if="{{!!remark}}"> <view class="describe" a:if="{{!!remark}}">
<view class="icon iconhuiyimiaoshu iconfont"></view> <view class="icon iconmiaoshu iconfont"></view>
<view class="text"> <view class="text">
{{remark}} {{remark}}
</view></view> </view></view>
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
{{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)}}"> <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 class="ediFile" data-nextPage="editFile" catchTap="nextPage" data-file="{{item.scheduleAccessory}}">
编辑 编辑
</view> </view>
......
...@@ -153,9 +153,6 @@ create.Page({ ...@@ -153,9 +153,6 @@ create.Page({
meetingLogId: '' meetingLogId: ''
}) })
let data = event.target.dataset.file.id let data = event.target.dataset.file.id
console.log(111111)
console.log(event.target.dataset.file.id)
console.log(22222222)
dd.confirm({ dd.confirm({
title: '温馨提示', title: '温馨提示',
content: '确认删除本次上传文件吗', content: '确认删除本次上传文件吗',
...@@ -165,7 +162,6 @@ create.Page({ ...@@ -165,7 +162,6 @@ create.Page({
if (!!success.confirm) { if (!!success.confirm) {
if (!!this.data.scheduleItem.id) { if (!!this.data.scheduleItem.id) {
delFile(data).then(res => { delFile(data).then(res => {
console.log(JSON.stringify(res))
_that.showFile(this.data.scheduleItem.id) _that.showFile(this.data.scheduleItem.id)
}) })
} else { } else {
......
...@@ -51,15 +51,18 @@ page { ...@@ -51,15 +51,18 @@ page {
margin-top: 40rpx; margin-top: 40rpx;
} }
.icontianjia { .icontianjia1 {
vertical-align: top;
line-height: 33rpx; line-height: 33rpx;
color: #3296fa; color: #3296fa;
margin-right: 16rpx; margin-right: 16rpx;
} }
.addText { .addText {
margin-top: 10rpx;
line-height: 33rpx;
vertical-align: top; vertical-align: top;
font-size: 24rpx; font-size: 28rpx;
color: #3296FA; color: #3296FA;
} }
...@@ -83,6 +86,7 @@ page { ...@@ -83,6 +86,7 @@ page {
.pdf { .pdf {
background: url(../../assests/pdf.png) center /100% 100%; background: url(../../assests/pdf.png) center /100% 100%;
} }
.image { .image {
background: url(../../assests/image.png) center /100% 100%; background: url(../../assests/image.png) center /100% 100%;
} }
...@@ -94,6 +98,7 @@ page { ...@@ -94,6 +98,7 @@ page {
.mov { .mov {
background: url(../../assests/mp4.png) center /100% 100%; background: url(../../assests/mp4.png) center /100% 100%;
} }
.mp4 { .mp4 {
background: url(../../assests/mp4.png) center /100% 100%; background: url(../../assests/mp4.png) center /100% 100%;
} }
...@@ -101,6 +106,7 @@ page { ...@@ -101,6 +106,7 @@ page {
.ppt { .ppt {
background: url(../../assests/ppt.png) center /100% 100%; background: url(../../assests/ppt.png) center /100% 100%;
} }
.pptx { .pptx {
background: url(../../assests/ppt.png) center /100% 100%; background: url(../../assests/ppt.png) center /100% 100%;
} }
......
...@@ -10,11 +10,11 @@ ...@@ -10,11 +10,11 @@
{{item.fileName}} {{item.fileName}}
</view> </view>
</view> </view>
<view class="close iconshanchu iconfont" data-item="{{item}}" onTap="close"> <view class="close iconshanchu2 iconfont" data-item="{{item}}" onTap="close">
</view> </view>
</view> </view>
<view class="add" onTap="add"> <view class="add" onTap="add">
<text class="icontianjia iconfont"></text> <text class="icontianjia1 iconfont"></text>
<text class="addText">继续添加</text> <text class="addText">继续添加</text>
</view> </view>
<view class="save"> <view class="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