Skip to content

S
schedule
Commit 81c6ae3e by xiexiaoqin
Options

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

parents 6185c65a 565c283e
Showing with 522 additions and 240 deletions
app.json
{ {
"pages": [ "pages": [
"pages/index/index", "pages/index/index",
"pages/editMeeting/editMeeting",
"pages/participantsDetail/participantsDetail",
"pages/createMeeting/createMeeting", "pages/createMeeting/createMeeting",
"pages/outLookContact/outLookContact", "pages/outLookContact/outLookContact",
"pages/uploadFile/uploadFile", "pages/uploadFile/uploadFile",
...@@ -14,7 +16,6 @@ ...@@ -14,7 +16,6 @@
"pages/attendingSituation/attendingSituation", "pages/attendingSituation/attendingSituation",
"pages/remind/remind", "pages/remind/remind",
"pages/scheduleDetail/scheduleDetail", "pages/scheduleDetail/scheduleDetail",
"pages/participantsDetail/participantsDetail",
"pages/createOrEditSchedule/createOrEditSchedule", "pages/createOrEditSchedule/createOrEditSchedule",
"pages/attendeeList/attendeeList", "pages/attendeeList/attendeeList",
"pages/meetingDetail/meetingDetail" "pages/meetingDetail/meetingDetail"
......
components/list/list.js
...@@ -9,12 +9,12 @@ Component({ ...@@ -9,12 +9,12 @@ Component({
didMount() { didMount() {
console.log(this.props.comSelectListId) console.log(this.props.comSelectListId)
this.setData({ this.setData({
comSelectListId: this.props.comSelectListId || 0 comSelectListId: this.props.comSelectListId
}) })
}, },
didUpdate() { didUpdate() {
this.setData({ this.setData({
comSelectListId: this.props.comSelectListId || 0 comSelectListId: this.props.comSelectListId
}) })
}, },
didUnmount() { }, didUnmount() { },
......
components/selectPopup/selectPopup.acss 0 → 100755
.selectPopup {
background: rgba(0, 0, 0, 0.12);
position: fixed;
top: 0;
height: 100vh;
width: 100%;
}
.selectContent {
position: fixed;
bottom: 16rpx;
border-radius: 16rpx;
left: 16rpx;
right: 16rpx;
overflow: hidden;
}
.selectPopupItem {
background: #fff;
height: 114rpx;
line-height: 112rpx;
text-align: center;
font-family: PingFangSC-Regular;
font-size: 34rpx;
color: #1B263D;
border-bottom: 1px solid rgba(25, 31, 37, 0.12);
}
.selectPopupItem:last-child {
border-bottom: none;
}
.selectPopupCancel {
border-radius: 16rpx;
height: 112rpx;
background: #fff;
line-height: 112rpx;
text-align: center;
font-family: PingFangSC-Regular;
font-size: 34rpx;
color: #1B263D;
margin-top: 16rpx;
}
\ No newline at end of file
components/selectPopup/selectPopup.axml 0 → 100644
<view class="selectPopup" a:if="{{showSelectPopup}}" >
<view class="selectContent">
<view class="selectPopupList">
<view class="selectPopupItem" a:for="{{selectPopupList}}" data-item="{{item}}" catchTap="selectItem">
{{item.text}}
</view>
</view>
<view class="selectPopupCancel" catchTap="selectPopupCancel">
取消
</view>
</view>
</view>
\ No newline at end of file
components/selectPopup/selectPopup.js 0 → 100644
Component({
mixins: [],
data: {},
props: {},
didMount() {},
didUpdate() {},
didUnmount() {},
methods: {
selectPopupCancel() {
this.props.onSelectPopupCancel()
},
selectItem(event) {
this.props.onSelectPopup(event)
}
},
});
components/selectPopup/selectPopup.json 0 → 100644
{
"component": true
}
\ No newline at end of file
components/toast/toast.axml
<view> <view>
<view class="toast" a:if="{{showToast}}"> <view class="toast" a:if="{{showToast}}">
<text class="toastIcon iconfont iconcanjia3 "></text> <text class="toastIcon iconfont {{toastIcon}} "></text>
<text class="toasContent">回复成功</text> <text class="toasContent">{{title}}</text>
</view> </view>
</view> </view>
\ No newline at end of file
components/toast/toast.js
...@@ -3,10 +3,16 @@ Component({ ...@@ -3,10 +3,16 @@ Component({
data: { data: {
}, },
props: { props: {
showToast: '', showToast: false,
duration: '' duration: 1000,
title: '保存成功',
toastIcon: 'iconcanjia3'
}, },
didMount() { didMount() {
setTimeout(res => {
}, this.props.duration)
}, },
didUpdate(preProps, prevData) { didUpdate(preProps, prevData) {
}, },
......
pages/createMeeting/createMeeting.axml
...@@ -35,8 +35,7 @@ ...@@ -35,8 +35,7 @@
<view> <view>
<view class="timeText" catchTap="showPopup" data-type='time'> <view class="timeText" catchTap="showPopup" data-type='time'>
<text a:if="{{isAcrossDay}}"> <text a:if="{{isAcrossDay}}">
{{`${startTime.substring(5, 7)}月${startTime.substring(8, 10)}日 ${startTime.substring(11, 16)}`}} {{`${startTime.substring(5, 7)}月${startTime.substring(8, 10)}日 ${startTime.substring(11, 16)}`}} - {{`${endTime.substring(5, 7)}月${endTime.substring(8, 10)}日 ${endTime.substring(11, 16)}`}}
- {{`${endTime.substring(5, 7)}月${endTime.substring(8, 10)}日 ${endTime.substring(11, 16)}`}}
</text> </text>
<text a:else> <text a:else>
{{`${startTime.substring(5, 7)}月${startTime.substring(8, 10)}日 ${week} ${startTime.substring(11, 16)}- ${endTime.substring(11, 16)}`}} {{`${startTime.substring(5, 7)}月${startTime.substring(8, 10)}日 ${week} ${startTime.substring(11, 16)}- ${endTime.substring(11, 16)}`}}
...@@ -65,11 +64,11 @@ ...@@ -65,11 +64,11 @@
<view> <view>
{{participatorList.length}}位参会人 {{participatorList.length}}位参会人
</view> </view>
<view class="conflictStatus"> <view class="conflictStatus" a:if="{{conflictPeople.length}}">
3人会议安排冲突 {{conflictPeople.length}}人会议安排冲突
</view> </view>
</view> </view>
<view class="iconicon_open iconfont icon" style=" vertical-align: middle"></view> <view class="iconicon_open iconfont icon" style=" vertical-align: middle" catchTap="nextPage" data-nextPage="participantsDetail"></view>
</view> </view>
<view class="participatorListBottom"> <view class="participatorListBottom">
<view class="people" a:for="{{participatorList.length > 10 ? [...participatorList].splice(0, 11) : participatorList}}"> <view class="people" a:for="{{participatorList.length > 10 ? [...participatorList].splice(0, 11) : participatorList}}">
...@@ -78,7 +77,7 @@ ...@@ -78,7 +77,7 @@
<text <text
a:else>{{item.platform==="outlook" ? item.username.substring(0, 2) : item.username.substring(item.username.length-2, item.username.length)}} a:else>{{item.platform==="outlook" ? item.username.substring(0, 2) : item.username.substring(item.username.length-2, item.username.length)}}
</text> </text>
<view class="conflict iconicon_conflict iconfont"> <view class="conflict iconicon_conflict iconfont" a:if="{{conflictPeople.includes(item.userId)}}">
</view> </view>
</view> </view>
<view class="name">{{item.name}}</view> <view class="name">{{item.name}}</view>
......
pages/createMeeting/createMeeting.js
import { addSchedule } from '../../api/request.js' import { addSchedule, getUserScheduleInTime } from '../../api/request.js'
import { throttle } from './../../utils/utils.js' import { throttle } from './../../utils/utils.js'
import create from 'dd-store' import create from 'dd-store'
import exampleStore from '/stores/exampleStore' import exampleStore from '/stores/exampleStore'
...@@ -31,7 +31,6 @@ create.Page({ ...@@ -31,7 +31,6 @@ create.Page({
{ id: 1, text: '手动添加邮箱', imageUrl: '../../assests/emailContact.png' } { id: 1, text: '手动添加邮箱', imageUrl: '../../assests/emailContact.png' }
] ]
}, },
// show: true,
title: ``, title: ``,
repeatable: 0, repeatable: 0,
recurrenceModel: { model: 'no_repeat' }, recurrenceModel: { model: 'no_repeat' },
...@@ -45,7 +44,8 @@ create.Page({ ...@@ -45,7 +44,8 @@ create.Page({
meetingWayModel: null, meetingWayModel: null,
weekList: ['周日', '周一', '周二', '周三', '周四', '周五', '周六'], weekList: ['周日', '周一', '周二', '周三', '周四', '周五', '周六'],
week: '', week: '',
isAcrossDay: false isAcrossDay: false,
conflictPeople: []
}, },
showPop() { showPop() {
...@@ -71,6 +71,11 @@ create.Page({ ...@@ -71,6 +71,11 @@ create.Page({
}) })
this.reset() this.reset()
}, },
onShow() {
if (this.store.data.participatorList.length > 1) {
this.conflictPeople()
}
},
// 添加描述 // 添加描述
addRemark() { addRemark() {
let isShowRemark = !this.data.isShowRemark let isShowRemark = !this.data.isShowRemark
...@@ -107,7 +112,7 @@ create.Page({ ...@@ -107,7 +112,7 @@ create.Page({
this.store.data.participatorUserId = [] this.store.data.participatorUserId = []
this.store.data.locationName = '' this.store.data.locationName = ''
this.store.data.startTime = this.getTimes() this.store.data.startTime = this.getTimes()
this.store.data.endTime = this.getTimes(new Date(this.getTimes()).setMinutes(new Date(this.store.data.startTime).getMinutes() + 120)) this.store.data.endTime = this.getTimes(new Date(this.getTimes()).setMinutes(new Date(this.store.data.startTime).getMinutes() + 30))
this.update() this.update()
this.resetRepeatList() this.resetRepeatList()
this.acrossDay(this.store.data.startTime, this.store.data.endTime) this.acrossDay(this.store.data.startTime, this.store.data.endTime)
...@@ -118,6 +123,9 @@ create.Page({ ...@@ -118,6 +123,9 @@ create.Page({
case 'location': case 'location':
dd.navigateTo({ url: './../place/place' }) dd.navigateTo({ url: './../place/place' })
break break
case 'participantsDetail':
dd.navigateTo({ url: './../participantsDetail/participantsDetail' })
break
} }
}, },
// 所有的关闭操作 // 所有的关闭操作
...@@ -172,7 +180,7 @@ create.Page({ ...@@ -172,7 +180,7 @@ create.Page({
if (index === 2) { if (index === 2) {
value.recurrenceModel.weekDayList = [this.data.repeatWeek[new Date().getDay()]] value.recurrenceModel.weekDayList = [this.data.repeatWeek[new Date().getDay()]]
} else if (index === 4) { } else if (index === 4) {
value.recurrenceModel.daysOfMonth = this.store.data.startTime.replace(/\//g, "-").substring(8, 10) value.recurrenceModel.daysOfMonth = [this.store.data.startTime.replace(/\//g, "-").substring(8, 10)]
} }
} }
repeatList.push(value) repeatList.push(value)
...@@ -258,6 +266,8 @@ create.Page({ ...@@ -258,6 +266,8 @@ create.Page({
_that.store.data.participatorList = _that.setArrary(_that.store.data.participatorList) _that.store.data.participatorList = _that.setArrary(_that.store.data.participatorList)
_that.store.data.participatorUserId = [...new Set(_that.store.data.participatorUserId)] _that.store.data.participatorUserId = [...new Set(_that.store.data.participatorUserId)]
_that.update() _that.update()
_that.conflictPeople()
}, },
fail: function (err) { fail: function (err) {
} }
...@@ -295,6 +305,7 @@ create.Page({ ...@@ -295,6 +305,7 @@ create.Page({
this.setData({ this.setData({
popupShow: false popupShow: false
}) })
this.conflictPeople()
}, },
addSchedule() { addSchedule() {
let data = { let data = {
...@@ -352,16 +363,20 @@ create.Page({ ...@@ -352,16 +363,20 @@ create.Page({
userIds.push(value.userId) userIds.push(value.userId)
} }
let data = { let data = {
startTime: this.store.data.startTime, startTime: this.store.data.startTime.replace(/\//g, "-"),
endTime: this.store.data.endTime, endTime: this.store.data.endTime.replace(/\//g, "-"),
userIds: userIds userIds: userIds
} }
getUserScheduleInTime(data).then(res => { getUserScheduleInTime(data).then(res => {
let conflictPeople = []
for (let value in res.data.data) {
if (res.data.data[value].length > 0) {
conflictPeople.push(value)
}
}
this.setData({
conflictPeople: conflictPeople
})
}) })
// for (let value of this.store.data.participatorList) {
// if()
// }
} }
}); });
pages/editMeeting/editMeeting.acss
...@@ -232,33 +232,104 @@ input { ...@@ -232,33 +232,104 @@ input {
color: #BBBEC5; color: #BBBEC5;
} }
.save { .delMetting {
display: flex;
background: #FFFFFF;
border: 1rpx solid #DEDEDE;
border-radius: 48px;
height: 64rpx;
line-height: 64rpx;
color: #F25643;
justify-content: center;
width: 256rpx;
margin: 74rpx auto 32rpx;
}
.delMetting>.iconfont {
margin-right: 18rpx;
}
.footNav {
position: fixed; position: fixed;
bottom: 0; bottom: 0;
left: 0; left: 0;
right: 0; right: 0;
padding: 16rpx 32rpx; border-top: 1rpx solid rgba(25, 31, 37, 0.12);
background: #fff; box-shadow: 1rpx 1rpx 4rpx 0 rgba(0, 0, 0, 0.08);
box-shadow: 0 -2px 4px 0 rgba(0, 0, 0, 0.04); }
position: fixed;
bottom: 0; .originStaus, .participateStatus, .noParticipateStatus {
display: flex;
line-height: 92rpx;
font-family: PingFangSC-Medium;
font-size: 28rpx;
}
.originStaus>view, .participateStatus>view {
height: 92rpx;
line-height: 92rpx;
width: 49%;
text-align: center;
}
.originStaus>view>.iconfont {
margin-right: 12rpx;
color: #A9ACB4;
vertical-align: middle;
}
.line {
color: #E3E4E4;
}
.participateStatus .remind {
width: 580rpx;
}
.participateStatus .participate {
width: 168rpx;
} }
.button { .remind {
font-family: PingFangSC-Regular; font-family: PingFangSC-Regular;
width: 686rpx; font-size: 28rpx;
color: #1B263D;
}
.remindTime {
margin: 0 20rpx;
}
.participate>text {
margin-right: 10rpx;
color: #15BC83;
}
.noParticipateStatus {
font-family: PingFangSC-Medium;
font-size: 14px;
color: #F25643;
}
.noParticipateStatus {
justify-content: center;
}
.noParticipateStatus>text {
margin-right: 10rpx;
}
.footNavBottom {
border-top: 1rpx solid rgba(25, 31, 37, 0.12);
display: flex;
flex-direction: row-reverse;
height: 96rpx; height: 96rpx;
background: #4D88FF;
border-radius: 48rpx;
font-size: 34rpx;
color: #FFFFFF;
text-align: center;
line-height: 96rpx; line-height: 96rpx;
background: #fff;
color: #1B263D;
} }
/* .iconicon_add { .footNavBottom>.iconfont {
margin-left: -2rpx; margin-right: 70rpx;
text-align: left; font-size: 40rpx;
vertical-align: middle; }
font-size: 92rpx; \ No newline at end of file
} */
\ No newline at end of file
pages/editMeeting/editMeeting.axml
<view class="createMeeting"> <view class="hideDetail" a:if="{{false}}">
<view class="hideTitle">
设计分享会
</view>
<view class="hideTime">
设计分享会
</view>
<view class="hideIcon iconfont iconicon_expand">
</view>
</view>
<view class="editeMeeting" a:else="{{true}}">
<!-- title remark 标题 描述 --> <!-- title remark 标题 描述 -->
<view class="createTitle"> <view class="createTitle">
<view class="title"> <view class="title">
...@@ -7,7 +17,7 @@ ...@@ -7,7 +17,7 @@
</view> </view>
</view> </view>
<view class="remark" a:if="{{isShowRemark}}"> <view class="remark" a:if="{{isShowRemark}}">
<input placeholder-class="placeholder" placeholder="请添加描述" class="text" onInput="onInput" data-type="remark" /> <input placeholder-class="placeholder" placeholder="请添加描述" class="text" onInput="onInput" data-type="remark" value="{{remark}}" />
</view> </view>
</view> </view>
<!-- roomId locationName 地点 --> <!-- roomId locationName 地点 -->
...@@ -65,11 +75,11 @@ ...@@ -65,11 +75,11 @@
<view> <view>
{{participatorList.length}}位参会人 {{participatorList.length}}位参会人
</view> </view>
<view class="conflictStatus"> <view class="conflictStatus" a:if="{{conflictPeople.length}}">
3人会议安排冲突 {{conflictPeople.length}}人会议安排冲突
</view> </view>
</view> </view>
<view class="iconicon_open iconfont icon" style=" vertical-align: middle"></view> <view class="iconicon_open iconfont icon" style=" vertical-align: middle" catchTap="nextPage" data-nextPage="participantsDetail"></view>
</view> </view>
<view class="participatorListBottom"> <view class="participatorListBottom">
<view class="people" a:for="{{participatorList.length > 10 ? [...participatorList].splice(0, 11) : participatorList}}"> <view class="people" a:for="{{participatorList.length > 10 ? [...participatorList].splice(0, 11) : participatorList}}">
...@@ -78,7 +88,7 @@ ...@@ -78,7 +88,7 @@
<text <text
a:else>{{item.platform==="outlook" ? item.username.substring(0, 2) : item.username.substring(item.username.length-2, item.username.length)}} a:else>{{item.platform==="outlook" ? item.username.substring(0, 2) : item.username.substring(item.username.length-2, item.username.length)}}
</text> </text>
<view class="conflict iconicon_conflict iconfont"> <view class="conflict iconicon_conflict iconfont" a:if="{{conflictPeople.includes(item.userId)}}">
</view> </view>
</view> </view>
<view class="name">{{item.name}}</view> <view class="name">{{item.name}}</view>
...@@ -103,10 +113,12 @@ ...@@ -103,10 +113,12 @@
</view> </view>
</view> </view>
</view> </view>
<!-- 保存 --> <!-- 删除该会议 -->
<view class="save" onTap="addSchedule"> <view class="delMetting">
<view class="button"> <view class=" iconfont iconicon_close">
立即创建 </view>
<view>
删除该会议
</view> </view>
</view> </view>
<popup title="{{popupTitle}}" show="{{popupShow}}" mask="true" onClose="closePopup"> <popup title="{{popupTitle}}" show="{{popupShow}}" mask="true" onClose="closePopup">
...@@ -115,4 +127,23 @@ ...@@ -115,4 +127,23 @@
<list a:if="{{comType=='repeat' || comType=='meetingWayModel'}}" dataComList="{{comType=='repeat' ? comListData.repeatList : comListData.meetingWayList}}" onComSelectList="selectComList" comSelectListId="{{comType=='repeat' ? comListData.comSelectListId : comListData.meetingWayModelId}}" iconType="{{comListData.iconType}}"> <list a:if="{{comType=='repeat' || comType=='meetingWayModel'}}" dataComList="{{comType=='repeat' ? comListData.repeatList : comListData.meetingWayList}}" onComSelectList="selectComList" comSelectListId="{{comType=='repeat' ? comListData.comSelectListId : comListData.meetingWayModelId}}" iconType="{{comListData.iconType}}">
</list> </list>
</popup> </popup>
</view> </view>
\ No newline at end of file <!-- 底部导航栏 -->
<view class="footNav">
<view class="footNavTop">
<view class="originStaus"><view><text class="iconfont iconicon_share"></text><text>参加</text></view><text class="line">|</text><view><text class="iconfont iconicon_share"></text><text>不参加</text></view></view>
<!-- <view class="participateStatus"><view class="remind"><text class="iconfont iconicon_share"></text><text class="remindTime">提前15分钟提醒</text><text class="iconfont iconicon_share"></text></view><text class="line">|</text><view class="participate"><text class="iconfont iconicon_share"></text><text>参加</text></view></view> -->
<!-- <view class="noParticipateStatus">
<text class="iconfont iconicon_share"></text>
<text>不参加</text>
</view> -->
</view>
<view class="footNavBottom">
<view class="iconfont iconicon_share" onTap="uploadFile">
</view>
<view class="iconfont iconicon_task">
</view>
</view>
</view>
<toast showToast="{{showToast}}" onToastHidden=" onToastHidden"></toast>
<selectpopup showSelectPopup="{{conSelectPopupData.showSelectPopup}}" selectPopupList="{{conSelectPopupData.editSaveList}}" onSelectPopup="onSelectPopup" onSelectPopupCancel="onSelectPopupCancel"></selectpopup>
pages/editMeeting/editMeeting.js
import { addSchedule } from '../../api/request.js' import { getScheduleDetail, getUserScheduleInTime, uploadPermissions } from '../../api/request.js'
import { throttle } from './../../utils/utils.js' import { throttle } from './../../utils/utils.js'
import create from 'dd-store' import create from 'dd-store'
import exampleStore from '/stores/exampleStore' import exampleStore from '/stores/exampleStore'
...@@ -31,7 +31,15 @@ create.Page({ ...@@ -31,7 +31,15 @@ create.Page({
{ id: 1, text: '手动添加邮箱', imageUrl: '../../assests/emailContact.png' } { id: 1, text: '手动添加邮箱', imageUrl: '../../assests/emailContact.png' }
] ]
}, },
// show: true, // 传递给组件toast的所有数据
conToastData: {
showToast: false
},
// 传递给组件selectPopup 的数据
conSelectPopupData: {
showSelectPopup: true,
editSaveList: [{text: '仅接受此会议', id: 'only'},{text: '接受所有会议', id: 'all'}]
},
title: ``, title: ``,
repeatable: 0, repeatable: 0,
recurrenceModel: { model: 'no_repeat' }, recurrenceModel: { model: 'no_repeat' },
...@@ -45,7 +53,10 @@ create.Page({ ...@@ -45,7 +53,10 @@ create.Page({
meetingWayModel: null, meetingWayModel: null,
weekList: ['周日', '周一', '周二', '周三', '周四', '周五', '周六'], weekList: ['周日', '周一', '周二', '周三', '周四', '周五', '周六'],
week: '', week: '',
isAcrossDay: false conflictPeople: [],
isAcrossDay: false,
scheduleItem: '',
originalData: new Map()
}, },
showPop() { showPop() {
...@@ -62,14 +73,57 @@ create.Page({ ...@@ -62,14 +73,57 @@ create.Page({
console.log(data) console.log(data)
this.closePop(); this.closePop();
}, },
onLoad() { onLoad(event) {
dd.setNavigationBar({ dd.setNavigationBar({
title: `会议详情` title: `会议详情`
}) })
this.setData({ this.setData({
title: `${getApp().globalData.name}创建的会议` scheduleItem: JSON.parse(event.scheduleItem)
})
this.getDetail()
},
// 获取详情
getDetail() {
let data = {
id: this.data.scheduleItem.id,
scheduleTemplateId: this.data.scheduleItem.scheduleTemplateId,
planDate: this.data.scheduleItem.planDate
}
getScheduleDetail(data).then(res => {
if (res.data.code === 0) {
let participatorList = []
let repeatListMap = new Map()
for (let value of res.data.data.userList) {
participatorList.push(value.participator)
}
for (let item of this.data.comListData.repeatList) {
if (item.recurrenceModel.recurrenceModel !== 'weekly') {
repeatListMap.set(item.recurrenceModel.model, item.id)
}
}
// console.log(repeatListMap, 111)
this.setData({
'scheduleItem.id': res.data.data.id,
'comListData.comSelectListId': res.data.data.recurrenceModel.model === 'weekly' ? (res.data.data.recurrenceModel.weekDayList.length > 1 ? 3 : 2) : repeatListMap.get(res.data.data.recurrenceModel.model),
'comListData.meetingWayModelId': res.data.data.meetingWayModel === 'dingtalk' ? 2 : (res.data.data.meetingWayModel === 'zoom' ? 1 : 0),
repeatable: res.data.repeatable,
recurrenceModel: res.data.repeatable ? { model: res.data.data.recurrenceModel.model, daysOfMonth: res.data.data.recurrenceModel.daysOfMonth, interval: 1, initialTime: res.data.data.initialTime, terminateTime: res.data.data.terminateTime, weekDayList: res.data.data.weekDayList } : { model: 'no_repeat' },
originalData: res.data.data,
title: res.data.data.title,
remark: res.data.data.remark,
isShowRemark: res.data.data.remark ? true : false,
week: this.data.weekList[new Date(res.data.data.startTime.replace(/'-'/g, "\/")).getDay()]
})
this.store.data.locationName = res.data.data.location.locationName
this.store.data.roomId = res.data.data.meetingRoomId < 0 ? '' : res.data.data.meetingRoomId
this.store.data.startTime = res.data.data.startTime.replace(/'-'/g, "\/")
this.store.data.endTime = res.data.data.endTime.replace(/'-'/g, "\/")
this.store.data.participatorList = participatorList
this.update()
this.conflictPeople()
console.log(res.data.data)
}
}) })
this.reset()
}, },
// 添加描述 // 添加描述
addRemark() { addRemark() {
...@@ -118,6 +172,9 @@ create.Page({ ...@@ -118,6 +172,9 @@ create.Page({
case 'location': case 'location':
dd.navigateTo({ url: './../place/place' }) dd.navigateTo({ url: './../place/place' })
break break
case 'participantsDetail':
dd.navigateTo({ url: `./../participantsDetail/participantsDetail?scheduleItem=${JSON.stringify(this.data.scheduleItem)}` })
break
} }
}, },
// 所有的关闭操作 // 所有的关闭操作
...@@ -258,6 +315,7 @@ create.Page({ ...@@ -258,6 +315,7 @@ create.Page({
_that.store.data.participatorList = _that.setArrary(_that.store.data.participatorList) _that.store.data.participatorList = _that.setArrary(_that.store.data.participatorList)
_that.store.data.participatorUserId = [...new Set(_that.store.data.participatorUserId)] _that.store.data.participatorUserId = [...new Set(_that.store.data.participatorUserId)]
_that.update() _that.update()
}, },
fail: function (err) { fail: function (err) {
} }
...@@ -346,22 +404,80 @@ create.Page({ ...@@ -346,22 +404,80 @@ create.Page({
isAcrossDay: isAcrossDay isAcrossDay: isAcrossDay
}) })
}, },
// 人员冲突
conflictPeople() { conflictPeople() {
let userIds = [] let userIds = []
for (let value of this.store.data.participatorList) { for (let value of this.store.data.participatorList) {
userIds.push(value.userId) userIds.push(value.userId)
} }
let data = { let data = {
startTime: this.store.data.startTime, startTime: this.store.data.startTime.replace(/\//g, "-"),
endTime: this.store.data.endTime, endTime: this.store.data.endTime.replace(/\//g, "-"),
userIds: userIds userIds: userIds
} }
getUserScheduleInTime(data).then(res => { getUserScheduleInTime(data).then(res => {
let conflictPeople = []
for (let value in res.data.data) {
if (res.data.data[value].length > 1) {
conflictPeople.push(value)
}
}
this.setData({
conflictPeople: conflictPeople
})
})
},
// 文件上传
uploadFile() {
let data = {
ddUserId: getApp().globalData.userid,
type: 'add',
projectName: 'MING_MEETING'
}
uploadPermissions(data).then(res => {
if (res.data.code === 0) {
const _that = this
dd.uploadAttachmentToDingTalk({
image: { multiple: true, compress: true, max: 9, spaceId: res.data.data },
space: { spaceId: res.data.data, compress: true, isCopy: 1, max: 9 },
types: ["photo", "camera", "space"],
success: (res) => {
dd.navigateTo({ url: `./../uploadFile/uploadFile?scheduleItem=${JSON.stringify(_that.data.scheduleItem)}&upLoadInfo=${encodeURIComponent(JSON.stringify(res))}` })
},
fail: (err) => {
}
})
}
})
},
// toast 消失之后的回调
onToastHidden () {
},
// onSelectPopup 选择完的回调
onSelectPopup(event) {
console.log(event.currentTarget.dataset.item)
this.setData({
'conSelectPopupData.showSelectPopup': false
})
},
// onSelectPopupCancel 点击取消
onSelectPopupCancel() {
this.setData({
'conSelectPopupData.showSelectPopup': false
}) })
},
// 判断数据发生改变 发生改变
isChange(value) {
switch (value) {
case 'title':
// if()
break
}
// for (let value of this.store.data.participatorList) {
// if()
// }
} }
}); });
pages/editMeeting/editMeeting.json
...@@ -3,6 +3,8 @@ ...@@ -3,6 +3,8 @@
"popup": "../../components/popup/index", "popup": "../../components/popup/index",
"list": "../../components/list/list", "list": "../../components/list/list",
"hlist": "../../components/hList/hList", "hlist": "../../components/hList/hList",
"toast": "../../components/toast/toast",
"selectpopup": "../../components/selectPopup/selectPopup",
"meeting-time-picker": "../../components/meetingTimePicker/meetingTimePicker" "meeting-time-picker": "../../components/meetingTimePicker/meetingTimePicker"
} }
} }
\ No newline at end of file
pages/index/index.axml
<!--<mw-select></mw-select> --> <!--<mw-select></mw-select> -->
版本号：151 版本 版本号：151 版本
<view class="index"> <view class="index">
<view a:if="{{startPageOnLoad&&startPageOnShow}}"> <view a:if="{{startPageOnLoad&&startPageOnShow}}">
<scroll-view a:if="{{todayStr !== ''}}" scroll-y="{{true}}" upper-threshold="50" lower-threshold="50" onScrollToLower="lower" onScroll="onScroll" style="height: 100vh;" scroll-into-view="{{todayStr}}"> <scroll-view a:if="{{todayStr !== ''}}" scroll-y="{{true}}" upper-threshold="50" lower-threshold="50" onScrollToLower="lower" onScroll="onScroll" style="height: 100vh;" scroll-into-view="{{todayStr}}">
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
<text style="color: rgb(50, 150, 250)">{{item.value.day}}</text> <text style="color: rgb(50, 150, 250)">{{item.value.day}}</text>
</view> </view>
<view class="dataSchedule"> <view class="dataSchedule">
<!-- <view class="thisDayLine thisDayHavaMeeting" style="margin-bottom: 7.5rpx"></view> --> <!--<view class="thisDayLine thisDayHavaMeeting" style="margin-bottom: 7.5rpx"></view> -->
<view a:for="{{item.value.value}}" a:for-item="item2" data-item="{{item2}}" class="{{ item2.isBeOverdue ? 'overdue' : item2.confirmAttendance === 0 ? 'cancel' : '' }}" onTap="nextDetail"> <view a:for="{{item.value.value}}" a:for-item="item2" data-item="{{item2}}" class="{{ item2.isBeOverdue ? 'overdue' : item2.confirmAttendance === 0 ? 'cancel' : '' }}" onTap="nextDetail">
<view class="dataScheduleName"> <view class="dataScheduleName">
<text>{{item2.title}}{{item2.isfirstDayOrEndDay ? `（第${item2.isFewDays}天，共${item2.duration}天）` : '' }}</text> <text>{{item2.title}}{{item2.isfirstDayOrEndDay ? `（第${item2.isFewDays}天，共${item2.duration}天）` : '' }}</text>
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
<text>暂无日程安排，</text> <text>暂无日程安排，</text>
<text onTap="nextPage">创建日程</text> <text onTap="nextPage">创建日程</text>
</view> </view>
<!-- <view class="thisDayLine"></view> --> <!--<view class="thisDayLine"></view> -->
</view> </view>
</view> </view>
</block> </block>
...@@ -99,4 +99,4 @@ ...@@ -99,4 +99,4 @@
<text>快乐工作</text> <text>快乐工作</text>
</view> </view>
</view> </view>
</view> </view>
\ No newline at end of file
pages/index/index.js
...@@ -287,9 +287,8 @@ Page({ ...@@ -287,9 +287,8 @@ Page({
dd.navigateTo({ url: './../createMeeting/createMeeting' }) dd.navigateTo({ url: './../createMeeting/createMeeting' })
}, },
nextDetail: throttle(function (e) { nextDetail: throttle(function (e) {
console.log(11111111)
let item = e.target.dataset.item let item = e.target.dataset.item
dd.navigateTo({ url: `./../scheduleDetail/scheduleDetail?scheduleItem=${JSON.stringify(item)}` }) dd.navigateTo({ url: `./../editMeeting/editMeeting?scheduleItem=${JSON.stringify(item)}` })
}, 1000), }, 1000),
// nextPage: throttle(function (e) { // nextPage: throttle(function (e) {
// console.log(11111111) // console.log(11111111)
......
pages/index/index.json
{ {
"defaultTitle": "首页" "defaultTitle": "首页",
} "usingComponents": {
"popup": "../../components/popup/index",
"list": "../../components/list/list",
"hlist": "../../components/hList/hList",
"toast": "../../components/toast/toast",
"selectpopup": "../../components/selectPopup/selectPopup",
"meeting-time-picker": "../../components/meetingTimePicker/meetingTimePicker"
}
}
\ No newline at end of file
pages/participantsDetail/participantsDetail.acss
@import "../../font/iconfont.acss"; @import "../../assests/font/iconfont.acss";
page { page {
background: #f6f6f6; background: #f6f6f6;
font-family: PingFangSC-Regular; font-family: PingFangSC-Regular;
font-size: 30rpx; font-size: 34rpx;
color: #191F25; color: #191F25;
padding-bottom: 128rpx; padding-bottom: 128rpx;
} }
...@@ -17,30 +17,30 @@ page { ...@@ -17,30 +17,30 @@ page {
.headImg { .headImg {
margin-right: 24rpx; margin-right: 24rpx;
margin-top: 24rpx; margin-top: 16rpx;
width: 64rpx; width: 80rpx;
height: 64rpx; height: 80rpx;
background: #3296FA; background: #3296FA;
border-radius: 50%; border-radius: 50%;
color: white; color: white;
line-height: 64rpx; line-height: 80rpx;
text-align: center; text-align: center;
position: relative; position: relative;
} }
.conflict { .conflict {
line-height: 13px;
vertical-align: top;
width: 13px;
height: 13px;
position: absolute; position: absolute;
width: 11px; background: #fff;
height: 11px; bottom: 0rpx;
line-height: 11px; color: #FF943E;
text-align: center; font-size: 12px;
color: #fff; right: -3rpx;
border: 1rpx solid #fff;
background: #f25643;
bottom: 3rpx;
right: -2rpx;
border-radius: 50%; border-radius: 50%;
background: url(../../assests/chongtu.png) center / 100% 100% text-align: center;
} }
.headImg image { .headImg image {
...@@ -54,40 +54,36 @@ page { ...@@ -54,40 +54,36 @@ page {
width: 630rpx; width: 630rpx;
line-height: 112rpx; line-height: 112rpx;
height: 112rpx; height: 112rpx;
border-bottom: 1rpx solid rgba(25, 31, 37, 0.12); border-bottom: 1rpx solid #E3E4E4;
}
.list:last-child .info {
border: none;
} }
.close { .close {
position: absolute; position: absolute;
right: 32rpx; right: 32rpx;
color: #D8D8D8; color: #8E939D;
font-size: 0.3rem;
} }
.button { .addParticipants {
padding: 24rpx 32rpx; height: 100rpx;
position: fixed; line-height: 100rpx;
bottom: 0; border-top: 1rpx solid #E3E4E4;
display: flex; border-bottom: 1rpx solid #E3E4E4;
background: white; opacity: 0.56;
} line-height: 100rpx;
font-family: PingFangSC-Regular;
.button view { font-size: 28rpx;
width: 335rpx; color: #0A0A0A;
height: 90rpx;
border: 1px solid #3296FA;
border-radius: 48px;
text-align: center; text-align: center;
line-height: 90rpx; background: #fff;
font-size: 36rpx;
}
.add {
color: #0080FF;
margin-right: 16rpx;
} }
.button .save { .iconicon_add {
color: white; color: #8E939D;
background: #3296FA; vertical-align: middle;
border: 1px solid rgba(25, 31, 37, 0.12); margin-right: 10rpx;
} }
\ No newline at end of file
pages/participantsDetail/participantsDetail.axml
...@@ -3,19 +3,15 @@ ...@@ -3,19 +3,15 @@
<view class="headImg"> <view class="headImg">
<image a:if="{{!!item.headUrl}}" mode="scaleToFill" src="{{item.headUrl}}"/> <image a:if="{{!!item.headUrl}}" mode="scaleToFill" src="{{item.headUrl}}"/>
<text a:else>{{item.username.substring(0, 1)}}</text> <text a:else>{{item.username.substring(0, 1)}}</text>
<text a:if="{{conflictPeople.includes(item.userId)}}" class="conflict"></text> <text a:if="{{conflictPeople.includes(item.userId)}}" class="conflict iconicon_conflict iconfont"></text>
</view> </view>
<view class="info"> <view class="info">
<text class="name">{{item.username}}</text> <text class="name">{{item.username}}</text>
<text class="close iconshanchu-1 iconfont" a:if="{{!!scheduleItem?(organizer == permissions?(permissions!=item.userId):(permissions!=item.userId&&!requireUsers.includes(item.userId))):(permissions!=item.userId)}}" data-userId="{{item.userId}}" onTap="delParticipants"></text> <text class="close iconicon_close iconfont" data-userId="{{item.userId}}" onTap="delParticipants"></text>
</view> </view>
</view> </view>
<view class="button"> <view class="addParticipants" onTap="addParticipants">
<view class="add" onTap="addParticipants"> <text class="iconfont iconicon_add " ></text>
添加参会人 <text>添加参会人</text>
</view>
<view class="save" onTap="saveInfo">
完成
</view>
</view> </view>
</view> </view>
\ No newline at end of file
pages/participantsDetail/participantsDetail.js
...@@ -4,34 +4,15 @@ import { addSchedule, getUserScheduleInTime, getHomeUserSchedule } from '../../a ...@@ -4,34 +4,15 @@ import { addSchedule, getUserScheduleInTime, getHomeUserSchedule } from '../../a
create.Page({ create.Page({
store: exampleStore, store: exampleStore,
useAll: true, useAll: true,
time1: '',
time2: '',
data: { data: {
scheduleItem: '', scheduleItem: '',
requireUsers: [], conflictPeople: []
organizer: '',
permissions: '',
requireUsersInfo: []
}, },
onLoad(event) { onLoad(event) {
let permissions = getApp().globalData.userid
let scheduleItem = JSON.parse(event.scheduleItem)
let organizer = event.organizer
let requireUsers = JSON.parse(event.requireUsers)
let requireUsersInfo = JSON.parse(event.requireUsersInfo)
this.setData({
requireUsers: requireUsers,
organizer: organizer,
scheduleItem: scheduleItem,
time1: scheduleItem.startTime,
time2: scheduleItem.endTime,
permissions: permissions,
requireUsersInfo: requireUsersInfo
})
dd.setNavigationBar({ dd.setNavigationBar({
title: `参会人(${this.store.data.participatorList.length}人）` title: `参会人(${this.store.data.participatorList.length}人）`
}) })
this.conflict() this.conflictPeople()
}, },
// 保存信息 // 保存信息
saveInfo() { saveInfo() {
...@@ -44,18 +25,8 @@ create.Page({ ...@@ -44,18 +25,8 @@ create.Page({
const _that = this const _that = this
let require = [] let require = []
let select = [] let select = []
if (!this.data.scheduleItem || this.data.organizer === getApp().globalData.userid) { select = this.store.data.participatorUserId
select = this.store.data.participatorUserId require = [getApp().globalData.userid]
require = [getApp().globalData.userid]
select.forEach((item, index) => {
if (item.userId == getApp().globalData.userid) {
select.splice(index, 1)
}
})
} else {
select = [...this.store.data.participatorUserId]
require = [...this.data.requireUsers]
}
select = _that.selectedelRequired(require, select).pickedUsers select = _that.selectedelRequired(require, select).pickedUsers
dd.complexChoose({ dd.complexChoose({
title: "选择参会人", //标题 title: "选择参会人", //标题
...@@ -64,31 +35,19 @@ create.Page({ ...@@ -64,31 +35,19 @@ create.Page({
requiredUsers: require, //必选用户（不可取消选中状态） requiredUsers: require, //必选用户（不可取消选中状态）
responseUserOnly: true, //返回人，或者返回人和部门 responseUserOnly: true, //返回人，或者返回人和部门
success: function (res) { success: function (res) {
if (!_that.data.scheduleItem || _that.data.organizer === getApp().globalData.userid) { _that.store.data.participatorList = []
_that.store.data.participatorList = [] _that.store.data.participatorUserId = []
_that.store.data.participatorUserId = [] _that.store.data.participatorList.push({ userId: getApp().globalData.userid, username: getApp().globalData.name, headUrl: getApp().globalData.avatar, platform: 'dingtalk' })
_that.store.data.participatorList.push({ userId: getApp().globalData.userid, username: getApp().globalData.name, headUrl: getApp().globalData.avatar }) _that.store.data.participatorUserId.push(getApp().globalData.userid)
_that.store.data.participatorUserId.push(getApp().globalData.userid) res.users.forEach((item, index) => {
res.users.forEach((item, index) => { _that.store.data.participatorList.push({ userId: item.userId, username: item.name, headUrl: item.avatar, platform: 'dingtalk' })
_that.store.data.participatorList.push({ userId: item.userId, username: item.name, headUrl: item.avatar }) _that.store.data.participatorUserId.push(item.userId)
_that.store.data.participatorUserId.push(item.userId) })
})
} else {
_that.store.data.participatorList = []
_that.store.data.participatorUserId = []
_that.data.requireUsersInfo.forEach((item, index) => {
_that.store.data.participatorList.push({ userId: item.userId, username: item.username, headUrl: item.headUrl })
_that.store.data.participatorUserId.push(item.userId)
})
res.users.forEach((item, index) => {
_that.store.data.participatorList.push({ userId: item.userId, username: item.name, headUrl: item.avatar })
_that.store.data.participatorUserId.push(item.userId)
})
}
_that.store.data.participatorList = _that.setArrary(_that.store.data.participatorList) _that.store.data.participatorList = _that.setArrary(_that.store.data.participatorList)
_that.store.data.participatorUserId = [...new Set(_that.store.data.participatorUserId)] _that.store.data.participatorUserId = [...new Set(_that.store.data.participatorUserId)]
_that.conflict()
_that.update() _that.update()
_that.conflictPeople()
}, },
fail: function (err) { fail: function (err) {
} }
...@@ -114,7 +73,7 @@ create.Page({ ...@@ -114,7 +73,7 @@ create.Page({
dd.setNavigationBar({ dd.setNavigationBar({
title: `参会人(${this.store.data.participatorList.length}人）` title: `参会人(${this.store.data.participatorList.length}人）`
}) })
this.conflict() this.conflictPeople()
}, },
// 数组去重 // 数组去重
setArrary(arr, userId) { setArrary(arr, userId) {
...@@ -126,27 +85,26 @@ create.Page({ ...@@ -126,27 +85,26 @@ create.Page({
return Object.values(containt) return Object.values(containt)
}, },
// 会议冲突 // 会议冲突
conflict() { conflictPeople() {
this.store.data.conflictPeople = [] let userIds = []
for (let value of this.store.data.participatorList) {
userIds.push(value.userId)
}
let data = { let data = {
startTime: `${this.data.time1}`, startTime: this.store.data.startTime.replace(/\//g, "-"),
endTime: `${this.data.time2}`, endTime: this.store.data.endTime.replace(/\//g, "-"),
userIds: this.store.data.participatorUserId userIds: userIds
} }
getUserScheduleInTime(data).then(res => { getUserScheduleInTime(data).then(res => {
let conflictPeople = []
for (let value in res.data.data) { for (let value in res.data.data) {
if (!!this.data.scheduleItem) { if (res.data.data[value].length > 0) {
if (res.data.data[value].length > 1) { conflictPeople.push(value)
this.store.data.conflictPeople.push(value)
}
} else {
if (res.data.data[value].length > 0) {
this.store.data.conflictPeople.push(value)
}
} }
} }
this.update() this.setData({
conflictPeople: conflictPeople
})
}) })
}, },
// 已选用户去中去掉必选用户 // 已选用户去中去掉必选用户
......
pages/uploadFile/uploadFile.axml
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<view class="describe"> <view class="describe">
<textarea class="textarea" onInput="inputDes" placeholder="添加文件描述..." maxlength="-1" /> <textarea class="textarea" onInput="inputDes" placeholder="添加文件描述..." maxlength="-1" />
</view> </view>
<view class="fileList" a:for="{{upLoadInfo.data}}"> <view class="fileList" a:for="{{upLoadInfo.data}}" onTap="preview" data-file="{{item}}">
<view class="file"> <view class="file">
<view class="fileimage {{item.fileType==('png' || 'PNG'|| 'jpg' || 'svg' || 'jpeg' || 'JPG') ?'image': item.fileType}}"> <view class="fileimage {{item.fileType==('png' || 'PNG'|| 'jpg' || 'svg' || 'jpeg' || 'JPG') ?'image': item.fileType}}">
</view> </view>
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<text class="addText">继续添加</text> <text class="addText">继续添加</text>
</view> </view>
<view class="save"> <view class="save">
<view class="saveButton" onTap="save"> <view class="saveButton" onTap="saveUpload">
保存 保存
</view> </view>
</view> </view>
......
pages/uploadFile/uploadFile.js
...@@ -8,8 +8,7 @@ create.Page({ ...@@ -8,8 +8,7 @@ create.Page({
data: { data: {
scheduleItem: '', scheduleItem: '',
upLoadInfo: '', upLoadInfo: '',
descript: '', descript: ''
uploadSpaceId: ''
}, },
onLoad(event) { onLoad(event) {
let scheduleItem = JSON.parse(event.scheduleItem) let scheduleItem = JSON.parse(event.scheduleItem)
...@@ -44,51 +43,55 @@ create.Page({ ...@@ -44,51 +43,55 @@ create.Page({
}) })
}, },
add() { add() {
let data1 = { let data = {
ddUserId: getApp().globalData.userid, ddUserId: getApp().globalData.userid,
type: 'add', type: 'add',
projectName: 'MING_MEETING' projectName: 'MING_MEETING'
} }
uploadPermissions(data1).then(res => { uploadPermissions(data).then(res => {
this.setData({ if (res.data.code === 0) {
uploadSpaceId: res.data.data const _that = this
}) dd.uploadAttachmentToDingTalk({
const _that = this image: { multiple: true, compress: true, max: 9, spaceId: res.data.data },
dd.uploadAttachmentToDingTalk({ space: { spaceId: res.data.data, compress: true, isCopy: 1, max: 9 },
image: { multiple: true, compress: false, max: 9, spaceId: this.data.uploadSpaceId }, types: ["photo", "camera", "space"],
space: { spaceId: this.data.uploadSpaceId, max: 9 }, success: (res) => {
file: { spaceId: this.data.uploadSpaceId, max: 9 }, _that.data.upLoadInfo.data.push(...res.data)
types: ["photo", "camera", "space"],//PC端仅支持["photo","file","space"] _that.setData({
success: (res) => { upLoadInfo: _that.data.upLoadInfo
_that.data.upLoadInfo.data.push(...res.data) })
_that.setData({ },
upLoadInfo: _that.data.upLoadInfo fail: (err) => {
}) }
}, })
fail: (err) => { }
}
})
}) })
}, },
// 点击保存 // 文件预览
save() { preview(event) {
if (!!this.data.scheduleItem.id) { const _that = this
this.saveUpload(this.data.scheduleItem.id) let file = event.target.dataset.file
} else { let data = {
let getId = { ddUserId: getApp().globalData.userid,
scheduleTemplateId: this.data.scheduleItem.scheduleTemplateId, type: 'download',
planDate: this.data.scheduleItem.planDate, fileIds: file.fileId,
createModel: 'auto' projectName: 'MING_MEETING'
}
addSchedule(getId).then(success => {
this.saveUpload(success.data.data.id)
})
} }
previewPermissions(data).then(res => {
dd.previewFileInDingTalk({
corpId: dd.corpId,
spaceId: res.data.data,
fileId: file.fileId,
fileName: file.fileName,
fileSize: file.fileSize,
fileType: file.fileType
})
})
}, },
// 保存的接口 // 保存的接口
saveUpload: throttle(function (id) { saveUpload: throttle(function () {
let data = { let data = {
scheduleId: id, scheduleId: this.data.scheduleItem.id,
uploader: getApp().globalData.userid, uploader: getApp().globalData.userid,
uploaderInfo: JSON.stringify({ uploaderInfo: JSON.stringify({
userId: getApp().globalData.userid, userId: getApp().globalData.userid,
...@@ -100,6 +103,9 @@ create.Page({ ...@@ -100,6 +103,9 @@ create.Page({
descript: this.data.descript descript: this.data.descript
} }
saveFileInfo(data).then(res => { saveFileInfo(data).then(res => {
dd.alert({
content: JSON.stringify(data)
})
dd.navigateBack({ dd.navigateBack({
delta: 1 delta: 1
}) })
......
stores/exampleStore.js
...@@ -12,10 +12,8 @@ class Store { ...@@ -12,10 +12,8 @@ class Store {
} }
], // 参会人列表 ], // 参会人列表
locationName: '', locationName: '',
conflictPeople: [],
participatorUserId: [], // 参会人的userId participatorUserId: [], // 参会人的userId
userList: [], userList: [],
editList: [{ icon: 'icondingwei', text: '地点' }, { icon: 'iconhuiqiantixing', text: '提醒' }, { icon: 'iconchongfu', text: '重复' }, { icon: 'icondidianmiaoshu', text: '描述' }, { icon: 'iconshanchu', text: '删除' }],
aheadTimes: [], aheadTimes: [],
requireUserList: [], requireUserList: [],
roomId: '', roomId: '',
......
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