Skip to content

S
schedule
Commit 2591e215 by liang ce
Options

Merge branch 'dev' of http://gitlab.roboming.com/fengzhaoyu/schedule into dev

parents f48e7316 3605b0f9
Showing with 136 additions and 73 deletions
PageComponents/myDynamic/myDynamic.acss
......@@ -161,4 +161,8 @@
top: 0;
left: 0;
bottom: 0;
}
.icon-color {
opacity: 0.4;
}
\ No newline at end of file
PageComponents/myDynamic/myDynamic.axml
......@@ -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>
......
PageComponents/myDynamic/myDynamic.js
......@@ -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)}` });
},
}
......
app.acss
@import "./assests/font/iconfont.acss";
@import "./fonts/iconfont.acss";
page {
font-family: PingFangSC-Regular;
background: #F6F6F6;
}
picker-view {
background: #F6F6F6;
}
view {
box-sizing: border-box;
}
\ No newline at end of file
app.json
......@@ -12,5 +12,8 @@
"pages/participantsDetail/participantsDetail",
"pages/applicationDetails/applicationDetails",
"pages/attendeeList/attendeeList"
]
}
],
"window": {
"allowsBounceVertical": "NO"
}
}
\ No newline at end of file
components/selectArea/selectArea.acss
@import "../../assests/font/iconfont.acss";
/* 区域选择样式 */
.lableTreeBox{
.lableTreeBox {
position: fixed;
left: 0;
top: 0;
width: 100%;
height: 100%;
background: rgba(0,0,0,.15);
background: rgba(0, 0, 0, .15);
display: flex;
align-items: flex-end;
z-index: 999;
}
.lableTreeContent{
.lableTreeContent {
width: 100%;
height: 527rpx;
background: #FFFFFF;
box-shadow: 0 -2rpx 20rpx 0 rgba(25,31,37,0.12);
box-shadow: 0 -2rpx 20rpx 0 rgba(25, 31, 37, 0.12);
border-radius: 19rpx 19rpx 0px 0px;
}
.lableTreeHeader{
.lableTreeHeader {
width: 100%;
height: 104rpx;
padding: 0 32rpx;
......@@ -26,36 +28,44 @@
font-size: 34rpx;
display: flex;
box-sizing: border-box;
border-bottom: 1px solid rgba(25,31,37,0.12);
border-bottom: 1px solid rgba(25, 31, 37, 0.12);
}
.lableTreeHeader>view{
.lableTreeHeader>view {
flex: 1;
height: 104rpx;
}
.lableTreeHeader>view:nth-of-type(1) {
color: #191F25;
}
.lableTreeHeader>view:nth-of-type(2) {
color: #3296FA;
text-align: right
}
.lableTreeModal{
.lableTreeModal {
width: 100%;
padding-right: 32rpx;
box-sizing: border-box;
}
/* tree样式 */
.treeUl {
position: relative;
padding-left: 32rpx;
display: block;
box-sizing: border-box;
}
.treeLi {
display: block;
font-size: 28rpx;
line-height: 70rpx;
}
.treeName {
height: 70rpx;
font-size: 28rpx;
......@@ -63,63 +73,78 @@
width: 100%;
display: flex;
}
.labelIsShow {
width: 24rpx;
margin-right: 24rpx;
}
.treeLabel {
flex: 1;
display: flex;
padding-right: 32rpx;
box-sizing: border-box;
}
.treeLabel > view:nth-of-type(1) {
.treeLabel>view:nth-of-type(1) {
flex: 1;
}
.lableTreeChecked {
background: rgba(25,31,37,0.05);
background: rgba(25, 31, 37, 0.05);
border-radius: 4rpx;
}
/* icon */
.labelIsShow .iconsanjiao{
.labelIsShow .iconsanjiao {
font-size: 20rpx;
color: #D8D8D8;
}
.labelIsShow .iconsanjiao1{
.labelIsShow .iconsanjiao1 {
font-size: 20rpx;
color: #D8D8D8;
}
.labelIsShow .iconxuanzhong1{
.labelIsShow .iconxuanzhong1 {
font-size: 32rpx;
color: #3296FA;
}
.treeLabel .iconchengshi-{
.treeLabel .iconchengshi- {
font-size: 24rpx;
margin-right: 16rpx;
color: #191F25;
}
.treeLabel .iconjiangzhu1{
.treeLabel .iconjiangzhu1 {
font-size: 24rpx;
margin-right: 16rpx;
color: #191F25;
}
.treeLabel .iconlouceng-{
.treeLabel .iconlouceng- {
font-size: 24rpx;
margin-right: 16rpx;
color: #191F25;
margin-left: 8rpx;
}
.treeLabel .iconjianzhu1 {
font-size: 24rpx;
margin-right: 16rpx;
color: #191F25;
}
.labelIsShow{
.labelIsShow {
padding-left: 4rpx;
}
.cancelSelectAre{
.cancelSelectAre {
font-size: 32rpx;
}
.sureSelectAre{
.sureSelectAre {
font-size: 32rpx;
}
\ No newline at end of file
components/taskList/taskList.acss
......@@ -37,4 +37,5 @@
top: 16rpx;
line-height: 48rpx;
overflow: hidden;
font-size: 24rpx;
}
\ No newline at end of file
components/toast/toast.acss
@import "../../assests/font/iconfont.acss";
.toast {
width: 188rpx;
height: 60rpx;
......@@ -10,6 +9,7 @@
position: fixed;
top: 400rpx;
left: 50%;
z-index: 102;
margin-left: -94rpx;
vertical-align: top;
}
......
pages/createMeeting/createMeeting.acss
@import "../../assests/font/iconfont.acss";
page {
background: #fff;
font-family: PingFangSC-Regular;
......@@ -213,7 +212,6 @@ input {
right: 0;
padding: 32rpx;
background: #fff;
box-shadow: 0 -2px 4px 0 rgba(0, 0, 0, 0.04);
position: fixed;
bottom: 0;
}
......@@ -250,4 +248,12 @@ input {
vertical-align: top;
width: 100%;
height: 100%;
}
.iconicon_description1 {
color: rgba(10, 10, 10, 0.4)
}
.iconicon_repeat1 {
color: rgba(10, 10, 10, 0.4)
}
\ No newline at end of file
pages/createMeeting/createMeeting.axml
......@@ -46,7 +46,7 @@
{{comListData.repeatList[comListData.comSelectListId].text}}重复
</view>
</view>
<view class="icon iconfont iconicon_open " catchTap="showPopup" data-type='repeat' a:if="{{comListData.comSelectListId == 0}}">
<view class="icon iconfont iconicon_repeat1 " catchTap="showPopup" data-type='repeat' a:if="{{comListData.comSelectListId == 0}}">
</view>
</view>
</view>
......
pages/createMeeting/createMeeting.js
......@@ -14,7 +14,7 @@ create.Page({
{ id: 4, text: '每月', icon: '', repeatable: 1, recurrenceModel: { model: 'absoluteMonthly', daysOfMonth: ['23'], interval: 1, initialTime: `2020-03-23`, terminateTime: `2022-03-23`, weekDayList: null } }
],
meetingWayList: [
{ id: 0, text: 'Webex meeting', imageUrl: '../../assests/Webex.png', meetingWayModel: { model: 'webex' } },
// { id: 0, text: 'Webex meeting', imageUrl: '../../assests/Webex.png', meetingWayModel: { model: 'webex' } },
{ id: 1, text: 'Zoom Meeting', imageUrl: '../../assests/Zoom.png', meetingWayModel: { model: 'zoom' } },
{ id: 2, text: '钉钉', imageUrl: '../../assests/dingding.png', meetingWayModel: { model: 'dingtalk' } }
],
......@@ -193,7 +193,7 @@ create.Page({
}
this.setData({
'comListData.repeatList': repeatList,
week: this.data.weekList[new Date().getDay()]
week: this.data.weekList[new Date(this.$store.data.startTime.replace(/\//g, "-")).getDay()]
})
},
......
pages/index/index.js
......@@ -28,7 +28,7 @@ create.Page({
let title = "动态";
switch (e.currentTarget.dataset.tabbar) {
case '0':
title = '动态180';
title = '动态181';
break;
case "1":
title = "日程";
......
pages/meetingDetail/meetingDetail.acss
......@@ -49,12 +49,14 @@ page {
.compose-column .title {
color: rgba(27, 38, 61, 1);
font-size: 32rpx;
font-family: PingFangSC-Medium;
}
.compose-column .title>text {
color: rgba(25, 31, 37, 0.4);
font-size: 28rpx;
margin-left: 32rpx;
margin-left: 16rpx;
font-family: PingFangSC-Regular;
}
.checkbox {
......@@ -576,4 +578,8 @@ input {
text-align: center;
background: url(../../assests/loading.gif) center / 100% 100%;
vertical-align: middle;
}
.iconicon_repeat1 {
color: rgba(10, 10, 10, 0.4)
}
\ No newline at end of file
pages/meetingDetail/meetingDetail.axml
......@@ -48,7 +48,7 @@
<view class="hasplace" onTap="nextPage" data-nextPage="location" a:else>
{{$data.locationName}}
</view>
<view class=" icon iconfont iconicon_close close" a:if="{{!!$data.locationName}}" data-close="location" catchTap="close">
<view class=" icon iconfont iconicon_close close" a:if="{{!!$data.locationName&&(currentPeople == organizer)}}" data-close="location" catchTap="close">
</view>
</view>
</view>
......@@ -73,7 +73,7 @@
{{comListData.repeatList[comListData.comSelectListId].text}}重复
</view>
</view>
<view class="icon iconfont iconicon_open" catchTap="showPopup" data-type='repeat' a:if="{{comListData.comSelectListId == 0}}">
<view class="icon iconfont iconicon_repeat1" catchTap="showPopup" data-type='repeat' a:if="{{comListData.comSelectListId == 0}}">
</view>
</view>
</view>
......@@ -132,7 +132,7 @@
<view class="hasWay" a:else catchTap="showPopup" data-type='meetingWayModel'>
{{comListData.meetingWayList[comListData.meetingWayModelId].text}}
</view>
<view class=" icon iconfont iconicon_close close" a:if="{{comListData.meetingWayModelId !== null}}" data-close="meetingWayModel" catchTap="close">
<view class=" icon iconfont iconicon_close close" a:if="{{comListData.meetingWayModelId !== null&&(currentPeople == organizer)}}" data-close="meetingWayModel" catchTap="close">
</view>
</view>
</view>
......@@ -144,7 +144,7 @@
</view>
<!-- 底部导航栏 -->
<view class="footNav">
<view class="footNavTop" a:if="{{!isExpand}}">
<view class="footNavTop" a:if="{{!isExpand&&$data.participatorList.length>1}}">
<!-- 待定状态 -->
<view class="originStaus" a:if="{{confirmAttendance === -9}}">
<view catchTap="participate">
......
pages/meetingDetail/meetingDetail.js
......@@ -30,7 +30,7 @@ create.Page({
{ id: 4, text: '每月', icon: '', repeatable: 1, recurrenceModel: { model: 'absoluteMonthly', daysOfMonth: ['23'], interval: 1, initialTime: `2020-03-23`, terminateTime: `2022-03-23`, weekDayList: null } }
],
meetingWayList: [
{ id: 0, text: 'Webex meeting', imageUrl: '../../assests/Webex.png', meetingWayModel: { model: 'webex' } },
// { id: 0, text: 'Webex meeting', imageUrl: '../../assests/Webex.png', meetingWayModel: { model: 'webex' } },
{ id: 1, text: 'Zoom Meeting', imageUrl: '../../assests/Zoom.png', meetingWayModel: { model: 'zoom' } },
{ id: 2, text: '钉钉', imageUrl: '../../assests/dingding.png', meetingWayModel: { model: 'dingtalk' } }
],
......@@ -117,6 +117,10 @@ create.Page({
}, 100)
if (this.store.data.isNeedReloadList) {
this.reload(this.data.scheduleItem.id);
this.setData({
'conToastData.showToast': true,
'conToastData.title': '保存成功',
})
}
},
onLoad(event) {
......@@ -173,7 +177,7 @@ create.Page({
}
}
this.setData({
confirmAttendance: res.data.data.confirmAttendance,
confirmAttendance: res.data.data.confirmAttendance === null ? -9 : res.data.data.confirmAttendance,
organizer: res.data.data.organizer,
'comListData.meetingWayModelId': res.data.data.meetingWayModel.model === null ? null : (res.data.data.meetingWayModel.model === 'dingtalk' ? 2 : (res.data.data.meetingWayModel.model === 'zoom' ? 1 : 0)),
// 'scheduleItem.id': res.data.data.id,
......@@ -390,7 +394,7 @@ create.Page({
}
this.setData({
'comListData.repeatList': repeatList,
week: this.data.weekList[new Date().getDay()]
week: this.data.weekList[new Date(this.$store.data.startTime.replace(/\//g, "-")).getDay()]
})
},
......@@ -784,6 +788,9 @@ create.Page({
this.$store.data.startTime = this.$store.data.originalData.startTime.replace(/'-'/g, '/')
this.$store.data.endTime = this.$store.data.originalData.endTime.replace(/'-'/g, '/')
this.update()
this.setData({
week: this.data.weekList[new Date(this.$store.data.originalData.startTime).getDay()],
})
},
// 重置地点
reSetLocation() {
......@@ -989,6 +996,9 @@ create.Page({
this.$store.data.startTime = this.$store.data.originalData.startTime.replace(/'-'/g, '/')
this.$store.data.endTime = this.$store.data.originalData.endTime.replace(/'-'/g, '/')
this.update()
this.setData({
week: this.data.weekList[new Date(this.$store.data.originalData.startTime.replace(/-/g, "/")).getDay()],
})
}).then(res => {
this.$store.data.originalData.startTime = this.$store.data.startTime.replace(/\//g, "-")
this.$store.data.originalData.endTime = this.$store.data.endTime.replace(/\//g, "-")
......@@ -1255,6 +1265,10 @@ create.Page({
console.log(this.store.data.isNeedReloadList)
if (this.store.data.isNeedReloadList) {
this.reload(this.data.scheduleItem.id);
this.setData({
'conToastData.showToast': true,
'conToastData.title': '编辑成功',
})
}
}, 500)
}
......@@ -1422,6 +1436,10 @@ create.Page({
if (res.data.code == 0) {
this.reload(this.data.scheduleItem.id);
this.closePop();
this.setData({
'conToastData.showToast': true,
'conToastData.title': '保存成功',
})
//重置
this.store.data.currentTask = {};
this.update();
......
pages/outLookContact/outLookContact.acss
@import "../../assests/font/iconfont.acss";
page {
background: #fff;
}
......@@ -49,7 +48,7 @@ input {
.contactImage {
position: relative;
color: #fff;
font-size: 28rpx;
font-size: 30rpx;
height: 80rpx;
line-height: 80rpx;
text-align: center;
......
pages/participantsDetail/participantsDetail.acss
@import "../../assests/font/iconfont.acss";
page {
background: #f6f6f6;
background: #fff;
font-family: PingFangSC-Regular;
font-size: 34rpx;
color: #191F25;
......
pages/place/place.acss
@import "../../assests/font/iconfont.acss";
page {
background: #f6f6f6;
font-family: PingFangSC-Regular;
......
stores/exampleStore.js
class Store {
data = {
locationName: '',
participatorList: [],
participatorUserId: [], // 参会人的userId
roomId: '',
startTime: '',
......
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