Commit a4411e87 by liang ce

更改字体图标

parent 0aa88561
@import "./font/iconfont.acss";
page { page {
font-family: PingFangSC-Regular; font-family: PingFangSC-Regular;
background: #F6F6F6; background: #F6F6F6;
......
...@@ -81,3 +81,31 @@ ...@@ -81,3 +81,31 @@
background: rgba(25,31,37,0.05); background: rgba(25,31,37,0.05);
border-radius: 4rpx; border-radius: 4rpx;
} }
/* icon */
.labelIsShow .iconsanjiao{
font-size: 28rpx;
color: #D8D8D8;
}
.labelIsShow .iconsanjiao1{
font-size: 28rpx;
color: #D8D8D8;
}
.labelIsShow .iconxuanzhong1{
font-size: 32rpx;
color: #3296FA;
}
.treeLabel .iconchengshi-{
font-size: 24rpx;
margin-right: 16rpx;
color: #191F25;
}
.treeLabel .iconjiangzhu1{
font-size: 24rpx;
margin-right: 16rpx;
color: #191F25;
}
.treeLabel .iconlouceng-{
font-size: 24rpx;
margin-right: 16rpx;
color: #191F25;
}
\ No newline at end of file
...@@ -15,14 +15,15 @@ ...@@ -15,14 +15,15 @@
<view data-selectid="{{item.id}}" class="treeLi"> <view data-selectid="{{item.id}}" class="treeLi">
<view class="treeName {{ item.id===locationId ? 'lableTreeChecked' : '' }}"> <view class="treeName {{ item.id===locationId ? 'lableTreeChecked' : '' }}">
<view class="labelIsShow" data-index="{{[index]}}" data-cycle="1" catchTap="onChangeStatus"> <view class="labelIsShow" data-index="{{[index]}}" data-cycle="1" catchTap="onChangeStatus">
{{item.status === 'show' ? '1' : '0'}} <text class="iconfont iconsanjiao" a:if="{{item.status}}"></text>
<text class="iconfont iconsanjiao1" a:elif="{{!item.status}}"></text>
</view> </view>
<view class="treeLabel" data-id="{{item.id}}" data-name="{{item.name}}" data-cycle="1" catchTap="onChangeAreId"> <view class="treeLabel" data-id="{{item.id}}" data-name="{{item.name}}" data-cycle="1" catchTap="onChangeAreId">
<view> <view>
{{item.name}} <text class="iconfont iconchengshi-"></text>{{item.name}}
</view> </view>
<view a:if="{{item.id===locationId}}" style="color: #1890FF;"> <view a:if="{{item.id===locationId}}" style="color: #1890FF;">
ok <text class="iconfont iconxuanzhong1"></text>
</view> </view>
</view> </view>
</view> </view>
...@@ -31,14 +32,15 @@ ...@@ -31,14 +32,15 @@
<view data-selectid="{{item2.id}}" class="treeLi"> <view data-selectid="{{item2.id}}" class="treeLi">
<view class="treeName {{ item2.id===locationId ? 'lableTreeChecked' : '' }}"> <view class="treeName {{ item2.id===locationId ? 'lableTreeChecked' : '' }}">
<view class="labelIsShow" data-index="{{[index,index2]}}" data-cycle="2" catchTap="onChangeStatus"> <view class="labelIsShow" data-index="{{[index,index2]}}" data-cycle="2" catchTap="onChangeStatus">
{{item2.status === 'show' ? '1' : '0'}} <text class="iconfont iconsanjiao" a:if="{{item2.status}}"></text>
<text class="iconfont iconsanjiao1" a:elif="{{!item2.status}}"></text>
</view> </view>
<view class="treeLabel" data-id="{{item2.id}}" data-name="{{item2.name}}" catchTap="onChangeAreId"> <view class="treeLabel" data-id="{{item2.id}}" data-name="{{item2.name}}" catchTap="onChangeAreId">
<view> <view>
{{item2.name}} <text class="iconfont iconjianzhu1"></text>{{item2.name}}
</view> </view>
<view a:if="{{item2.id===locationId}}" style="color: #1890FF;"> <view a:if="{{item2.id===locationId}}" style="color: #1890FF;">
ok <text class="iconfont iconxuanzhong1"></text>
</view> </view>
</view> </view>
</view> </view>
...@@ -47,15 +49,12 @@ ...@@ -47,15 +49,12 @@
<block a:for="{{item2.children}}" a:for-index="index3" a:for-item="item3"> <block a:for="{{item2.children}}" a:for-index="index3" a:for-item="item3">
<view data-selectid="{{item3.id}}" class="treeLi"> <view data-selectid="{{item3.id}}" class="treeLi">
<view class="treeName {{ item3.id===locationId ? 'lableTreeChecked' : '' }}"> <view class="treeName {{ item3.id===locationId ? 'lableTreeChecked' : '' }}">
<!-- <view class="labelIsShow" data-index="{{[index,index2,index3]}}" data-cycle="3" catchTap="onChangeStatus">
{{item3.status === 'show' ? '1' : '0'}}
</view> -->
<view class="treeLabel" data-id="{{item3.id}}" data-name="{{item3.name}}" catchTap="onChangeAreId"> <view class="treeLabel" data-id="{{item3.id}}" data-name="{{item3.name}}" catchTap="onChangeAreId">
<view> <view>
{{item3.name}} <text class="iconfont iconlouceng-"></text>{{item3.name}}
</view> </view>
<view a:if="{{item3.id===locationId}}" style="color: #1890FF;"> <view a:if="{{item3.id===locationId}}" style="color: #1890FF;">
ok <text class="iconfont iconxuanzhong1"></text>
</view> </view>
</view> </view>
</view> </view>
......
@import "../../font/iconfont.acss";
/* 预定会议列表 */ /* 预定会议列表 */
.searchHeader { .searchHeader {
box-sizing: border-box; box-sizing: border-box;
...@@ -31,32 +30,23 @@ ...@@ -31,32 +30,23 @@
box-sizing: border-box; box-sizing: border-box;
} }
.searchTime { .searchTime {
width: 176rpx; width: 200rpx;
height: 96rpx; height: 96rpx;
line-height: 96rpx; line-height: 96rpx;
font-size: 26rpx;
} }
.searchTime>view:nth-of-type(1) { .searchTime>view:nth-of-type(1) {
flex: 1; flex: 1;
font-size: 26rpx;
} }
.searchTime>view:nth-of-type(2) { .searchTime>view:nth-of-type(2) {
margin: 0 10rpx 0 16rpx; margin: 0 10rpx 0 16rpx;
width: 24rpx; color: rgba(25,31,37,0.40);
}
/* .searchCategory {
display: flex;
width: 200rpx;
} }
.searchCategory>view:nth-of-type(1) { .xialakuangSize .iconxialakuang {
flex: 1; font-size: 24rpx !important;
overflow:hidden; color: rgba(25,31,37,0.40);
white-space: nowrap;
text-overflow: ellipsis;
text-align: right;
} }
.searchCategory>view:nth-of-type(2) {
margin: 0 10rpx 0 16rpx;
width: 24rpx;
} */
.searchLocation { .searchLocation {
width: 200rpx; width: 200rpx;
height: 96rpx; height: 96rpx;
...@@ -93,6 +83,20 @@ ...@@ -93,6 +83,20 @@
white-space: nowrap; white-space: nowrap;
display: flex; display: flex;
align-items: center; 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 { .roomMessage {
width: 100%; width: 100%;
...@@ -140,8 +144,8 @@ ...@@ -140,8 +144,8 @@
border-right: 1px solid #ffffff; border-right: 1px solid #ffffff;
box-sizing: border-box; box-sizing: border-box;
} }
.reserveRoomTimeBarBg>view:nth-last-of-type(1){ .reserveRoomTimeBarBg>view:nth-of-type(48){
border: none !important; border-right: none !important;
} }
.preemption { .preemption {
background: #FFFFFF; background: #FFFFFF;
...@@ -327,3 +331,7 @@ ...@@ -327,3 +331,7 @@
padding-top: 192rpx; padding-top: 192rpx;
box-sizing: border-box; box-sizing: border-box;
} }
.reserveRoomMsg .iconfont{
font-size: 24rpx;
margin-right: 8rpx;
}
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<scroll-view scroll-x='{{true}}' scroll-left='{{100}}' scroll-into-view='searchList'> <scroll-view scroll-x='{{true}}' scroll-left='{{100}}' scroll-into-view='searchList'>
<view a:for="{{equipFacilityList}}" class="equipFacilityList" onTap="changeSearchEquipFacility" data-id='{{item.id}}'> <view a:for="{{equipFacilityList}}" class="equipFacilityList" onTap="changeSearchEquipFacility" data-id='{{item.id}}'>
<view class="selectListcheck"> <view class="selectListcheck">
<text class="iconfont iconyigouxuan" a:if="{{search.equipFacilityIds.indexOf(item.id) !== -1}}"></text> <text class="iconfont iconxuanzhong2" a:if="{{search.equipFacilityIds.indexOf(item.id) !== -1}}"></text>
<text class="iconfont iconweigouxuan" a:elif="{{search.equipFacilityIds.indexOf(item.id) === -1}}"></text> <text class="iconfont iconweigouxuan" a:elif="{{search.equipFacilityIds.indexOf(item.id) === -1}}"></text>
</view> </view>
<view> <view>
...@@ -41,14 +41,14 @@ ...@@ -41,14 +41,14 @@
{{item.name}} {{item.name}}
</view> </view>
<view class="reserveRoomEquipFacility"> <view class="reserveRoomEquipFacility">
设备:<text a:for="{{item.equipFacilityNames}}" a:if="{{item2 !== null}}" a:for-item="item2" a:for-index="index2">{{item2}}{{index2 === item.equipFacilityNames.length-1 ? '' : '/'}}</text> <text class="locationIcon iconfont iconshebei"></text> <text a:for="{{item.equipFacilityNames}}" a:if="{{item2 !== null}}" a:for-item="item2" a:for-index="index2">{{item2}}{{index2 === item.equipFacilityNames.length-1 ? '' : '/'}}</text>
</view> </view>
<view class="reserveRoomNumAndLocation"> <view class="reserveRoomNumAndLocation">
<view class="reserveRoomNum"> <view class="reserveRoomNum">
<text class="locationIcon iconfont icondingwei"></text>{{item.capacityNum}} <text class="locationIcon iconfont icondingwei1"></text>{{item.capacityNum}}
</view> </view>
<view class="reserveRoomLocation"> <view class="reserveRoomLocation">
<text class="locationIcon iconfont iconbeifangren"></text>{{item.locationName}} <text class="locationIcon iconfont iconcanhuiren"></text>{{item.locationName}}
</view> </view>
</view> </view>
</view> </view>
......
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