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
4e007456
Commit
4e007456
authored
Feb 12, 2020
by
fengzhaoyu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
冲突人员
parent
601a3e60
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
28 additions
and
24 deletions
+28
-24
config$.js
.tea/entryFiles-development/config$.js
+1
-1
index$.web.js
.tea/entryFiles-development/index$.web.js
+2
-2
index$.worker.js
.tea/entryFiles-development/index$.worker.js
+2
-2
layout.json
.tea/layout.json
+2
-2
recent.json
.tea/recent.json
+2
-2
workbench.json
.tea/workbench.json
+2
-2
app.json
app.json
+2
-2
createOrEditSchedule.axml
pages/createOrEditSchedule/createOrEditSchedule.axml
+5
-5
createOrEditSchedule.js
pages/createOrEditSchedule/createOrEditSchedule.js
+5
-5
scheduleDetail.js
pages/scheduleDetail/scheduleDetail.js
+5
-1
No files found.
.tea/entryFiles-development/config$.js
View file @
4e007456
...
@@ -2,6 +2,6 @@
...
@@ -2,6 +2,6 @@
const
g
=
typeof
global
!==
'undefined'
?
global
:
self
;
const
g
=
typeof
global
!==
'undefined'
?
global
:
self
;
g
.
appXAppJson
=
{
g
.
appXAppJson
=
{
"app"
:
{
"app"
:
{
"$homepage"
:
"pages/
index/index
"
"$homepage"
:
"pages/
createOrEditSchedule/createOrEditSchedule
"
}
}
};
};
.tea/entryFiles-development/index$.web.js
View file @
4e007456
...
@@ -2,8 +2,8 @@ require('@alipay/appx-compiler/lib/sjsEnvInit');
...
@@ -2,8 +2,8 @@ require('@alipay/appx-compiler/lib/sjsEnvInit');
require
(
'./config$'
);
require
(
'./config$'
);
require
(
'../../components/mwSelectTimeModal/mwSelectTimeModal?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43'
);
require
(
'../../components/mwSelectTimeModal/mwSelectTimeModal?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43'
);
require
(
'../../pages/
index/index?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68
'
);
require
(
'../../pages/
createOrEditSchedule/createOrEditSchedule?hash=1050067ff0ee468be9456edefa2d7c5ad05c3cc7
'
);
require
(
'../../pages/scheduleDetail/scheduleDetail?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68'
);
require
(
'../../pages/scheduleDetail/scheduleDetail?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68'
);
require
(
'../../pages/index/index?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68'
);
require
(
'../../pages/place/place?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68'
);
require
(
'../../pages/place/place?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68'
);
require
(
'../../pages/createOrEditSchedule/createOrEditSchedule?hash=1050067ff0ee468be9456edefa2d7c5ad05c3cc7'
);
require
(
'../../pages/participantsDetail/participantsDetail?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68'
);
require
(
'../../pages/participantsDetail/participantsDetail?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68'
);
.tea/entryFiles-development/index$.worker.js
View file @
4e007456
...
@@ -30,10 +30,10 @@ if(AFAppX.registerApp) {
...
@@ -30,10 +30,10 @@ if(AFAppX.registerApp) {
function
success
()
{
function
success
()
{
require
(
'../../app'
);
require
(
'../../app'
);
require
(
'../../components/mwSelectTimeModal/mwSelectTimeModal?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43'
);
require
(
'../../components/mwSelectTimeModal/mwSelectTimeModal?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43'
);
require
(
'../../pages/
index/index?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68
'
);
require
(
'../../pages/
createOrEditSchedule/createOrEditSchedule?hash=1050067ff0ee468be9456edefa2d7c5ad05c3cc7
'
);
require
(
'../../pages/scheduleDetail/scheduleDetail?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68'
);
require
(
'../../pages/scheduleDetail/scheduleDetail?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68'
);
require
(
'../../pages/index/index?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68'
);
require
(
'../../pages/place/place?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68'
);
require
(
'../../pages/place/place?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68'
);
require
(
'../../pages/createOrEditSchedule/createOrEditSchedule?hash=1050067ff0ee468be9456edefa2d7c5ad05c3cc7'
);
require
(
'../../pages/participantsDetail/participantsDetail?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68'
);
require
(
'../../pages/participantsDetail/participantsDetail?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68'
);
}
}
self
.
bootstrapApp
?
self
.
bootstrapApp
({
success
})
:
success
();
self
.
bootstrapApp
?
self
.
bootstrapApp
({
success
})
:
success
();
...
...
.tea/layout.json
View file @
4e007456
{
"layout"
:{
"left"
:{
"currentId"
:
"explorer"
,
"size"
:
310
},
"right"
:{
"currentId"
:
""
},
"bottom"
:{
"currentId"
:
"devtools"
,
"size"
:
280
}},
"storageVersion"
:
"1.5.7"
}
{
"layout"
:{
"left"
:{
"currentId"
:
"explorer"
,
"size"
:
310
},
"right"
:{
"currentId"
:
""
},
"bottom"
:{
"currentId"
:
""
,
"size"
:
280
}},
"storageVersion"
:
"1.5.7"
}
\ No newline at end of file
\ No newline at end of file
.tea/recent.json
View file @
4e007456
{
"OPENED_FILE"
:[
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/createOrEditSchedule/createOrEditSchedule.js"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/index/index.axml"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/index/index.js"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/scheduleDetail/scheduleDetail.acss"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/scheduleDetail/scheduleDetail.json"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/createOrEditSchedule/createOrEditSchedule.acss"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/participantsDetail/participantsDetail.axml"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/app.json"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/scheduleDetail/scheduleDetail.axml"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/font/iconfont.acss"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/place/place.acss"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/scheduleDetail/scheduleDetail.js"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/app.js"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/%20scheduleDetail/%20scheduleDetail.axml"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/%20scheduleDetail/%20scheduleDetail.acss"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/%20scheduleDetail/%20scheduleDetail.js"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/api/request.js"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/participantsDetail/participantsDetail.js"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/stores/exampleStore.js"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/createOrEditSchedule/createOrEditSchedule.axml"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/api/http.js"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/createOrEditSchedule/createOrEditSchedule.json"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/components/.DS_Store"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/place/place.js"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/place/place.axml"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/.gitignore"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/components/message/index.js"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/components/message/index.axml"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/components/message/index.acss"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/api/login.js"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/app.acss"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/components/message/.DS_Store"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/createOrEditSchedule/createOrEditSchedule%20.axml"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/components/mwSelectTimeModal/mwSelectTimeModal.axml"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/assests/cancel.png"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/participantsDetail/participantsDetail.acss"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/index/index.acss"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/place/place.json"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/stores/example"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/font/iconfont.svg"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/font/demo.acss"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/font/iconfont.ttf"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/font/iconfont.js"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/font/iconfont.eot"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/snapshot.png"
],
"SEARCH_WORD"
:[
"a:fo"
,
"border"
,
"debugger"
,
"request"
,
"participants"
,
"dd.se"
,
".icon"
,
"scroll"
,
" getUserScheduleInTime(data).then(res => {"
,
"getUserScheduleInTime(data)"
],
"storageVersion"
:
"1.5.7"
}
{
"OPENED_FILE"
:[
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/createOrEditSchedule/createOrEditSchedule.axml"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/createOrEditSchedule/createOrEditSchedule.js"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/app.js"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/.gitignore"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/components/.DS_Store"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/app.json"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/scheduleDetail/scheduleDetail.axml"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/scheduleDetail/scheduleDetail.acss"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/index/index.axml"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/index/index.js"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/scheduleDetail/scheduleDetail.js"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/scheduleDetail/scheduleDetail.json"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/createOrEditSchedule/createOrEditSchedule.acss"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/participantsDetail/participantsDetail.axml"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/font/iconfont.acss"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/place/place.acss"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/%20scheduleDetail/%20scheduleDetail.axml"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/%20scheduleDetail/%20scheduleDetail.acss"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/%20scheduleDetail/%20scheduleDetail.js"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/api/request.js"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/participantsDetail/participantsDetail.js"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/stores/exampleStore.js"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/api/http.js"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/createOrEditSchedule/createOrEditSchedule.json"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/place/place.js"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/place/place.axml"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/components/message/index.js"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/components/message/index.axml"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/components/message/index.acss"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/api/login.js"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/app.acss"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/components/message/.DS_Store"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/createOrEditSchedule/createOrEditSchedule%20.axml"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/components/mwSelectTimeModal/mwSelectTimeModal.axml"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/assests/cancel.png"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/participantsDetail/participantsDetail.acss"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/index/index.acss"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/place/place.json"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/stores/example"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/font/iconfont.svg"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/font/demo.acss"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/font/iconfont.ttf"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/font/iconfont.js"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/font/iconfont.eot"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/snapshot.png"
],
"SEARCH_WORD"
:[
"a:fo"
,
"border"
,
"debugger"
,
"request"
,
"participants"
,
"dd.se"
,
".icon"
,
"scroll"
,
" getUserScheduleInTime(data).then(res => {"
,
"getUserScheduleInTime(data)"
],
"storageVersion"
:
"1.5.7"
}
\ No newline at end of file
\ No newline at end of file
.tea/workbench.json
View file @
4e007456
{
"grid"
:{
"editorGroup"
:{
"uris"
:[
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/scheduleDetail/scheduleDetail.axml"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/scheduleDetail/scheduleDetail.acss"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/place/place.acss"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/createOrEditSchedule/createOrEditSchedule.acss"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/index/index.axml"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/app.json"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/participantsDetail/participantsDetail.axml"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/index/index.js"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/scheduleDetail/scheduleDetail.json"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/createOrEditSchedule/createOrEditSchedule.js"
],
"current"
:
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/createOrEditSchedule/createOrEditSchedule.js"
,
"previewIndex"
:
-1
}},
"storageVersion"
:
"1.5.7"
}
{
"grid"
:{
"editorGroup"
:{
"uris"
:[
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/scheduleDetail/scheduleDetail.axml"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/createOrEditSchedule/createOrEditSchedule.js"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/components/.DS_Store"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/.gitignore"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/createOrEditSchedule/createOrEditSchedule.axml"
,
"file:///Users/zhaoyufeng/Desktop/work/schedule/app.js"
],
"current"
:
"file:///Users/zhaoyufeng/Desktop/work/schedule/pages/createOrEditSchedule/createOrEditSchedule.axml"
,
"previewIndex"
:
-1
}},
"storageVersion"
:
"1.5.7"
}
\ No newline at end of file
\ No newline at end of file
app.json
View file @
4e007456
{
{
"pages"
:
[
"pages"
:
[
"pages/
index/index
"
,
"pages/
createOrEditSchedule/createOrEditSchedule
"
,
"pages/scheduleDetail/scheduleDetail"
,
"pages/scheduleDetail/scheduleDetail"
,
"pages/index/index"
,
"pages/place/place"
,
"pages/place/place"
,
"pages/createOrEditSchedule/createOrEditSchedule"
,
"pages/participantsDetail/participantsDetail"
"pages/participantsDetail/participantsDetail"
],
],
"window"
:
{
"window"
:
{
...
...
pages/createOrEditSchedule/createOrEditSchedule.axml
View file @
4e007456
...
@@ -60,7 +60,7 @@
...
@@ -60,7 +60,7 @@
<image a:if="{{!!item.headUrl}}" mode="scaleToFill" src="{{item.headUrl}}"/>
<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 a:else class="name">{{item.username.substring(item.username.length - 2, item.username.length)}}</text>
</text>
</text>
<text class="conflictTip"></text>
<text
a:if={{conflictPeople.indexOf(item.userId)>-1}}
class="conflictTip"></text>
</text>
</text>
</view>
</view>
<view class="addPeople iconfont icontianjia" onTap="addParticipants">
<view class="addPeople iconfont icontianjia" onTap="addParticipants">
...
@@ -71,10 +71,10 @@
...
@@ -71,10 +71,10 @@
</view>
</view>
</view>
</view>
<view class="tip">
<view class="tip">
<
!--<text class="noConflict
">
<
text class="noConflict" a:if="conflictPeope === []
">
所有参与者都有空</text>
-->
所有参与者都有空</text>
<text class="conflict">
<text class="conflict"
a:else
>
叶琴、王梦琳、冯召玉、等9:30-10:00
会议冲突
<text a:if="{{conflictPeople.indexOf(list.userId)>-1}}" a:for="{{participatorList}}" a:for-list="item">{{list.username}}</text>
会议冲突
</text>
</text>
</view>
</view>
</view>
</view>
...
...
pages/createOrEditSchedule/createOrEditSchedule.js
View file @
4e007456
...
@@ -197,11 +197,11 @@ create.Page({
...
@@ -197,11 +197,11 @@ create.Page({
userIds
:
this
.
store
.
data
.
participatorUserId
userIds
:
this
.
store
.
data
.
participatorUserId
}
}
getUserScheduleInTime
(
data
).
then
(
res
=>
{
getUserScheduleInTime
(
data
).
then
(
res
=>
{
// res.data.forEach((item, index) =>
{
for
(
let
value
in
res
.
data
.
data
)
{
// console.log(item)
if
(
res
.
data
.
data
[
value
]
===
[])
{
conflictPeople
.
push
(
value
)
// })
}
}
})
})
}
}
...
...
pages/scheduleDetail/scheduleDetail.js
View file @
4e007456
Page
({
Page
({
data
:
{},
data
:
{},
onLoad
()
{},
onLoad
()
{
dd
.
setNavigationBar
({
title
:
'会议详情'
})
},
});
});
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