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
3605b0f9
Commit
3605b0f9
authored
5 years ago
by
xiexiaoqin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix style and lower-threshold, perf code
parent
d61946c8
release_beta/1.0.0
…
dev
release/1.0.0
release/2.0.0
release/2.1.0
release/dev/2.0.0
release/dev/2.1.0
No related merge requests found
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
29 additions
and
32 deletions
+29
-32
myDynamic.acss
PageComponents/myDynamic/myDynamic.acss
+5
-0
myDynamic.axml
PageComponents/myDynamic/myDynamic.axml
+4
-4
myDynamic.js
PageComponents/myDynamic/myDynamic.js
+20
-23
app.acss
app.acss
+0
-5
No files found.
PageComponents/myDynamic/myDynamic.acss
View file @
3605b0f9
...
@@ -161,4 +161,8 @@
...
@@ -161,4 +161,8 @@
top: 0;
top: 0;
left: 0;
left: 0;
bottom: 0;
bottom: 0;
}
.icon-color {
opacity: 0.4;
}
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
PageComponents/myDynamic/myDynamic.axml
View file @
3605b0f9
...
@@ -2,19 +2,19 @@
...
@@ -2,19 +2,19 @@
<import src="../../template/loading/loading.axml"/>
<import src="../../template/loading/loading.axml"/>
<view class="{{isStopBodyScroll ? 'scroll-lock' : ''}}" onTap="closeSwipe" onTouchStart="closeSwipe" onTouchMove="closeSwipe" onTouchEnd="closeSwipe">
<view class="{{isStopBodyScroll ? 'scroll-lock' : ''}}" onTap="closeSwipe" onTouchStart="closeSwipe" onTouchMove="closeSwipe" onTouchEnd="closeSwipe">
<block a:if="{{!loading}}">
<block a:if="{{!loading}}">
<scroll-view a:if="{{dynamicList.length > 0}}" scroll-y="{{true}}" class="dynamicBox" onScrollToLower="onScrollToLower">
<scroll-view a:if="{{dynamicList.length > 0}}" scroll-y="{{true}}"
lower-threshold="{{600}}"
class="dynamicBox" onScrollToLower="onScrollToLower">
<view class="dynamicList">
<view class="dynamicList">
<swipe onSetBodyDisableScroll="setBodyDisableScroll" rightWidth="{{ 78 }}" leftWidth="{{ 0 }}" a:for="{{dynamicList}}" class="dynamicContent">
<swipe onSetBodyDisableScroll="setBodyDisableScroll" rightWidth="{{ 78 }}" leftWidth="{{ 0 }}" a:for="{{dynamicList}}" class="dynamicContent"
key="{{item.scheduleId}}"
>
<view class="dynamicDetails">
<view class="dynamicDetails">
<view class="meetingtitle" catchTap="nextPage" data-item="{{item}}">
<view class="meetingtitle" catchTap="nextPage" data-item="{{item}}">
<view>
<view>
{{item.title}}
{{item.title}}
</view>
</view>
<view>
<view>
<text a:if="{{item.traceTime !== traceTime}}" class="iconfont iconicon_top1"></text>
<text a:if="{{item.traceTime !== traceTime}}" class="iconfont iconicon_top1
icon-color
"></text>
</view>
</view>
</view>
</view>
<block a:for="{{item.meetingLogDataList.slice(0,2)}}" a:for-item="dynamicItem">
<block a:for="{{item.meetingLogDataList.slice(0,2)}}" a:for-item="dynamicItem"
key="{{item.id}}"
>
<view class="userDynamic">
<view class="userDynamic">
<view class="dynamicTime" catchTap="nextPage" data-item="{{dynamicItem}}">
<view class="dynamicTime" catchTap="nextPage" data-item="{{dynamicItem}}">
<text>{{dynamicItem.content}}</text>
<text>{{dynamicItem.content}}</text>
...
...
This diff is collapsed.
Click to expand it.
PageComponents/myDynamic/myDynamic.js
View file @
3605b0f9
...
@@ -3,7 +3,7 @@ import {
...
@@ -3,7 +3,7 @@ import {
meetingCollection
,
meetingCollection
,
updateMeetingTask
updateMeetingTask
}
from
"../../api/request"
;
}
from
"../../api/request"
;
import
{
getCreateShowTime
,
uniqueObject
}
from
"../../utils/utils"
;
import
{
getCreateShowTime
}
from
"../../utils/utils"
;
import
create
from
'dd-store'
;
import
create
from
'dd-store'
;
create
.
Component
({
create
.
Component
({
...
@@ -14,8 +14,6 @@ create.Component({
...
@@ -14,8 +14,6 @@ create.Component({
dynamicList
:
[],
dynamicList
:
[],
current
:
1
,
current
:
1
,
pages
:
1
,
pages
:
1
,
size
:
10
,
noData
:
false
,
loading
:
true
loading
:
true
},
},
props
:
{},
props
:
{},
...
@@ -36,7 +34,7 @@ create.Component({
...
@@ -36,7 +34,7 @@ create.Component({
this
.
$store
.
closeActiveSwipe
()
this
.
$store
.
closeActiveSwipe
()
}
}
},
},
getPages
(
current
)
{
getPages
(
current
,
callBack
)
{
getDynamicList
({
getDynamicList
({
current
,
current
,
size
:
10
size
:
10
...
@@ -47,12 +45,7 @@ create.Component({
...
@@ -47,12 +45,7 @@ create.Component({
})
})
return
;
return
;
}
}
// 第一层日程数据处理
const
dynamicList
=
res
.
data
.
data
.
records
.
map
((
item
,
index
)
=>
{
const
dynamicList
=
res
.
data
.
data
.
records
.
map
((
item
,
index
)
=>
{
// 第二层日程下的动态数据处理
let
meetingLogDataList
=
{};
let
meetingLogDataListArr
=
[];
for
(
let
i
=
0
;
i
<
item
.
meetingLogDataList
.
length
;
i
++
)
{
for
(
let
i
=
0
;
i
<
item
.
meetingLogDataList
.
length
;
i
++
)
{
if
(
item
.
meetingLogDataList
[
i
].
creatorInfo
)
{
if
(
item
.
meetingLogDataList
[
i
].
creatorInfo
)
{
item
.
meetingLogDataList
[
i
].
creatorInfo
=
JSON
.
parse
(
item
.
meetingLogDataList
[
i
].
creatorInfo
=
JSON
.
parse
(
...
@@ -82,12 +75,7 @@ create.Component({
...
@@ -82,12 +75,7 @@ create.Component({
}
}
}
}
}
}
return
{
return
item
scheduleId
:
item
.
scheduleId
,
title
:
item
.
title
,
traceTime
:
item
.
traceTime
,
meetingLogDataList
:
item
.
meetingLogDataList
};
});
});
//第一页数据会重新请求需要替换
//第一页数据会重新请求需要替换
...
@@ -106,6 +94,9 @@ create.Component({
...
@@ -106,6 +94,9 @@ create.Component({
current
:
res
.
data
.
data
.
current
,
current
:
res
.
data
.
data
.
current
,
pages
:
res
.
data
.
data
.
pages
,
pages
:
res
.
data
.
data
.
pages
,
});
});
if
(
callBack
)
{
callBack
()
}
});
});
},
},
changeCollection
(
e
)
{
changeCollection
(
e
)
{
...
@@ -117,7 +108,11 @@ create.Component({
...
@@ -117,7 +108,11 @@ create.Component({
//取消置顶
//取消置顶
if
(
collection
===
"N"
)
{
if
(
collection
===
"N"
)
{
// 重新获取第一页的数据
// 重新获取第一页的数据
this
.
getPages
(
1
);
this
.
getPages
(
1
,
()
=>
{
dd
.
showToast
({
content
:
'取消成功'
})
});
}
else
{
}
else
{
//置顶
//置顶
const
dynamicList
=
this
.
data
.
dynamicList
;
const
dynamicList
=
this
.
data
.
dynamicList
;
...
@@ -127,6 +122,10 @@ create.Component({
...
@@ -127,6 +122,10 @@ create.Component({
dynamicList
.
unshift
(
replaceItem
);
dynamicList
.
unshift
(
replaceItem
);
this
.
setData
({
this
.
setData
({
dynamicList
:
dynamicList
dynamicList
:
dynamicList
},
()
=>
{
dd
.
showToast
({
content
:
'置顶成功'
})
});
});
}
}
});
});
...
@@ -137,8 +136,7 @@ create.Component({
...
@@ -137,8 +136,7 @@ create.Component({
}
}
},
},
onChangeTaskStatusOnList
(
e
)
{
onChangeTaskStatusOnList
(
e
)
{
let
that
=
this
;
const
data
=
{
let
data
=
{
groupId
:
e
.
groupId
,
groupId
:
e
.
groupId
,
scheduleId
:
e
.
scheduleId
,
scheduleId
:
e
.
scheduleId
,
resourceType
:
"task"
,
resourceType
:
"task"
,
...
@@ -152,25 +150,24 @@ create.Component({
...
@@ -152,25 +150,24 @@ create.Component({
if
(
res
.
data
.
code
===
0
)
{
if
(
res
.
data
.
code
===
0
)
{
let
dataIndex1
=
""
;
let
dataIndex1
=
""
;
let
dataIndex2
=
""
;
let
dataIndex2
=
""
;
th
at
.
data
.
dynamicList
.
map
((
item
,
index
)
=>
{
th
is
.
data
.
dynamicList
.
forEach
((
item
,
index
)
=>
{
if
(
item
.
scheduleId
===
e
.
scheduleId
)
{
if
(
item
.
scheduleId
===
e
.
scheduleId
)
{
dataIndex1
=
index
;
dataIndex1
=
index
;
item
.
meetingLogDataList
.
map
((
it
,
index2
)
=>
{
item
.
meetingLogDataList
.
forEach
((
it
,
index2
)
=>
{
if
(
it
.
meetingLogResource
.
id
==
e
.
id
)
{
if
(
it
.
meetingLogResource
.
id
==
e
.
id
)
{
dataIndex2
=
index2
;
dataIndex2
=
index2
;
}
}
});
});
}
}
});
});
le
t
setData
=
`dynamicList[
${
dataIndex1
}
].meetingLogDataList[
${
dataIndex2
}
].meetingLogResource.taskStatus`
;
cons
t
setData
=
`dynamicList[
${
dataIndex1
}
].meetingLogDataList[
${
dataIndex2
}
].meetingLogResource.taskStatus`
;
th
at
.
setData
({
th
is
.
setData
({
[
setData
]:
e
.
status
[
setData
]:
e
.
status
});
});
}
}
});
});
},
},
nextPage
(
event
)
{
nextPage
(
event
)
{
console
.
log
(
event
.
currentTarget
.
dataset
.
item
)
dd
.
navigateTo
({
url
:
`./../meetingDetail/meetingDetail?scheduleItem=
${
JSON
.
stringify
(
event
.
currentTarget
.
dataset
.
item
)}
`
});
dd
.
navigateTo
({
url
:
`./../meetingDetail/meetingDetail?scheduleItem=
${
JSON
.
stringify
(
event
.
currentTarget
.
dataset
.
item
)}
`
});
},
},
}
}
...
...
This diff is collapsed.
Click to expand it.
app.acss
View file @
3605b0f9
...
@@ -4,10 +4,6 @@ page {
...
@@ -4,10 +4,6 @@ page {
background: #F6F6F6;
background: #F6F6F6;
}
}
picker-view {
background: #F6F6F6;
}
view {
view {
box-sizing: border-box;
box-sizing: border-box;
}
}
\ No newline at end of file
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