Commit 3605b0f9 by xiexiaoqin

fix style and lower-threshold, perf code

parent d61946c8
...@@ -162,3 +162,7 @@ ...@@ -162,3 +162,7 @@
left: 0; left: 0;
bottom: 0; bottom: 0;
} }
.icon-color {
opacity: 0.4;
}
\ No newline at end of file
...@@ -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>
......
...@@ -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 = "";
that.data.dynamicList.map((item, index) => { this.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;
} }
}); });
} }
}); });
let setData = `dynamicList[${dataIndex1}].meetingLogDataList[${dataIndex2}].meetingLogResource.taskStatus`; const setData = `dynamicList[${dataIndex1}].meetingLogDataList[${dataIndex2}].meetingLogResource.taskStatus`;
that.setData({ this.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)}` });
}, },
} }
......
...@@ -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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment