Commit 3605b0f9 by xiexiaoqin

fix style and lower-threshold, perf code

parent d61946c8
......@@ -161,4 +161,8 @@
top: 0;
left: 0;
bottom: 0;
}
.icon-color {
opacity: 0.4;
}
\ No newline at end of file
......@@ -2,19 +2,19 @@
<import src="../../template/loading/loading.axml"/>
<view class="{{isStopBodyScroll ? 'scroll-lock' : ''}}" onTap="closeSwipe" onTouchStart="closeSwipe" onTouchMove="closeSwipe" onTouchEnd="closeSwipe">
<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">
<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="meetingtitle" catchTap="nextPage" data-item="{{item}}">
<view>
{{item.title}}
</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>
<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="dynamicTime" catchTap="nextPage" data-item="{{dynamicItem}}">
<text>{{dynamicItem.content}}</text>
......
......@@ -3,7 +3,7 @@ import {
meetingCollection,
updateMeetingTask
} from "../../api/request";
import { getCreateShowTime, uniqueObject } from "../../utils/utils";
import { getCreateShowTime } from "../../utils/utils";
import create from 'dd-store';
create.Component({
......@@ -14,8 +14,6 @@ create.Component({
dynamicList: [],
current: 1,
pages: 1,
size: 10,
noData: false,
loading: true
},
props: {},
......@@ -36,7 +34,7 @@ create.Component({
this.$store.closeActiveSwipe()
}
},
getPages(current) {
getPages(current, callBack) {
getDynamicList({
current,
size: 10
......@@ -47,12 +45,7 @@ create.Component({
})
return;
}
// 第一层日程数据处理
const dynamicList = res.data.data.records.map((item, index) => {
// 第二层日程下的动态数据处理
let meetingLogDataList = {};
let meetingLogDataListArr = [];
for (let i = 0; i < item.meetingLogDataList.length; i++) {
if (item.meetingLogDataList[i].creatorInfo) {
item.meetingLogDataList[i].creatorInfo = JSON.parse(
......@@ -82,12 +75,7 @@ create.Component({
}
}
}
return {
scheduleId: item.scheduleId,
title: item.title,
traceTime: item.traceTime,
meetingLogDataList: item.meetingLogDataList
};
return item
});
//第一页数据会重新请求需要替换
......@@ -106,6 +94,9 @@ create.Component({
current: res.data.data.current,
pages: res.data.data.pages,
});
if (callBack) {
callBack()
}
});
},
changeCollection(e) {
......@@ -117,7 +108,11 @@ create.Component({
//取消置顶
if (collection === "N") {
// 重新获取第一页的数据
this.getPages(1);
this.getPages(1, () => {
dd.showToast({
content: '取消成功'
})
});
} else {
//置顶
const dynamicList = this.data.dynamicList;
......@@ -127,6 +122,10 @@ create.Component({
dynamicList.unshift(replaceItem);
this.setData({
dynamicList: dynamicList
}, () => {
dd.showToast({
content: '置顶成功'
})
});
}
});
......@@ -137,8 +136,7 @@ create.Component({
}
},
onChangeTaskStatusOnList(e) {
let that = this;
let data = {
const data = {
groupId: e.groupId,
scheduleId: e.scheduleId,
resourceType: "task",
......@@ -152,25 +150,24 @@ create.Component({
if (res.data.code === 0) {
let dataIndex1 = "";
let dataIndex2 = "";
that.data.dynamicList.map((item, index) => {
this.data.dynamicList.forEach((item, index) => {
if (item.scheduleId === e.scheduleId) {
dataIndex1 = index;
item.meetingLogDataList.map((it, index2) => {
item.meetingLogDataList.forEach((it, index2) => {
if (it.meetingLogResource.id == e.id) {
dataIndex2 = index2;
}
});
}
});
let setData = `dynamicList[${dataIndex1}].meetingLogDataList[${dataIndex2}].meetingLogResource.taskStatus`;
that.setData({
const setData = `dynamicList[${dataIndex1}].meetingLogDataList[${dataIndex2}].meetingLogResource.taskStatus`;
this.setData({
[setData]: e.status
});
}
});
},
nextPage(event) {
console.log(event.currentTarget.dataset.item)
dd.navigateTo({ url: `./../meetingDetail/meetingDetail?scheduleItem=${JSON.stringify(event.currentTarget.dataset.item)}` });
},
}
......
......@@ -4,10 +4,6 @@ page {
background: #F6F6F6;
}
picker-view {
background: #F6F6F6;
}
view {
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