Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
schedule
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fengzhaoyu
schedule
Commits
b3ae83ca
Commit
b3ae83ca
authored
Feb 29, 2020
by
fengzhaoyu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
样式修改
parent
5fbab7a1
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
45 additions
and
11 deletions
+45
-11
app.json
app.json
+1
-1
addRemark.acss
pages/addRemark/addRemark.acss
+10
-1
addRemark.axml
pages/addRemark/addRemark.axml
+1
-1
index.acss
pages/index/index.acss
+11
-1
index.axml
pages/index/index.axml
+6
-1
meetingRoomList.acss
pages/meetingRoomList/meetingRoomList.acss
+1
-1
place.acss
pages/place/place.acss
+8
-1
place.axml
pages/place/place.axml
+1
-1
scheduleDetail.acss
pages/scheduleDetail/scheduleDetail.acss
+4
-0
scheduleDetail.axml
pages/scheduleDetail/scheduleDetail.axml
+2
-2
uploadFile.acss
pages/uploadFile/uploadFile.acss
+0
-1
No files found.
app.json
View file @
b3ae83ca
...
...
@@ -2,8 +2,8 @@
"pages"
:
[
"pages/index/index"
,
"pages/editFile/editFile"
,
"pages/meetingRoomList/meetingRoomList"
,
"pages/place/place"
,
"pages/meetingRoomList/meetingRoomList"
,
"pages/uploadFile/uploadFile"
,
"pages/addRemark/addRemark"
,
"pages/uploadFile/uploadFile"
,
...
...
pages/addRemark/addRemark.acss
View file @
b3ae83ca
...
...
@@ -7,6 +7,7 @@ page {
line-height: 42rpx;
padding-bottom: 180rpx;
}
.confirm>view {
width: 100%;
height: 96rpx;
...
...
@@ -18,6 +19,7 @@ page {
border: 1prx solid rgba(25, 31, 37, 0.12);
border-radius: 48rpx;
}
.confirm {
background: #fff;
width: 682rpx;
...
...
@@ -25,6 +27,12 @@ page {
position: fixed;
bottom: 0;
}
.remarkInput {
padding: 0 32rpx;
padding: 32rpx 32rpx 0 32rpx;
}
.textarea {
padding-left: 0!important;
display: block;
}
\ No newline at end of file
pages/addRemark/addRemark.axml
View file @
b3ae83ca
<view>
<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 class="confirm" onTap="save">
...
...
pages/index/index.acss
View file @
b3ae83ca
...
...
@@ -16,6 +16,7 @@ page {
line-height: 48rpx;
margin-bottom: 50rpx;
font-weight: bold;
font-family:'DINAlternate-Bold';
}
.manyWeeks {
...
...
@@ -180,7 +181,15 @@ page {
width: 603rpx;
height: 444rpx;
vertical-align: top;
margin-top: 3
65
rpx;
margin-top: 3
00
rpx;
margin-left: 82rpx;
z-index: 9999999;
}
.startText {
margin-top: 80rpx;
text-align: center;
font-size: 46rpx;
}
.text1 {
margin-right: 32rpx;
}
\ No newline at end of file
pages/index/index.axml
View file @
b3ae83ca
<!--<mw-select></mw-select> -->
版本号:12
1
版
版本号:12
2
版
<view class="index">
<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}}">
...
...
@@ -94,5 +94,9 @@
</view>
<view class="startPage" a:else>
<image mode="scaleToFill" src="../../assests/startPage.png"/>
<view class="startText">
<text class="text1">开会有益</text>
<text>快乐工作</text>
</view>
</view>
</view>
\ No newline at end of file
pages/meetingRoomList/meetingRoomList.acss
View file @
b3ae83ca
...
...
@@ -310,7 +310,7 @@
.OccupyTimeList>view:nth-of-type(2) view:nth-of-type(1) {
color: #000000;
font-size: 34rpx;
font-
weight: bold
;
font-
family: 'DINAlternate-Bold'
;
}
.OccupyTimeList>view:nth-of-type(2) view:nth-of-type(2) {
...
...
pages/place/place.acss
View file @
b3ae83ca
...
...
@@ -17,7 +17,7 @@ page {
.iconsousuo1 {
vertical-align: top;
line-height:
52
rpx;
line-height:
64
rpx;
}
.search {
...
...
@@ -25,6 +25,7 @@ page {
display: flex;
padding: 34rpx 32rpx;
border-bottom: 1rpx solid rgba(25, 31, 37, 0.12);
overflow: hidden;
}
.search input {
...
...
@@ -93,6 +94,7 @@ page {
}
.equipment text {
display: inline-block;
font-size: 24rpx;
line-height: 26rpx;
color: #7D8082;
...
...
@@ -130,4 +132,8 @@ page {
line-height: 33rpx;
font-size: 24rpx;
color: rgba(25, 31, 37, 0.28);
}
.iconshebei {
margin-top: 3rpx;
vertical-align: middle;
}
\ No newline at end of file
pages/place/place.axml
View file @
b3ae83ca
...
...
@@ -25,7 +25,7 @@
<text>{{item.capacityNum}}</text>
</view>
<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>
</view>
</view>
...
...
pages/scheduleDetail/scheduleDetail.acss
View file @
b3ae83ca
...
...
@@ -440,4 +440,7 @@ page {
background: rgb(0, 0, 0, 0);
z-index: 9999;
background: red;
}
.icondingwei1 {
font-size: 34rpx;
}
\ No newline at end of file
pages/scheduleDetail/scheduleDetail.axml
View file @
b3ae83ca
...
...
@@ -11,7 +11,7 @@
</view>
<!-- 地址 -->
<view class="place" a:if="{{!!location.locationName}}">
<view class="icon icon
huiyishi2
iconfont">
<view class="icon icon
dingwei1
iconfont">
</view>
<view class="text">
{{location.locationName}}
...
...
@@ -103,9 +103,9 @@
{{item.scheduleAccessory.descript}}
</view>
<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="fileName">
{{item2.fileName}}
</view>
</view>
<view class="modFile" a:if="{{organizer == pemissions?(item.meetingLogId == meetingLogId):(item.meetingLogId == meetingLogId&&item.scheduleAccessory.uploaderInfo.userId==pemissions)}}">
...
...
pages/uploadFile/uploadFile.acss
View file @
b3ae83ca
...
...
@@ -12,7 +12,6 @@ page {
.textarea {
padding-left: 0!important;
display: block;
}
.fileList {
margin-top: 32rpx;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment