Skip to content

S
schedule
Commit ad674a70 by xiexiaoqin
Options

fix conflit in app.json

parents d7cb773e 730a8867
Showing with 343 additions and 178 deletions
app.json
{
"pages": [
"pages/index/index",
"pages/meetingRoomList/meetingRoomList",
"pages/scheduleList/scheduleList",
"pages/index/index",
"pages/meetingDetail/meetingDetail",
......@@ -7,7 +9,6 @@
"pages/createMeeting/createMeeting",
"pages/outLookContact/outLookContact",
"pages/place/place",
"pages/meetingRoomList/meetingRoomList",
"pages/uploadFile/uploadFile",
"pages/participantsDetail/participantsDetail",
"pages/applicationDetails/applicationDetails",
......
components/calendar/calendar.acss 0 → 100755
.am-calendar {
background-color: #fff;
padding-top: 10rpx;
}
.am-calendar-months {
display: flex;
box-sizing: border-box;
padding: 0 200rpx;
align-items: center;
height: 76rpx;
}
.am-calendar-prev-month, .am-calendar-next-month {
display: flex;
width: 40rpx;
font-size: 32rpx;
}
.am-calendar-prev-month {
justify-content: flex-start;
}
.am-calendar-next-month {
justify-content: flex-end;
}
.am-calendar-arrow {
height: 28rpx;
width: 28rpx;
background-image: url('https://gw.alipayobjects.com/zos/rmsportal/vYcMhkfyHRIOeVXWdcPe.png');
background-size: 8rpx 14rpx;
background-position: left center;
background-repeat: no-repeat;
}
.am-calendar-arrow_year {
width: 28rpx;
background-repeat: no-repeat;
}
.am-calendar-arrow.next {
transform: rotate(180deg);
}
.am-calendar-selected-month {
flex: 1;
text-align: center;
font-size: 32rpx;
font-weight: 600;
color: #1B263D;
}
.am-calendar-days {
display: flex;
height: 26rpx;
padding-top: 28rpx;
line-height: 26rpx;
box-sizing: content-box;
}
.am-calendar-day {
flex: 1;
text-align: center;
color: #1B263D;
font-size: 28rpx;
}
.am-calendar-dates {
display: flex;
flex-direction: column;
}
.am-calendar-week {
margin-bottom: 32rpx;
display: flex;
flex-direction: row;
}
.am-calendar-week:first-child {
margin-top: 32rpx;
}
.am-calendar-date-wrap {
position: relative;
text-align: center;
display: flex;
flex-direction: column;
align-items: center;
height: 42rpx;
flex: 1;
}
.am-calendar-date {
text-align: center;
height: 23rpx;
line-height: 23rpx;
font-size: 28rpx;
font-family: 'Helvetica';
color: #1B263D;
}
.am-calendar-tag {
position: absolute;
top: 21rpx;
width: 42rpx;
overflow: hidden;
text-overflow: hidden;
white-space: nowrap;
color: #f5a623;
font-size: 10rpx;
font-weight: 500;
}
.am-calendar-today {
color: #108ee9;
}
.am-calendar-gray {
color: #ccc;
}
.am-calendar-selected .am-calendar-block {
position: absolute;
left: calc(50% - 20rpx);
top: calc(50% - 12rpx);
transform: translateY(-50%);
width: 42rpx;
height: 42rpx;
background: #309EF2;
border-radius: 50%;
}
.am-calendar-middle.is-range .am-calendar-block {
position: absolute;
left: 0;
top: calc(50% - 10rpx);
transform: translateY(-50%);
height: 42rpx;
background: #309EF2;
width: 100%;
border-radius: 0;
}
.am-calendar-start.is-range .am-calendar-block {
position: absolute;
left: calc(50% - 21rpx);
top: calc(50% - 10rpx);
transform: translateY(-50%);
width: 100%;
height: 42rpx;
background: #309EF2;
border-radius: 2rpx 0 0 2rpx;
}
.am-calendar-end.is-range .am-calendar-block {
position: absolute;
left: 0;
top: calc(50% - 10rpx);
transform: translateY(-50%);
width: calc(50% + 21rpx);
height: 42rpx;
background: #309EF2;
border-radius: 0 2rpx 2rpx 0;
}
.am-calendar-selected .am-calendar-block.has-tag, .am-calendar-start .am-calendar-block.has-tag, .am-calendar-middle .am-calendar-block.has-tag, .am-calendar-end .am-calendar-block.has-tag {
top: calc(50% - 7rpx);
}
.am-calendar-selected .am-calendar-date, .am-calendar-start .am-calendar-date, .am-calendar-middle .am-calendar-date, .am-calendar-end .am-calendar-date {
position: relative;
color: #fff;
}
.am-calendar-selected .am-calendar-tag, .am-calendar-start .am-calendar-tag, .am-calendar-middle .am-calendar-tag, .am-calendar-end .am-calendar-tag {
color: #fff;
}
.am-calendar-disable .am-calendar-date {
color: #999;
}
\ No newline at end of file
components/calendar/calendar.axml 0 → 100644
<view class="am-calendar {{className}}" a:if="{{dates.length > 0}}">
<view class="am-calendar-months">
<view class="am-calendar-prev-month" onTap="onPrevYearTap" a:if="{{haveYear}}">
<view class="am-calendar-arrow am-calendar-arrow_year"></view>
</view>
<view class="am-calendar-prev-month" onTap="onPrevMonthTap">
<view class="am-calendar-arrow"></view>
</view>
<view class="am-calendar-selected-month">{{selectedYear}}年{{selectedMonth + 1}}月</view>
<view class="am-calendar-next-month" onTap="onNextMonthTap">
<view class="am-calendar-arrow next"></view>
</view>
<view class="am-calendar-next-month" onTap="onNextYearTap" a:if="{{haveYear}}">
<view class="am-calendar-arrow am-calendar-arrow_year next"></view>
</view>
</view>
<view class="am-calendar-days">
<block a:for="{{['日', '一', '二', '三', '四', '五', '六']}}">
<view class="am-calendar-day">{{item}}</view>
</block>
</view>
<view class="am-calendar-dates">
<block a:for="{{dates}}">
<view class="am-calendar-week">
<block a:for="{{item}}">
<view
class="am-calendar-date-wrap
{{ item.isSelected ? 'am-calendar-selected': '' }}
{{ item.isStart ? 'am-calendar-start': '' }}
{{ item.isMiddle ? 'am-calendar-middle': '' }}
{{ item.isEnd ? 'am-calendar-end': '' }}
{{ item.disable ? 'am-calendar-disable': '' }}
{{ type === 'range' ? 'is-range' : '' }}"
data-year="{{item.year}}"
data-month="{{item.month}}"
data-date="{{item.date}}"
onTap="onDateTap"
>
<view
class="am-calendar-block {{ blockType === 2 ? 'has-tag': '' }}"
></view>
<view
class="am-calendar-date {{ item.isGray ? 'am-calendar-gray': '' }} {{ item.isToday ? 'am-calendar-today': ''}}"
>{{item.date}}</view>
<view class="am-calendar-tag" style="{{
color: item.isSelected || item.isMiddle || item.isStart || item.isEnd ? '#fff' : (item.disable ? '#999' : item.color)
}}">{{item.disable ? '' : item.tag}}</view>
</view>
</block>
</view>
</block>
</view>
</view>
\ No newline at end of file
components/calendar/calendar.json 0 → 100644
{
"component": true
}
\ No newline at end of file
pages/meetingRoomList/meetingRoomList.acss
......@@ -56,25 +56,6 @@
color: rgba(25, 31, 37, 0.40);
}
.searchLocation {
width: 200rpx;
height: 96rpx;
line-height: 96rpx;
}
.searchLocation>view:nth-of-type(1) {
flex: 1;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
text-align: right;
}
.searchLocation>view:nth-of-type(2) {
margin: 0 10rpx 0 16rpx;
width: 24rpx;
}
.reserveMeeting {
width: 100%;
}
......@@ -85,39 +66,6 @@
background: #ffffff;
}
.searchHeader2>scroll-view {
overflow-x: scroll;
display: flex;
height: 100%;
padding: 0 32rpx;
align-items: center;
}
.equipFacilityList {
margin-right: 24rpx;
white-space: nowrap;
display: flex;
align-items: center;
font-size: 26rpx;
line-height: 96rpx;
}
.selectListcheck {
margin-right: 8rpx;
}
.selectListcheck .iconfont {
font-size: 32rpx;
}
.selectListcheck .iconweigouxuan {
color: rgba(25, 31, 37, 0.12);
}
.selectListcheck .iconxuanzhong2 {
color: #3296FA;
}
.roomMessage {
width: 100%;
align-items: center
......@@ -157,26 +105,34 @@
.reserveRoomLocation {
color: rgba(25, 31, 37, 0.56);
}
.reserveRoomTimeBar{
.reserveRoomTimeBar {
overflow: hidden;
margin-top: 12rpx;
}
.reserveRoomTimeBarBg {
width: 100%;
display: flex;
margin-top: 32rpx;
border: 1px solid rgba(25, 31, 37, 0.08);
box-sizing: border-box;
flex-wrap: wrap;
flex-direction: column;
height: 60rpx;
}
.reserveRoomTimeBarBg>view {
flex: 1;
height: 32rpx;
border-right: 1px solid #ffffff;
height: 24rpx;
width: 24rpx;
border-radius: 2rpx;
box-sizing: border-box;
margin-top: 6rpx;
margin-right: 6rpx;
background: #F3F6FA;
border: 1px solid rgba(27, 38, 61, 0.10);
}
.reserveRoomTimeBarBg>view:nth-of-type(48) {
border-right: none !important;
.reserveRoomTimeBarBg>view:nth-of-type(47), .reserveRoomTimeBarBg>view:nth-of-type(48) {
margin-right: 0;
}
.preemption {
......@@ -184,15 +140,18 @@
}
.expired {
background: #EDEDEE;
background: url(../../assests/cancel.png) center /100% 100% !important;
border: 1px solid rgba(27, 38, 61, 0.04) !important;
}
.reservation {
background: #FFFFFF;
background: #F3F6FA !important;
border: 1px solid rgba(27, 38, 61, 0.10) !important;
}
.occupied {
background: #3296FA;
background: rgba(48, 112, 242, 0.28) !important;
border: 1rpx solid rgba(27, 38, 61, 0.10) !important;
}
.reserveRoomTimeBarNum {
......@@ -203,53 +162,32 @@
}
.reserveRoomTimeBarNum>view {
text-align: center;
flex: 1;
}
/* 弹框的样式 */
.modal {
position: fixed;
left: 0;
top: 0;
.modalContent, .calendarMoadl {
width: 100%;
height: 100%;
display: flex;
align-items: flex-end;
background: rgba(0, 0, 0, .15);
z-index: 999;
}
.modalContent {
width: 100%;
height: 838rpx;
background: #FFFFFF;
border-radius: 19rpx 19rpx 0 0;
box-shadow: 0 -2px 20px 0 rgba(25, 31, 37, 0.12);
height: 732rpx;
overflow: hidden;
margin-top: -10px;
}
.modalHeader {
height: 104rpx;
line-height: 104rpx;
font-size: 34rpx;
display: flex;
height: 32rpx;
line-height: 1;
font-size: 32rpx;
padding: 0 32rpx;
text-align: right;
color: #0A0A0A;
box-sizing: border-box;
border-bottom: 1px solid rgba(25, 31, 37, 0.12);
}
.modalHeader>view {
flex: 1;
}
.modalHeader>view:nth-of-type(1) {
color: #191F25;
text-align: left;
}
.modalHeader>view:nth-of-type(2) {
color: #3296FA;
text-align: right;
}
.changeDay {
......@@ -258,12 +196,29 @@
font-size: 30rpx;
text-align: center;
display: flex;
height: 104rpx;
line-height: 104rpx;
height: 80rpx;
align-items: center;
justify-content: space-between;
padding: 0 32rpx;
margin-top: 30rpx;
}
.changeDay>view {
flex: 1;
height: 80rpx;
}
.changeDay>view>view:nth-of-type(1) {
font-size: 28rpx;
font-family: DINAlternate-Bold, DINAlternate;
font-weight: bold;
color: rgba(10, 10, 10, 1);
line-height: 28rpx;
margin-bottom: 4rpx;
}
.changeDay>view>view:nth-of-type(2) {
font-size: 22rpx;
color: rgba(27, 38, 61, .56)
}
.modalOccupyTimeSlot {
......@@ -272,7 +227,7 @@
}
.modalOccupyTimeSlot>view {
height: 100rpx;
height: 80rpx;
width: 100%;
padding-left: 32rpx;
}
......@@ -285,7 +240,7 @@
display: flex;
align-items: center;
font-size: 24rpx;
color: rgba(25,31,37,0.56);
color: rgba(25, 31, 37, 0.56);
}
.OccupyTimeList>view:nth-of-type(1) {
......@@ -339,63 +294,16 @@
box-sizing: border-box;
}
.iconyigouxuan {
color: #3296FA;
}
/* 区域选择样式 */
.lableTreeBox {
position: fixed;
left: 0;
top: 0;
width: 100%;
height: 100%;
background: rgba(0, 0, 0, .1);
display: flex;
align-items: flex-end;
}
.lableTreeContent {
width: 100%;
height: 527rpx;
background: #FFFFFF;
box-shadow: 0 -2rpx 20rpx 0 rgba(25, 31, 37, 0.12);
border-radius: 19rpx 19rpx 0px 0px;
}
.lableTreeHeader {
width: 100%;
height: 104rpx;
padding: 0 32rpx;
line-height: 104rpx;
font-size: 34rpx;
display: flex;
box-sizing: border-box;
border-bottom: 1px solid rgba(25, 31, 37, 0.12);
}
.lableTreeHeader>view {
flex: 1;
height: 104rpx;
}
.lableTreeHeader>view:nth-of-type(1) {
color: #191F25;
}
.lableTreeHeader>view:nth-of-type(2) {
color: #3296FA;
text-align: right
.dataNumSelected {
border-bottom: 2rpx solid #EA0C28;
}
.dataNumSelected {
color: #3296FA;
.dataNumSelected view:nth-of-type(1) {
color: #EA0C28 !important;
}
.roomScrollView {
height: 100vh;
padding-top: 96rpx;
box-sizing: border-box;
position: relative;
}
......@@ -404,56 +312,71 @@
font-size: 24rpx;
margin-right: 8rpx;
}
.occupiedStatus {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.noRoom{
.noRoom {
position: absolute;
left: 0;
top: 0;
display: flex;
align-items: center;
justify-content: center;
width:100%;
height:100%;
width: 100%;
height: 100%;
}
.noRoom>view{
.noRoom>view {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
}
.noRoomTip{
.noRoomTip {
margin-top: 32rpx;
font-size: 30rpx;
color: rgba(25,31,37,0.56);
color: rgba(25, 31, 37, 0.56);
}
.modalFooter{
height: 120rpx;
line-height: 120rpx;
font-size: 26rpx;
color: #3296FA;
letter-spacing: -0.63px;
padding-left: 32rpx;
width: 100%;
box-sizing: border-box;
.modalTimeSlot {
height: 44rpx;
font-size: 32rpx;
font-family: DINAlternate-Bold, DINAlternate;
font-weight: bold;
color: rgba(10, 10, 10, .49);
line-height: 38rpx;
text-align: center;
}
::-webkit-scrollbar {
width: 0;
height: 0;
color: transparent;
}
.beOverdue .iconxuanzhong2{
color: rgba(25,31,37,0.12);
.beOverdue .iconicon_Agreed1 {
color: rgba(25, 31, 37, 0.12);
font-size: 40rpx;
}
.checked .iconxuanzhong2{
.checked .iconicon_Agreed1 {
color: #3296FA;
font-size: 40rpx;
}
.Unchecked .iconweigouxuan{
color: rgba(25,31,37,0.12);
.Unchecked .iconicon_uncheck {
color: rgba(25, 31, 37, 0.12);
font-size: 40rpx;
}
.calendarTip {
font-size: 24rpx;
text-align: center;
color: rgba(25, 31, 37, .56);
margin-top: 40rpx;
}
\ No newline at end of file
pages/meetingRoomList/meetingRoomList.json
{
"usingComponents": {
"timecheckmodal": "../../components/timeCheckModal/timeCheckModal",
"lable-tree": "../../components/selectArea/selectArea"
},
"defaultTitle": "所有会议室"
}
\ No newline at end of file
"usingComponents": {
"popup": "../../components/popup/index",
"calendar": "../../components/calendar/calendar"
},
"defaultTitle": "所有会议室"
}
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