Commit 1273711b by xiexiaoqin

merge

parent 64a3c168
...@@ -46,11 +46,17 @@ ...@@ -46,11 +46,17 @@
关联成功 关联成功
</view> </view>
</view> </view>
<view a:else> <view a:elif="{{bindStatus==='fail'}}">
<image class="fix-img-width-fix" mode="scaleToFill" src="./../../assests/bindFail.png"/> <image class="fix-img-width-fix" mode="scaleToFill" src="./../../assests/bindFail.png"/>
<view> <view>
关联失败 关联失败
</view> </view>
</view> </view>
<view a:else>
<image class="fix-img-width-fix" mode="scaleToFill" src="./../../assests/bindFail.png"/>
<view>
账户已关联
</view>
</view>
</view> </view>
<selectpopup showSelectPopup="{{showSelectPopup}}" selectPopupList="{{selectPopupList}}" onSelectPopup="onSelectPopup" onSelectPopupCancel="onSelectPopupCancel"></selectpopup> <selectpopup showSelectPopup="{{showSelectPopup}}" selectPopupList="{{selectPopupList}}" onSelectPopup="onSelectPopup" onSelectPopupCancel="onSelectPopupCancel"></selectpopup>
\ No newline at end of file
@import "../../template/affairBlank/index.acss"; /* required by usingComponents */
.affair-list { \ No newline at end of file
background: #fff;
padding: 48rpx 32rpx 220rpx 32rpx;
/* height: calc(100vh - 200rpx); */
}
.affair-list-margin-top {
margin-top: 16rpx;
}
.simple-column {
color: rgba(25, 31, 37, 0.4);
font-size: 26rpx;
line-height: 1.5;
text-align: center;
margin-bottom: 48rpx;
}
.compose-column {
position: relative;
padding-left: 104rpx;
margin-bottom: 48rpx;
padding-top: 16rpx;
}
.compose-column>.avater {
width: 80rpx;
height: 80rpx;
line-height: 80rpx;
border-radius: 50%;
position: absolute;
left: 0;
top: 16rpx;
}
.compose-column>.task-avater {
background: rgba(21, 188, 131, 1);
}
.compose-column>.task-avater>.iconfont {
color: #fff;
font-size: 40rpx;
}
.compose-column .title {
color: rgba(27, 38, 61, 1);
font-size: 32rpx;
font-family: PingFangSC-Medium;
}
.compose-column .title>text {
color: rgba(25, 31, 37, 0.4);
font-size: 28rpx;
margin-left: 16rpx;
font-family: PingFangSC-Regular;
}
.checkbox {
border: 3rpx solid rgba(77, 217, 100, 1);
border-radius: 4rpx;
width: 28rpx;
height: 28rpx;
margin-right: 18rpx;
}
.footer {
background: #fff;
border-top: 2rpx solid rgba(25, 31, 37, 0.12);
height: 94rpx;
position: fixed;
bottom: 0;
left: 0;
display: flex;
align-items: center;
justify-content: flex-end;
width: 100%;
}
.footer>view {
width: 35rpx;
margin: 0 38rpx;
font-size: 16rpx;
color: rgba(10, 10, 10, 0.56);
text-align: center;
}
.footer>view>.iconfont {
font-size: 36rpx;
}
.footer>view:last-child {
margin: 0 24rpx 0 0;
}
.devider {
background: rgba(227, 228, 228, 1);
height: 48rpx;
width: 1rpx;
margin: 0 28rpx;
}
/* das */
@import "../../template/deleteBtn/index.acss";
page {
font-size: 28rpx;
color: #0a0a0a;
}
.hideDetail {
padding: 28rpx 32rpx 24rpx;
box-shadow: 0 0px 4px 1px rgba(0, 0, 0, 0.08);
background: #fff;
z-index: 1;
position: relative;
width: 100%;
padding-bottom: 0;
}
.hideTitle {
font-family: PingFangSC-Regular;
font-size: 40rpx;
line-height: 56rpx;
color: #1B263D;
}
.hideTime {
margin-top: 16rpx;
opacity: 0.72;
font-family: PingFangSC-Regular;
font-size: 28rpx;
color: #030303;
line-height: 28rpx;
}
.hideIcon {
color: #9599A2;
font-size: 64rpx;
text-align: center;
}
.icon {
width: 36rpx;
height: 100%;
vertical-align: middle;
color: #0a0a0a;
font-size: 36rpx;
line-height: 50rpx;
line-height: 50rpx;
}
input {
caret-color: #3070F2;
padding-left: 0;
height: 52rpx;
/* line-height: 52rpx; */
}
.createTitle {
padding: 14rpx 32rpx 16rpx;
position: relative;
min-height: 90rpx;
overflow: hidden;
}
.createTitle>.title {
display: flex;
line-height: 1.5;
justify-content: space-between;
text-align: left;
}
.createTitle>.title>input {
padding-left: 0;
font-size: 40rpx;
font-family: PingFangSC-Medium;
width: 100%;
}
.createTitle>.title>.icon {
color: #0a0a0a;
line-height: 58rpx;
}
.remark>input {
padding-left: 0;
width: 100%;
font-size: 28rpx;
color: rgba(10, 10, 10, 0.4)
}
.placeholder {
opacity: 0.4;
font-family: PingFangSC-Medium;
font-size: 40rpx;
color: #1B263D;
}
.remark .placeholder {
font-size: 28rpx;
font-family: PingFangSC-Regular;
}
.meetingWay {
position: relative;
}
.place, .time, .participator, .meetingWay, .meetingWayShowTop {
display: flex;
padding: 0 32rpx;
font-family: PingFangSC-Regular;
color: #191F25;
overflow: hidden;
margin-top: 48rpx;
}
.place>.icon, .time>.icon, .participator>.icon, .meetingWay>.icon, .meetingWayShowTop>.icon {
margin-right: 24rpx;
}
.noPlace, .hasplace, .timeText, .participatorText, .noWay, .hasWay, .meetingWayText {
font-size: 34rpx;
width: 100%;
line-height: 1.5;
}
.hasplace, .timeText {
word-break: break-all;
max-width: 540rpx;
overflow: hidden;
}
.placeContaint, .timeContaint, .participatorContaint, .meetingWayContent {
width: 622rpx;
display: flex;
justify-content: space-between;
}
.meetingWay .close, .place .close, .participator .iconright {
color: #9599A2;
}
.close {
font-size: 32rpx;
color: rgba(10, 10, 10, 0.3)!important;
}
.repeatModal {
color: #191F25;
margin-top: 24rpx;
font-size: 28Îpx;
opacity: 0.56;
}
.time .iconicon_cycle {
color: #3070F2
}
.conflictStatus {
color: #FF943E;
font-size: 24rpx;
margin-left: 24rpx;
}
.participatorList {
width: 100%;
}
.participatorList>.icon {
color: #1b263d;
}
.participatorListTop {
width: 100%;
display: flex;
justify-content: space-between;
}
.participatorText {
display: flex;
align-items: center;
}
.participatorListBottom {
margin-top: 11rpx;
display: flex;
flex-wrap: wrap;
}
.people, .addPeople {
margin-right: 27rpx;
text-align: center;
width: 80rpx;
height: auto;
margin-top: 22rpx;
}
.people:nth-child(6n) {
margin-right: 0;
}
.headUrl {
width: 80rpx;
height: 80rpx;
border-radius: 50%;
background: #3070F2;
color: white;
line-height: 80rpx;
text-align: center;
position: relative;
}
.conflict {
line-height: 15px;
vertical-align: top;
width: 15px;
height: 15px;
position: absolute;
background: #fff;
bottom: 0rpx;
color: #FF943E;
font-size: 12px;
right: -3rpx;
border-radius: 50%;
text-align: center;
}
.headUrl>image {
vertical-align: top;
width: 100%;
height: 100%;
border-radius: 50%;
}
.name {
font-size: 24rpx;
margin-top: 8rpx;
opacity: 0.56;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.addPeople {
margin-right: 0;
width: 78rpx;
text-align: center;
line-height: 78rpx;
font-size: 50rpx;
height: 78rpx;
border: 1rpx solid rgba(10, 10, 10, 0.14);
border-radius: 50%;
color: #BBBEC5;
}
.editeMeeting {
background: #fff;
}
.editeMeeting .delete-task-wrap {
padding: 74rpx 0 32rpx 0;
}
.delete-task {
color: #EA0C28!important;
}
.footNav {
position: fixed;
bottom: 0;
left: 0;
right: 0;
background: rgb(255, 255, 255);
z-index: 100
}
.originStaus, .participateStatus, .noParticipateStatus {
display: flex;
line-height: 96rpx;
font-family: PingFangSC-Medium;
font-size: 28rpx;
align-items: center;
}
.originStaus>view, .participateStatus>view {
height: 96rpx;
line-height: 96rpx;
width: 49%;
text-align: center;
}
.originStaus>view>.iconfont {
margin-right: 12rpx;
color: rgba(10, 10, 10, 0.4);
vertical-align: middle;
}
.participateStatus .remind {
width: 580rpx;
}
.participateStatus .participate {
width: 168rpx;
}
.remind {
font-family: PingFangSC-Regular;
font-size: 28rpx;
color: #1B263D;
}
.remind>text {
display: inline-block;
vertical-align: top;
}
.remindTimeContaint {
height: 100%;
display: inline-block;
max-width: 400rpx;
min-width: 0;
white-space: nowrap;
margin: 0 20rpx;
text-align: center;
overflow: scroll;
}
.remindTimeContaint>text {
margin: 0 8rpx;
}
.noRemind {
margin: 0 20rpx;
}
.remindTime {
margin-right: 4rpx;
}
.participate>text {
margin-right: 10rpx;
color: #15BC83;
vertical-align: middle;
}
.noParticipateStatus {
font-family: PingFangSC-Medium;
font-size: 14px;
color: #F25643;
}
.noParticipateStatus {
justify-content: center;
}
.noParticipateStatus>text {
margin-right: 10rpx;
}
.footerBottom {
background: #fff;
border-top: 2rpx solid rgba(239, 242, 245, 1);
height: 94rpx;
display: flex;
align-items: center;
justify-content: flex-end;
width: 100%;
color: rgba(10, 10, 10, 0.4);
}
.footerBottom>view {
width: 35rpx;
margin: 0 38rpx;
font-size: 16rpx;
text-align: center;
}
.footerBottom>view>.iconfont {
font-size: 36rpx;
}
.footerBottom>view:last-child {
margin: 0 24rpx 0 0;
}
.devider {
background: rgba(227, 228, 228, 1);
height: 48rpx;
width: 1rpx;
margin: 0 28rpx;
}
.noValueIcon {
color: rgba(216, 216, 216, 1)!important;
}
.footNavTop {
box-shadow: 0px 0px 4px 1px rgba(0, 0, 0, 0.08);
}
.permissions {
background: rgba(0, 0, 0, 0);
position: fixed;
top: 0;
z-index: 10;
height: 100%;
width: 100%;
background: red;
}
.affair-list-title {
font-size: 40rpx;
color: rgba(25, 31, 37, 1);
margin-bottom: 64rpx;
}
.permissionContant {
height: auto;
position: relative;
}
.permission {
width: 100%;
height: 100%;
position: absolute;
top: 0;
z-index: 999;
}
.affair-placeholder {
border-top: 1px solid rgba(239, 242, 245, 1);
padding-top: 168rpx;
text-align: center;
width: 600rpx;
margin: 0 auto;
}
.affair-placeholder image {
margin-top: 50rpx;
}
.affair-placeholder .affair-blank-tip {
white-space: nowrap;
}
.metingDetail {
overflow: hidden;
height: 100vh;
}
.meetingWayImageUrl {
flex-grow: 0;
width: 40rpx;
height: 40rpx;
margin-right: 24rpx;
}
.meetingWayImageUrl>image {
margin-top: 5rpx;
vertical-align: top;
width: 100%;
height: 100%;
}
.loading {
width: 100vw;
height: 100%;
background: #fff;
position: fixed;
top: 0;
left: 0;
right: 0;
}
.loading .image {
width: 56rpx;
height: 56rpx;
position: absolute;
left: 50%;
top: 50%;
margin-left: -28rpx;
margin-top: -28rpx;
text-align: center;
background: url(../../assests/loading.gif) center / 100% 100%;
vertical-align: middle;
}
.iconicon_repeat1 {
color: rgba(10, 10, 10, 0.4)
}
.participateText {
vertical-align: middle
}
.tabBarBottom {
height: 68rpx;
width: 100%;
background: #fff;
}
.iconicon_description1 {
color: rgba(10, 10, 10, 0.4)!important;
}
.iconright {
font-size: 30rpx;
color: rgba(10, 10, 10, 0.3)!important;
}
.addPadding {
padding-bottom: 270rpx;
}
.lineThrough {
text-decoration: line-through;
}
.loading-more {
color: rgba(234, 12, 40, 1);
font-size: 24rpx;
text-align: center;
width: 400rpx;
border-top: 1px solid rgba(239, 242, 245, 1);
padding-top: 32rpx;
margin: 0 auto 50rpx;
}
.meetingWayText {
color: rgba(48, 112, 242, 1);
}
.mettingWayText {
margin-top: 22rpx;
font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: rgba(25, 31, 37, 0.55);
}
.mettingWayText .icon {
color: rgba(10, 10, 10, 0.14);
margin-left: 26rpx;
}
.passWord {
margin-top: 0rpx;
}
.meetingWayShowTop>.icon {
color: rgb(216, 216, 216) !important
}
\ No newline at end of file
...@@ -224,7 +224,7 @@ ...@@ -224,7 +224,7 @@
<view class="affair-list {{isExpand? '' : 'affair-list-margin-top'}} {{!isExpand&&$data.participatorList.length>1 ? 'addPadding' : ''}}" onTap="hideFileOperate"> <view class="affair-list {{isExpand? '' : 'affair-list-margin-top'}} {{!isExpand&&$data.participatorList.length>1 ? 'addPadding' : ''}}" onTap="hideFileOperate">
<view a:if="{{!isExpand}}" class="affair-list-title">会议动态</view> <view a:if="{{!isExpand}}" class="affair-list-title">会议动态</view>
<block a:if="{{!affairLoading}}"> <block a:if="{{!affairLoading}}">
<block a:for="{{affairList}}" key="{{item.id}}"> <block a:if="{{affairList && affairList.length > 0}}" a:for="{{affairList}}" key="{{item.id}}">
<view a:if="{{item.category == '3' && item.taskViewList && item.taskViewList.length > 0}}" class='compose-column'> <view a:if="{{item.category == '3' && item.taskViewList && item.taskViewList.length > 0}}" class='compose-column'>
<view class="avater task-avater"> <view class="avater task-avater">
<text class="iconfont iconicon_task1"></text> <text class="iconfont iconicon_task1"></text>
...@@ -245,10 +245,10 @@ ...@@ -245,10 +245,10 @@
</view> </view>
<view a:if="{{item.content && ((item.category == 1 || item.taskViewList && item.taskViewList.length > 0) || ( item.fileView && item.fileView.fileInfos && item.fileView.fileInfos.length > 0 ))}}" class='simple-column'>{{item.content}} {{item.createTime}}</view> <view a:if="{{item.content && ((item.category == 1 || item.taskViewList && item.taskViewList.length > 0) || ( item.fileView && item.fileView.fileInfos && item.fileView.fileInfos.length > 0 ))}}" class='simple-column'>{{item.content}} {{item.createTime}}</view>
</block> </block>
<view class="loading-more" onTap="loadAffairMore" a:if="{{current < pages}}">点击加载更多动态...</view> <view class="affair-placeholder" a:if="{{!affairList || affairList.length == 0}}">
<view class="affair-placeholder" a:if="{{affairList.length == 1 && affairList[0].logType == 'create_schedule'}}">
<template is="affair-placeholder" data="{{title: '添加文件', tip: '我们不开无准备的会,快来上传会议文件吧。'}}"/> <template is="affair-placeholder" data="{{title: '添加文件', tip: '我们不开无准备的会,快来上传会议文件吧。'}}"/>
</view> </view>
<view class="loading-more" onTap="loadAffairMore" a:if="{{current < pages}}">点击加载更多动态...</view>
</block> </block>
<view a:else></view> <view a:else></view>
<popup a:if="{{popupShow}}" title="{{popupTitle}}" show="{{popupShow}}" mask="true" onClose="closePopup"> <popup a:if="{{popupShow}}" title="{{popupTitle}}" show="{{popupShow}}" mask="true" onClose="closePopup">
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<view class="iconfont iconicon_open" onTap="selectSearchTime"></view> <view class="iconfont iconicon_open" onTap="selectSearchTime"></view>
</view> </view>
</view> </view>
<view class="roomScrollView" style="{{canScroll ? '': 'overflow:hidden'}}"> <scroll-view scroll-y="true" class="roomScrollView" disable-scroll="{{!canScroll}}">
<view class="reserveMeeting"> <view class="reserveMeeting">
<view class="meetingRoomContent" a:for="{{reserveRoomList}}" data-roomid="{{item.meetingRoomId}}" data-roomname="{{item.name}}" onTap="changeRoomTime"> <view class="meetingRoomContent" a:for="{{reserveRoomList}}" data-roomid="{{item.meetingRoomId}}" data-roomname="{{item.name}}" onTap="changeRoomTime">
<view class="roomMessage"> <view class="roomMessage">
...@@ -52,67 +52,67 @@ ...@@ -52,67 +52,67 @@
<view class="noRoomTip">当前暂无会议室</view> <view class="noRoomTip">当前暂无会议室</view>
</view> </view>
</view> </view>
<view> </scroll-view>
<popup show="{{isShowModal}}" onClose="onCancel" position="bottom"> <popup show="{{isShowModal}}" onClose="onCancel" position="bottom">
<view a:if="{{!isShowCalendar}}" class="modalContent"> <view a:if="{{!isShowCalendar}}" class="modalContent">
<view class="modalHeader"> <view class="modalHeader">
<text onTap="onDetermine">确定</text> <text onTap="onDetermine">确定</text>
</view>
<view class="modalTimeSlot">
<text a:if="{{!modalFooter.startTime || !modalFooter.endTime}}">请选择会议时间</text>
<text a:if="{{modalFooter.startTime && modalFooter.endTime}}">{{modalFooter.startTime}}至{{modalFooter.isOneDay ? modalFooter.endTime.substr(11,16):modalFooter.endTime}} 共{{modalFooter.allMinutes}}分钟</text>
</view>
<view class="changeDay">
<view class="{{dataNum == '0' ? 'dataNumSelected' : ''}}" onTap="chooseDate" data-num="0">
<view>{{TimeSlot.todayTime.split('/')[1]}}月{{TimeSlot.todayTime.split('/')[2]}}日</view>
<view>今天</view>
</view>
<view class="{{dataNum == '1' ? 'dataNumSelected' : ''}}" onTap="chooseDate" data-num="1">
<view>{{TimeSlot.tomorrowTime.split('/')[1]}}月{{TimeSlot.tomorrowTime.split('/')[2]}}日</view>
<view>明天</view>
</view>
<view class="{{dataNum == '2' ? 'dataNumSelected' : ''}}" onTap="chooseDate" data-num="2">
<view>{{TimeSlot.afterTomorrowTime.split('/')[1]}}月{{TimeSlot.afterTomorrowTime.split('/')[2]}}日</view>
<view>后天</view>
</view>
<view class="{{dataNum == '3' ? 'dataNumSelected' : ''}}" onTap="chooseDate" data-num="3">
<view>
自定义日期
</view> </view>
<view class="modalTimeSlot"> <view>
<text a:if="{{!modalFooter.startTime || !modalFooter.endTime}}">请选择会议时间</text> <text a:if="{{dataNum == '3'}}">{{meetingTime.date.split('/')[1]}}月{{meetingTime.date.split('/')[2]}}日</text>
<text a:if="{{modalFooter.startTime && modalFooter.endTime}}">{{modalFooter.startTime}}至{{modalFooter.isOneDay ? modalFooter.endTime.substr(11,16):modalFooter.endTime}} 共{{modalFooter.allMinutes}}分钟</text>
</view> </view>
<view class="changeDay"> </view>
<view class="{{dataNum == '0' ? 'dataNumSelected' : ''}}" onTap="chooseDate" data-num="0"> </view>
<view>{{TimeSlot.todayTime.split('/')[1]}}月{{TimeSlot.todayTime.split('/')[2]}}日</view> <scroll-view scroll-y='{{true}}' class="modalOccupyTimeSlot" scroll-into-view="{{toThisTime}}">
<view>今天</view> <view class="OccupyTimeList" a:for="{{modalList}}" data-index="{{index}}" onTap="onChangeModalTime" id="{{item.reserveStartTime.substr(11,15)}}">
<view>
<view a:if="{{item.status==='BeOverdue'}}" class="beOverdue">
<text class="iconfont iconicon_Agreed1"></text>
</view> </view>
<view class="{{dataNum == '1' ? 'dataNumSelected' : ''}}" onTap="chooseDate" data-num="1"> <view a:elif="{{item.status==='Uncheck'}}" class="Unchecked">
<view>{{TimeSlot.tomorrowTime.split('/')[1]}}月{{TimeSlot.tomorrowTime.split('/')[2]}}日</view> <text class="iconfont iconicon_uncheck"></text>
<view>明天</view>
</view> </view>
<view class="{{dataNum == '2' ? 'dataNumSelected' : ''}}" onTap="chooseDate" data-num="2"> <view a:elif="{{item.status==='checked'}}" class="checked">
<view>{{TimeSlot.afterTomorrowTime.split('/')[1]}}月{{TimeSlot.afterTomorrowTime.split('/')[2]}}日</view> <text class="iconfont iconicon_Agreed1"></text>
<view>后天</view>
</view>
<view class="{{dataNum == '3' ? 'dataNumSelected' : ''}}" onTap="chooseDate" data-num="3">
<view>
自定义日期
</view>
<view>
<text a:if="{{dataNum == '3'}}">{{meetingTime.date.split('/')[1]}}月{{meetingTime.date.split('/')[2]}}日</text>
</view>
</view> </view>
</view> </view>
<scroll-view scroll-y='{{true}}' class="modalOccupyTimeSlot" scroll-into-view="{{toThisTime}}"> <view>
<view class="OccupyTimeList" a:for="{{modalList}}" data-index="{{index}}" onTap="onChangeModalTime" id="{{item.reserveStartTime.substr(11,15)}}"> <view>{{item.reserveStartTime.substr(10,15)}} ~ {{item.reserveEndTime.substr(10,15)}}</view>
<view> <view class="expiredStatus" a:if="{{item.reserveStatus === 'expired'}}">
<view a:if="{{item.status==='BeOverdue'}}" class="beOverdue">
<text class="iconfont iconicon_Agreed1"></text>
</view>
<view a:elif="{{item.status==='Uncheck'}}" class="Unchecked">
<text class="iconfont iconicon_uncheck"></text>
</view>
<view a:elif="{{item.status==='checked'}}" class="checked">
<text class="iconfont iconicon_Agreed1"></text>
</view>
</view>
<view>
<view>{{item.reserveStartTime.substr(10,15)}} ~ {{item.reserveEndTime.substr(10,15)}}</view>
<view class="expiredStatus" a:if="{{item.reserveStatus === 'expired'}}">
已过期 已过期
</view> </view>
<view class="occupiedStatus" a:if="{{item.reserveStatus === 'occupied'}}"> <view class="occupiedStatus" a:if="{{item.reserveStatus === 'occupied'}}">
已被{{item.scheduleList[0].organizerName}}预定 已被{{item.scheduleList[0].organizerName}}预定
</view>
</view>
</view> </view>
</scroll-view>
</view>
<view class="calendarMoadl" a:else>
<view class="calendarTip">
自定义时间
</view> </view>
<calendar type="single" haveYear="{{false}}" selectedDate="{{meetingTime.date}}" onSelect="handleSelect" onMonthChange="onMonthChange" onYearChange="onYearChange" onSelectHasDisableDate="onSelectHasDisableDate" />
</view> </view>
</popup> </scroll-view>
\ No newline at end of file </view>
<view class="calendarMoadl" a:else>
<view class="calendarTip">
自定义时间
</view>
<calendar type="single" haveYear="{{false}}" selectedDate="{{meetingTime.date}}" onSelect="handleSelect" onMonthChange="onMonthChange" onYearChange="onYearChange" onSelectHasDisableDate="onSelectHasDisableDate" />
</view>
</popup>
\ No newline at end of file
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