From 0d17304509b0b43221b768483856263ce9ff1e29 Mon Sep 17 00:00:00 2001 From: ‘fengzhaoyu’ <feng.zhaoyu@mingwork.com> Date: Fri, 28 Feb 2020 19:11:17 +0800 Subject: [PATCH] 样式修改 --- app.json | 4 ++-- pages/attendingSituation/attendingSituation.acss | 9 ++++++++- pages/attendingSituation/attendingSituation.axml | 2 +- pages/createOrEditSchedule/createOrEditSchedule.axml | 2 +- pages/createOrEditSchedule/createOrEditSchedule.js | 6 ++++++ pages/participantsDetail/participantsDetail.acss | 4 ++-- pages/place/place.acss | 9 +++++---- pages/remind/remind.acss | 6 +++--- pages/scheduleDetail/scheduleDetail.acss | 11 ++++++++++- pages/scheduleDetail/scheduleDetail.axml | 7 +++++-- pages/uploadFile/uploadFile.acss | 19 ++++++++++++++----- pages/uploadFile/uploadFile.axml | 2 +- 12 files changed, 58 insertions(+), 23 deletions(-) diff --git a/app.json b/app.json index be7323f..0d3aaaf 100644 --- a/app.json +++ b/app.json @@ -2,14 +2,14 @@ "pages": [ "pages/index/index", "pages/place/place", - "pages/createOrEditSchedule/createOrEditSchedule", "pages/uploadFile/uploadFile", + "pages/addRemark/addRemark", + "pages/createOrEditSchedule/createOrEditSchedule", "pages/meetingRoomList/meetingRoomList", "pages/uploadFile/uploadFile", "pages/repetitionTime/repetitionTime", "pages/repeatMechanism/repeatMechanism", "pages/attendingSituation/attendingSituation", - "pages/addRemark/addRemark", "pages/remind/remind", "pages/scheduleDetail/scheduleDetail", "pages/participantsDetail/participantsDetail", diff --git a/pages/attendingSituation/attendingSituation.acss b/pages/attendingSituation/attendingSituation.acss index 30d2240..769749b 100644 --- a/pages/attendingSituation/attendingSituation.acss +++ b/pages/attendingSituation/attendingSituation.acss @@ -96,9 +96,16 @@ page { } .participatorStaus { width: 20rpx; + text-align: center; + line-height: 20rpx; + color: #fff; + font-size: 14rpx; + border: 1rpx solid #fff; height: 20rpx; border-radius: 50%; position: absolute; bottom: 2rpx; - right: -5rpx; + right: -4rpx; + overflow: hidden; + display: inline-block; } \ No newline at end of file diff --git a/pages/attendingSituation/attendingSituation.axml b/pages/attendingSituation/attendingSituation.axml index 33e3dc9..51b5ca3 100644 --- a/pages/attendingSituation/attendingSituation.axml +++ b/pages/attendingSituation/attendingSituation.axml @@ -3,7 +3,7 @@ <view class="headImg"> <image mode="scaleToFill" src="{{item.participator.headUrl}}" a:if="{{item.participator.headUrl.length}}"/> <text a:else>{{item.participator.username.substring(0,1)}}</text> - <text a:if="{{item.confirmAttendance!=null}}" class="participatorStaus {{item.confirmAttendance==1 || item.participator.userId == organizer?'accept':'cancel'}} " ></text> + <text a:if="{{item.confirmAttendance!=null || item.participator.userId == organizer }}" class="participatorStaus iconfont {{item.confirmAttendance==1 || item.participator.userId == organizer?'accept iconduigou':'cancel iconhengxian'}} "></text> </view> <view class="info"> <text class="name">{{item.participator.username}}</text> diff --git a/pages/createOrEditSchedule/createOrEditSchedule.axml b/pages/createOrEditSchedule/createOrEditSchedule.axml index 1c6fdb2..014e76f 100644 --- a/pages/createOrEditSchedule/createOrEditSchedule.axml +++ b/pages/createOrEditSchedule/createOrEditSchedule.axml @@ -3,7 +3,7 @@ <!-- 主题 --> <view class="container {{!!scheduleItem?(organizer==permissions?'':'noPermissions'):''}}"> <view class="theme"> - <input placeholder="添加主题" type="text" onInput="getTitle" value="{{title}}"/> + <input placeholder="添加主题" type="text" onInput="getTitle" value="{{title}}" focus="{{true}}"/> </view> <view class="permissions" a:if="{{!!scheduleItem?(organizer==permissions?false:true):false}}"> </view> diff --git a/pages/createOrEditSchedule/createOrEditSchedule.js b/pages/createOrEditSchedule/createOrEditSchedule.js index 8b1e4d1..f9edf09 100644 --- a/pages/createOrEditSchedule/createOrEditSchedule.js +++ b/pages/createOrEditSchedule/createOrEditSchedule.js @@ -153,6 +153,8 @@ create.Page({ week2: w2, timeStaus: '' }, () => { + that.store.data.startTime = that.data.time1 + that.store.data.endTime = that.data.time2 that.conflict() }) } else { @@ -162,6 +164,8 @@ create.Page({ week1: w1, timeStaus: '' }, () => { + that.store.data.startTime = that.data.time1 + that.store.data.endTime = that.data.time2 that.conflict() }) } @@ -181,6 +185,8 @@ create.Page({ week2: w1, timeStaus: '' }, () => { + that.store.data.startTime = that.data.time1 + that.store.data.endTime = that.data.time2 that.conflict() }) } diff --git a/pages/participantsDetail/participantsDetail.acss b/pages/participantsDetail/participantsDetail.acss index c9c5479..7bedd0d 100644 --- a/pages/participantsDetail/participantsDetail.acss +++ b/pages/participantsDetail/participantsDetail.acss @@ -67,11 +67,11 @@ page { .button view { width: 335rpx; - height: 96rpx; + height: 90rpx; border: 1px solid #3296FA; border-radius: 48px; text-align: center; - line-height: 96rpx; + line-height: 90rpx; font-size: 36rpx; } diff --git a/pages/place/place.acss b/pages/place/place.acss index 0479aed..d7255cb 100644 --- a/pages/place/place.acss +++ b/pages/place/place.acss @@ -10,20 +10,22 @@ page { text-align: left; font-size: 32rpx; color: rgba(25, 31, 37, 0.40); - vertical-align: center; + vertical-align: top; margin-right: 24rpx; + line-height: 1.5; } .search { background: white; display: flex; - padding: 0 32rpx; + padding: 40rpx 32rpx; border-bottom: 1rpx solid rgba(25, 31, 37, 0.12); } .search input { font-size: 40rpx !important; width: 100%; + vertical-align: top; padding-left: 0; display: block; } @@ -108,8 +110,7 @@ page { .customLocation { margin-top: 13rpx; background: white; - border-bottom: 1rpx solid rgba(25, 31, 37, 0.12); - + border-bottom: 1rpx solid rgba(25, 31, 37, 0.12); padding: 25rpx 32rpx; } diff --git a/pages/remind/remind.acss b/pages/remind/remind.acss index 6b75931..53eb0ff 100644 --- a/pages/remind/remind.acss +++ b/pages/remind/remind.acss @@ -24,17 +24,17 @@ page { .confirm { background: #fff; width: 682rpx; - padding: 32rpx 34rpx; + padding: 24rpx 34rpx; position: fixed; bottom: 0; } .confirm>view { width: 100%; - height: 96rpx; + height: 90rpx; font-size: 36rpx; text-align: center; - line-height: 96rpx; + line-height: 90rpx; color: #fff; background: #3296FA; border: 1prx solid rgba(25, 31, 37, 0.12); diff --git a/pages/scheduleDetail/scheduleDetail.acss b/pages/scheduleDetail/scheduleDetail.acss index 3e5ceb6..2e79a86 100644 --- a/pages/scheduleDetail/scheduleDetail.acss +++ b/pages/scheduleDetail/scheduleDetail.acss @@ -189,6 +189,8 @@ page { } .dynamicDetail .describe { + text-align: left; + padding: 0; font-size: 26rpx; line-height: 37rpx; margin-top: 8rpx; @@ -309,12 +311,19 @@ page { } .participatorStaus { + border: 1rpx solid red; width: 20rpx; height: 20rpx; + color: #fff; + font-size: 14rpx; + line-height: 20rpx; + text-align: center; border-radius: 50%; position: absolute; bottom: 2rpx; right: -5rpx; + display: block; + overflow: hidden; } .accept { @@ -322,7 +331,7 @@ page { } .cancel { - background: #E60012; + background: #F25643; } .blank { diff --git a/pages/scheduleDetail/scheduleDetail.axml b/pages/scheduleDetail/scheduleDetail.axml index d2384c8..f0c5e82 100644 --- a/pages/scheduleDetail/scheduleDetail.axml +++ b/pages/scheduleDetail/scheduleDetail.axml @@ -52,7 +52,10 @@ <text> <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:if="{{item.confirmAttendance!=null}}"class="participatorStaus {{item.confirmAttendance==1 || item.participator.userId == organizer?'accept':'cancel'}} "></text></text></text></view> + <text a:if="{{item.confirmAttendance!=null || item.participator.userId == organizer }}" class="participatorStaus iconfont {{item.confirmAttendance==1 || item.participator.userId == organizer?'accept iconduigou':'cancel iconhengxian'}} "></text> + </text> + </text> + </view> <view class="right"> <text class="number">{{userList.length}}人参与</text> <text class="iconyoujinru iconfont"></text></view></view> @@ -161,6 +164,6 @@ </view> </view> <!-- 编辑 删除的时候的弹窗 --> - <view class="model" onTap="hideModel" a:if="{{!!meetingLogId}}"> + <view class="model" onTap="hideModel" a:if="{{!!meetingLogId}}"> </view> </block> \ No newline at end of file diff --git a/pages/uploadFile/uploadFile.acss b/pages/uploadFile/uploadFile.acss index 8d0bdcd..6729948 100644 --- a/pages/uploadFile/uploadFile.acss +++ b/pages/uploadFile/uploadFile.acss @@ -6,7 +6,14 @@ page { color: #191F25; padding-bottom: 180rpx; } +.describe { + padding:32rpx 32rpx 0 32rpx; +} +.textarea { + padding-left: 0!important; + display: block; +} .fileList { margin-top: 32rpx; padding: 0 32rpx; @@ -49,25 +56,27 @@ page { .add { padding: 0 32rpx; margin-top: 40rpx; + height: 32rpx; + line-height: 32rpx; + } .icontianjia1 { vertical-align: top; - line-height: 33rpx; + line-height: 32rpx; color: #3296fa; margin-right: 16rpx; } .addText { - margin-top: 10rpx; - line-height: 33rpx; + line-height: 32rpx; vertical-align: top; font-size: 28rpx; color: #3296FA; } .save { - padding: 32rpx 34rpx; + padding: 24rpx 34rpx; position: fixed; bottom: 0; } @@ -75,7 +84,7 @@ page { .saveButton { font-size: 36rpx; width: 686rpx; - line-height: 96rpx; + line-height: 90rpx; text-align: center; color: #fff; background: #3296FA; diff --git a/pages/uploadFile/uploadFile.axml b/pages/uploadFile/uploadFile.axml index ce05349..ee206a7 100644 --- a/pages/uploadFile/uploadFile.axml +++ b/pages/uploadFile/uploadFile.axml @@ -4,7 +4,7 @@ </view> <view class="fileList" a:for="{{upLoadInfo.data}}"> <view class="file"> - <view class="fileimage {{item.fileType==('png' || 'jpg' || 'svg' || 'jpeg' || 'JPG') ?'image': item.fileType}}"> + <view class="fileimage {{item.fileType==('png' || 'PNG'|| 'jpg' || 'svg' || 'jpeg' || 'JPG') ?'image': item.fileType}}"> </view> <view class="fileName"> {{item.fileName}} -- libgit2 0.26.0