Commit b3ae83ca by fengzhaoyu

样式修改

parent 5fbab7a1
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
"pages": [ "pages": [
"pages/index/index", "pages/index/index",
"pages/editFile/editFile", "pages/editFile/editFile",
"pages/meetingRoomList/meetingRoomList",
"pages/place/place", "pages/place/place",
"pages/meetingRoomList/meetingRoomList",
"pages/uploadFile/uploadFile", "pages/uploadFile/uploadFile",
"pages/addRemark/addRemark", "pages/addRemark/addRemark",
"pages/uploadFile/uploadFile", "pages/uploadFile/uploadFile",
......
...@@ -7,6 +7,7 @@ page { ...@@ -7,6 +7,7 @@ page {
line-height: 42rpx; line-height: 42rpx;
padding-bottom: 180rpx; padding-bottom: 180rpx;
} }
.confirm>view { .confirm>view {
width: 100%; width: 100%;
height: 96rpx; height: 96rpx;
...@@ -18,6 +19,7 @@ page { ...@@ -18,6 +19,7 @@ page {
border: 1prx solid rgba(25, 31, 37, 0.12); border: 1prx solid rgba(25, 31, 37, 0.12);
border-radius: 48rpx; border-radius: 48rpx;
} }
.confirm { .confirm {
background: #fff; background: #fff;
width: 682rpx; width: 682rpx;
...@@ -25,6 +27,12 @@ page { ...@@ -25,6 +27,12 @@ page {
position: fixed; position: fixed;
bottom: 0; bottom: 0;
} }
.remarkInput { .remarkInput {
padding: 0 32rpx; padding: 32rpx 32rpx 0 32rpx;
}
.textarea {
padding-left: 0!important;
display: block;
} }
\ No newline at end of file
<view> <view>
<view class="remarkInput"> <view class="remarkInput">
<textarea focus="{{true}}" onInput="getRemark" auto-height placeholder="添加内容描述" value="{{remark}}" /> <textarea onInput="getRemark" auto-height placeholder="添加内容描述" value="{{remark}}" class="textarea" focus="{{false}}" />
</view> </view>
<!-- 保存 --> <!-- 保存 -->
<view class="confirm" onTap="save"> <view class="confirm" onTap="save">
......
...@@ -16,6 +16,7 @@ page { ...@@ -16,6 +16,7 @@ page {
line-height: 48rpx; line-height: 48rpx;
margin-bottom: 50rpx; margin-bottom: 50rpx;
font-weight: bold; font-weight: bold;
font-family:'DINAlternate-Bold';
} }
.manyWeeks { .manyWeeks {
...@@ -180,7 +181,15 @@ page { ...@@ -180,7 +181,15 @@ page {
width: 603rpx; width: 603rpx;
height: 444rpx; height: 444rpx;
vertical-align: top; vertical-align: top;
margin-top: 365rpx; margin-top: 300rpx;
margin-left: 82rpx; margin-left: 82rpx;
z-index: 9999999; z-index: 9999999;
}
.startText {
margin-top: 80rpx;
text-align: center;
font-size: 46rpx;
}
.text1 {
margin-right: 32rpx;
} }
\ No newline at end of file
<!--<mw-select></mw-select> --> <!--<mw-select></mw-select> -->
版本号:121 版本号:122
<view class="index"> <view class="index">
<view a:if="{{startPageOnLoad&&startPageOnShow}}"> <view a:if="{{startPageOnLoad&&startPageOnShow}}">
<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}}">
...@@ -94,5 +94,9 @@ ...@@ -94,5 +94,9 @@
</view> </view>
<view class="startPage" a:else> <view class="startPage" a:else>
<image mode="scaleToFill" src="../../assests/startPage.png"/> <image mode="scaleToFill" src="../../assests/startPage.png"/>
<view class="startText">
<text class="text1">开会有益</text>
<text>快乐工作</text>
</view>
</view> </view>
</view> </view>
\ No newline at end of file
...@@ -310,7 +310,7 @@ ...@@ -310,7 +310,7 @@
.OccupyTimeList>view:nth-of-type(2) view:nth-of-type(1) { .OccupyTimeList>view:nth-of-type(2) view:nth-of-type(1) {
color: #000000; color: #000000;
font-size: 34rpx; font-size: 34rpx;
font-weight: bold; font-family: 'DINAlternate-Bold';
} }
.OccupyTimeList>view:nth-of-type(2) view:nth-of-type(2) { .OccupyTimeList>view:nth-of-type(2) view:nth-of-type(2) {
......
...@@ -17,7 +17,7 @@ page { ...@@ -17,7 +17,7 @@ page {
.iconsousuo1 { .iconsousuo1 {
vertical-align: top; vertical-align: top;
line-height: 52rpx; line-height: 64rpx;
} }
.search { .search {
...@@ -25,6 +25,7 @@ page { ...@@ -25,6 +25,7 @@ page {
display: flex; display: flex;
padding: 34rpx 32rpx; padding: 34rpx 32rpx;
border-bottom: 1rpx solid rgba(25, 31, 37, 0.12); border-bottom: 1rpx solid rgba(25, 31, 37, 0.12);
overflow: hidden;
} }
.search input { .search input {
...@@ -93,6 +94,7 @@ page { ...@@ -93,6 +94,7 @@ page {
} }
.equipment text { .equipment text {
display: inline-block;
font-size: 24rpx; font-size: 24rpx;
line-height: 26rpx; line-height: 26rpx;
color: #7D8082; color: #7D8082;
...@@ -130,4 +132,8 @@ page { ...@@ -130,4 +132,8 @@ page {
line-height: 33rpx; line-height: 33rpx;
font-size: 24rpx; font-size: 24rpx;
color: rgba(25, 31, 37, 0.28); color: rgba(25, 31, 37, 0.28);
}
.iconshebei {
margin-top: 3rpx;
vertical-align: middle;
} }
\ No newline at end of file
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<text>{{item.capacityNum}}</text> <text>{{item.capacityNum}}</text>
</view> </view>
<view class="equipment" a:if="{{item.equipFacilityLabelList}}"> <view class="equipment" a:if="{{item.equipFacilityLabelList}}">
<text class="numIcon iconfont iconshebei"></text> <text class="iconfont iconshebei" style="margin-right: 9rpx;"></text>
<text a:for="{{item.equipFacilityLabelList}}" a:for-item="equipmentList">{{equipmentList.name}}</text> <text a:for="{{item.equipFacilityLabelList}}" a:for-item="equipmentList">{{equipmentList.name}}</text>
</view> </view>
</view> </view>
......
...@@ -440,4 +440,7 @@ page { ...@@ -440,4 +440,7 @@ page {
background: rgb(0, 0, 0, 0); background: rgb(0, 0, 0, 0);
z-index: 9999; z-index: 9999;
background: red; background: red;
}
.icondingwei1 {
font-size: 34rpx;
} }
\ No newline at end of file
...@@ -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 iconhuiyishi2 iconfont"> <view class="icon icondingwei1 iconfont">
</view> </view>
<view class="text"> <view class="text">
{{location.locationName}} {{location.locationName}}
...@@ -103,9 +103,9 @@ ...@@ -103,9 +103,9 @@
{{item.scheduleAccessory.descript}} {{item.scheduleAccessory.descript}}
</view> </view>
<view class="file" data-file="{{item2}}" onTap="preview" a:for="{{item.scheduleAccessory.fileInfos}}" a:for-item="item2"> <view class="file" data-file="{{item2}}" onTap="preview" a:for="{{item.scheduleAccessory.fileInfos}}" a:for-item="item2">
{{item2.fileType}}
<view class="fileImage {{item2.fileType==('png' || 'jpg' || 'svg' || 'jpeg') ?'image': item2.fileType}}"></view> <view class="fileImage {{item2.fileType==('png' || 'jpg' || 'svg' || 'jpeg') ?'image': item2.fileType}}"></view>
<view class="fileName"> <view class="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)}}">
......
...@@ -12,7 +12,6 @@ page { ...@@ -12,7 +12,6 @@ page {
.textarea { .textarea {
padding-left: 0!important; padding-left: 0!important;
display: block; display: block;
} }
.fileList { .fileList {
margin-top: 32rpx; margin-top: 32rpx;
......
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