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
8f5835d5
Commit
8f5835d5
authored
5 years ago
by
fengzhaoyu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
换了图标 发送提醒 发送修改
parent
65012e46
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
26 additions
and
19 deletions
+26
-19
attendingSituation.acss
pages/attendingSituation/attendingSituation.acss
+3
-3
createOrEditSchedule.acss
pages/createOrEditSchedule/createOrEditSchedule.acss
+10
-7
createOrEditSchedule.axml
pages/createOrEditSchedule/createOrEditSchedule.axml
+1
-1
createOrEditSchedule.js
pages/createOrEditSchedule/createOrEditSchedule.js
+1
-1
participantsDetail.acss
pages/participantsDetail/participantsDetail.acss
+8
-3
participantsDetail.axml
pages/participantsDetail/participantsDetail.axml
+1
-1
place.js
pages/place/place.js
+0
-1
scheduleDetail.acss
pages/scheduleDetail/scheduleDetail.acss
+2
-2
No files found.
pages/attendingSituation/attendingSituation.acss
View file @
8f5835d5
...
...
@@ -95,13 +95,13 @@ page {
background: #E60012 ;
}
.participatorStaus {
width:
20r
px;
width:
9
px;
text-align: center;
line-height:
20r
px;
line-height:
9
px;
color: #fff;
font-size: 14rpx;
border: 1rpx solid #fff;
height:
20r
px;
height:
9
px;
border-radius: 50%;
position: absolute;
bottom: 2rpx;
...
...
This diff is collapsed.
Click to expand it.
pages/createOrEditSchedule/createOrEditSchedule.acss
View file @
8f5835d5
...
...
@@ -228,18 +228,21 @@ page {
}
.conflictTip {
font-size:
2
4rpx;
font-size:
1
4rpx;
text-align: center;
width: 19rpx;
line-height: 19rpx;
height: 19rpx;
border: 1rpx solid #fff;
width: 9px;
line-height: 9px;
height: 9px;
display: inline-block;
border-radius: 50%;
background: #E60012;
position: absolute;
background: #f25643;
color: rgb(211, 190, 192);
bottom: -1rpx;
right: 13rpx;
bottom: -2rpx;
right: 12rpx;
color: rgb(204, 201, 201);
/* border: 1rpx solid #fff; */
}
.participants {
...
...
This diff is collapsed.
Click to expand it.
pages/createOrEditSchedule/createOrEditSchedule.axml
View file @
8f5835d5
...
...
@@ -73,7 +73,7 @@
<image a:if="{{!!item.headUrl}}" mode="scaleToFill" src="{{item.headUrl}}"/>
<text a:else class="name">{{item.username.substring(item.username.length - 2, item.username.length)}}</text>
</text>
<
text a:if="{{conflictPeople.includes(item.userId)}}" class="conflictTip"></text
>
<
view a:if="{{conflictPeople.includes(item.userId)}}" class="conflictTip iconfont iconduigou "></view
>
</text>
</view>
<view class="addPeople iconfont icontianjia1" onTap="addParticipants">
...
...
This diff is collapsed.
Click to expand it.
pages/createOrEditSchedule/createOrEditSchedule.js
View file @
8f5835d5
...
...
@@ -665,7 +665,7 @@ create.Page({
},
// 展示弹窗
showModel
:
throttle
(
function
(
e
)
{
if
(
!!
this
.
data
.
scheduleItem
)
{
if
(
!!
this
.
data
.
scheduleItem
&&
this
.
store
.
data
.
userList
.
length
>
1
)
{
this
.
setData
({
isShowPopupWindowList
:
true
})
...
...
This diff is collapsed.
Click to expand it.
pages/participantsDetail/participantsDetail.acss
View file @
8f5835d5
...
...
@@ -28,10 +28,15 @@ page {
position: relative;
}
.conflict {
font-size: 14rpx;
position: absolute;
width: 18rpx;
height: 18rpx;
background: red;
width: 9px;
height: 9px;
line-height: 9px;
text-align: center;
color: #fff;
border: 1rpx solid #fff;
background: #f25643;
bottom: 3rpx;
right: -2rpx;
border-radius: 50%;
...
...
This diff is collapsed.
Click to expand it.
pages/participantsDetail/participantsDetail.axml
View file @
8f5835d5
...
...
@@ -3,7 +3,7 @@
<view class="headImg">
<image a:if="{{!!item.headUrl}}" mode="scaleToFill" src="{{item.headUrl}}"/>
<text a:else>{{item.username.substring(0, 1)}}</text>
<text a:if="{{conflictPeople.includes(item.userId)}}"
class="conflict
"></text>
<text a:if="{{conflictPeople.includes(item.userId)}}"
class="conflict iconfont iconduigou
"></text>
</view>
<view class="info">
<text class="name">{{item.username}}</text>
...
...
This diff is collapsed.
Click to expand it.
pages/place/place.js
View file @
8f5835d5
...
...
@@ -2,7 +2,6 @@ import create from 'dd-store'
import
exampleStore
from
'/stores/exampleStore'
import
{
queryAvailableMeetingRoomByTime
}
from
'./../../api/request'
import
{
throttle
}
from
'./../../utils/utils.js'
create
.
Page
({
store
:
exampleStore
,
useAll
:
true
,
...
...
This diff is collapsed.
Click to expand it.
pages/scheduleDetail/scheduleDetail.acss
View file @
8f5835d5
...
...
@@ -312,8 +312,8 @@ page {
.participatorStaus {
border: 1rpx solid #fff;
width:
20r
px;
height:
20r
px;
width:
9
px;
height:
9
px;
color: #fff;
font-size: 14rpx;
line-height: 20rpx;
...
...
This diff is collapsed.
Click to expand it.
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