Skip to content

S
schedule
Commit efc1f325 by liang ce
Options

修改页面抖动

parent c4c9eb45
Showing with 144 additions and 130 deletions
pages/createOrEditSchedule/createOrEditSchedule.js
...@@ -89,9 +89,11 @@ create.Page({ ...@@ -89,9 +89,11 @@ create.Page({
this.store.data.week2 = this.data.week2 this.store.data.week2 = this.data.week2
this.store.data.aheadTimes = [15] this.store.data.aheadTimes = [15]
this.update() this.update()
this.setData({ setTimeout(() => {
showPage: true this.setData({
}) showPage: true
})
}, 300)
} }
}, },
onShow() { onShow() {
...@@ -459,9 +461,13 @@ create.Page({ ...@@ -459,9 +461,13 @@ create.Page({
time2: res.data.data.endTime.replace(/-/g, '/'), time2: res.data.data.endTime.replace(/-/g, '/'),
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()],
showPage: true
}) })
this.update() this.update()
setTimeout(() => {
this.setData({
showPage: true
})
}, 300)
this.conflict() this.conflict()
}) })
}, },
......
pages/scheduleDetail/scheduleDetail.axml
<view class="scheduleDetail"> <block a:if="{{showPage}}">
<view class="scheduleInfo"> <view class="scheduleDetail">
<!-- 标题 --> <view class="scheduleInfo">
<view class="title"> <!-- 标题 -->
<view class="icon icondidianmiaoshu iconfont"> <view class="title">
</view> <view class="icon icondidianmiaoshu iconfont">
<view class="text"> </view>
{{title}} <view class="text">
</view> {{title}}
</view> </view>
<!-- 地址 -->
<view class="place" a:if="{{!!location.locationName}}">
<view class="icon icondingwei iconfont">
</view>
<view class="text">
{{location.locationName}}
</view> </view>
</view> <!-- 地址 -->
<!-- 时间 --> <view class="place" a:if="{{!!location.locationName}}">
<view class="time"> <view class="icon icondingwei iconfont">
<view class="icon iconshijian iconfont"> </view>
<view class="text">
{{location.locationName}}
</view>
</view> </view>
<view class="text" a:if="{{isAcrossDay}}"> <!-- 时间 -->
<view> <view class="time">
{{` <view class="icon iconshijian iconfont">
${time1.substring(5, 7)}月${time1.substring(8, 10)}日 ${time1.substring(11, 16)} 至 </view>
${time2.substring(5, 7)}月${time2.substring(8, 10)}日 ${time2.substring(11, 16)} <view class="text" a:if="{{isAcrossDay}}">
`}} <view>
<view class="repeatTip" a:if="{{!!isRepeatable}}"> {{`
每周三重复，截止到2020年3月29 ${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> </view>
</view> <view class="text" a:else>
<view class="text" a:else> <text>
<text> {{`${time1.substring(5, 7)}月${time1.substring(8, 10)}日 ${week} ${time1.substring(11, 16)}-${time2.substring(11, 16)}`}}
{{`${time1.substring(5, 7)}月${time1.substring(8, 10)}日 ${week} ${time1.substring(11, 16)}-${time2.substring(11, 16)}`}} </text>
</text> <view class="repeatTip" a:if="{{!!isRepeatable}}">
<view class="repeatTip" a:if="{{!!isRepeatable}}"> {{recModel.model=='day_in_week'?(recModel.weekDayList.length==5?'每周的工作日重复':'每'+week+'重复'):'每天重复'}},
{{recModel.model=='day_in_week'?(recModel.weekDayList.length==5?'每周的工作日重复':'每'+week+'重复'):'每天重复'}}, {{recModel.forever=='1'? '永不截止':'截止到'+recModel.terminateTime}}
{{recModel.forever=='1'? '永不截止':'截止到'+recModel.terminateTime}} </view>
</view> </view>
</view> </view>
</view> </view>
</view> <!-- 参会人 -->
<!-- 参会人 --> <view class="participants" onTap="nextPage" data-nextPage="participants">
<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}}">
<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"> <text>
<text> <image a:if="{{!!item.participator.headUrl}}" mode="scaleToFill" src="{{item.participator.headUrl}}"/>
<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: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">
<view class="right"> <text class="number">{{userList.length}}人参与</text>
<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="remind" a:if="{{aheadTimes.length}}"> <view class="icon iconshijian iconfont"></view>
<view class="icon iconshijian iconfont"></view> <view class="text blank">
<view class="text blank"> <text a:if="{{aheadTimes.includes(0)}}">立即提醒</text>
<text a:if="{{aheadTimes.includes(0)}}">立即提醒</text> <text a:if="{{aheadTimes.includes(5)}}">5分钟前</text>
<text a:if="{{aheadTimes.includes(5)}}">5分钟前</text> <text a:if="{{aheadTimes.includes(15)}}">15分钟前</text>
<text a:if="{{aheadTimes.includes(15)}}">15分钟前</text> <text a:if="{{aheadTimes.includes(30)}}">30分钟前</text>
<text a:if="{{aheadTimes.includes(30)}}">30分钟前</text> <text a:if="{{aheadTimes.includes(60)}}">1小时前</text>
<text a:if="{{aheadTimes.includes(60)}}">1小时前</text> <text a:if="{{aheadTimes.includes(1440)}}">1天前</text>
<text a:if="{{aheadTimes.includes(1440)}}">1天前</text> <text a:if="{{aheadTimes.includes(2880)}}">两天前</text>
<text a:if="{{aheadTimes.includes(2880)}}">两天前</text> <text a:if="{{aheadTimes.includes(10080)}}">1周前</text>
<text a:if="{{aheadTimes.includes(10080)}}">1周前</text> 提醒
提醒 </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 iconhuiyimiaoshu iconfont"></view> <view class="text">
<view class="text"> {{remark}}
{{remark}} </view></view>
</view></view> <!-- 会议动态 -->
<!-- 会议动态 --> <view class="dynamic">
<view class="dynamic"> <view class="icon iconhuiyimiaoshu iconfont"></view>
<view class="icon iconhuiyimiaoshu iconfont"></view> <view class="text">
<view class="text"> 会议动态
会议动态 </view>
</view> <view class="upload" onTap="upload">
<view class="upload" onTap="upload"> <text>文件上传</text>
<text>文件上传</text> <text class="icontianjia iconfont"></text></view></view>
<text class="icontianjia iconfont"></text></view></view> <!-- 动态详情展示 -->
<!-- 动态详情展示 --> <view class="dynamicContent">
<view class="dynamicContent"> <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"> <image a:if="{{!!item.scheduleAccessory.uploaderInfo.headUrl}}" mode="scaleToFill" src="{{item.scheduleAccessory.uploaderInfo.headUrl}}"/>
<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>
<text a:else>{{item.scheduleAccessory.uploaderInfo.username.substring(0,1)}}</text></view> <view class="dynamicright">
<view class="dynamicright"> <view class="dynamicMinutes">
<view class="dynamicMinutes"> <text>{{item.scheduleAccessory.uploaderInfo.username}}</text>
<text>{{item.scheduleAccessory.uploaderInfo.username}}</text> <text>{{item.scheduleAccessory.time}}</text></view>
<text>{{item.scheduleAccessory.time}}</text></view> <view class="describe">
<view class="describe"> {{item.scheduleAccessory.descript}}
{{item.scheduleAccessory.descript}}
</view>
<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> <view class="file" data-file="{{item2}}" onTap="preview" a:for="{{item.scheduleAccessory.fileInfos}}" a:for-item="item2">
<view class="modFile" a:if="{{organizer == pemissions?(item.meetingLogId == meetingLogId):(item.meetingLogId == meetingLogId&&item.scheduleAccessory.uploaderInfo.userId==pemissions)}}"> <view class="fileImage {{item2.fileType==('png' || 'jpg' || 'svg' || 'jpeg') ?'image': item2.fileType}}"></view>
<view class="ediFile" data-nextPage="editFile" catchTap="nextPage" data-file="{{item.scheduleAccessory}}"> <view class="fileName">
编辑 {{item2.fileName}}
</view>
</view> </view>
<view class="delFile" catchTap="delFile" data-file="{{item.scheduleAccessory}}"> <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.scheduleAccessory}}">
删除
</view>
<view class="triangle"></view>
</view>
<view class="selectDynamicright" a:if="{{organizer == pemissions?(item.meetingLogId == meetingLogId):(item.meetingLogId == meetingLogId&&item.scheduleAccessory.uploaderInfo.userId==pemissions)}}">
</view> </view>
<view class="triangle"></view>
</view>
<view class="selectDynamicright" a:if="{{organizer == pemissions?(item.meetingLogId == meetingLogId):(item.meetingLogId == meetingLogId&&item.scheduleAccessory.uploaderInfo.userId==pemissions)}}">
</view> </view>
</view> </view>
<view class="otherTip" a:if="{{!!item.content}}">
{{item.content}}
{{item.time}}
</view>
</view> </view>
<view class="otherTip" a:if="{{!!item.content}}">
{{item.content}}
{{item.time}}
</view>
</view>
</view>
<!-- 底部按钮 -->
<view class="bottom">
<view class="buttonGroup" data-nextPage="edit" onTap="nextPage">
<text class="icondidianmiaoshu iconfont"></text>
<text>编辑</text>
</view> </view>
<view class="buttonGroup" data-nextPage="edit" onTap="nextPage" a:if="{{!(organizer == pemissions)}}"> <!-- 底部按钮 -->
<text class="icondidianmiaoshu iconfont"></text> <view class="bottom">
<text>参加</text> <view class="buttonGroup" data-nextPage="edit" onTap="nextPage">
</view> <text class="icondidianmiaoshu iconfont"></text>
<view class="buttonGroup" data-nextPage="edit" onTap="nextPage" a:if="{{!(organizer == pemissions)}}"> <text>编辑</text>
<text class="icondidianmiaoshu iconfont"></text> </view>
<text>不参加</text> <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" a:if="{{!(organizer == pemissions)}}">
<text class="icondidianmiaoshu iconfont"></text>
<text>不参加</text>
</view>
</view> </view>
</view> </view>
</view> </block>
\ No newline at end of file \ No newline at end of file
pages/scheduleDetail/scheduleDetail.js
...@@ -23,7 +23,8 @@ create.Page({ ...@@ -23,7 +23,8 @@ create.Page({
organizer: '', organizer: '',
pemissions: '', pemissions: '',
isRepeatable: '', isRepeatable: '',
recModel: '' recModel: '',
showPage: false
}, },
onLoad(event) { onLoad(event) {
let scheduleItem = JSON.parse(event.scheduleItem) let scheduleItem = JSON.parse(event.scheduleItem)
...@@ -195,6 +196,11 @@ create.Page({ ...@@ -195,6 +196,11 @@ create.Page({
this.setData({ this.setData({
allFileInfo: allFileInfo allFileInfo: allFileInfo
}) })
setTimeout(() => {
this.setData({
showPage: true
})
}, 300)
}) })
}, },
touchStart(event) { touchStart(event) {
......
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