Skip to content

S
schedule
Commit c3605a4a by liang ce
Options

Merge branch 'dev' into release/1.0.0

parents d264ef4e 19646474
Showing with 103 additions and 72 deletions
components/fileList/fileList.axml
...@@ -12,7 +12,8 @@ ...@@ -12,7 +12,8 @@
<view a:if="{{isCanDelete}}" class="iconfont iconicon_noAgreed1" catchTap="removeFile" data-id="{{item.fileId}}"></view> <view a:if="{{isCanDelete}}" class="iconfont iconicon_noAgreed1" catchTap="removeFile" data-id="{{item.fileId}}"></view>
</view> </view>
</view> </view>
<view class="btns-pop" a:if="{{fileView.id == logId && (organizer === currentPeople ? true : currentPeople === fileView.creatorId)}}"> <!-- && (organizer === currentPeople ? true : currentPeople === fileView.creatorId) -->
<view class="btns-pop" a:if="{{fileView.id == logId}}">
<view class="edit" catchTap="updateFile" data-fileView="{{fileView}}"> <view class="edit" catchTap="updateFile" data-fileView="{{fileView}}">
编辑 编辑
</view> </view>
......
components/relatedApp/relatedApp.js
...@@ -26,7 +26,11 @@ create.Component({ ...@@ -26,7 +26,11 @@ create.Component({
didUnmount() {}, didUnmount() {},
methods: { methods: {
getData() { getData() {
getThirdUserPlatForm().then(res => { let data = {
platForm: "",
ddUserId: getApp().globalData.userid
};
getThirdUserPlatForm(data).then(res => {
let relatedAppPlatformList = []; let relatedAppPlatformList = [];
res.data.data.forEach(item => { res.data.data.forEach(item => {
relatedAppPlatformList.push(item.platform); relatedAppPlatformList.push(item.platform);
......
pages/appDetails/appDetails.axml
...@@ -46,11 +46,17 @@ ...@@ -46,11 +46,17 @@
关联成功 关联成功
</view> </view>
</view> </view>
<view a:else> <view a:elif="{{bindStatus==='fail'}}">
<image class="fix-img-width-fix" mode="scaleToFill" src="./../../assests/bindFail.png"/> <image class="fix-img-width-fix" mode="scaleToFill" src="./../../assests/bindFail.png"/>
<view> <view>
关联失败 关联失败
</view> </view>
</view> </view>
<view a:else>
<image class="fix-img-width-fix" mode="scaleToFill" src="./../../assests/bindFail.png"/>
<view>
账户已关联
</view>
</view>
</view> </view>
<selectpopup showSelectPopup="{{showSelectPopup}}" selectPopupList="{{selectPopupList}}" onSelectPopup="onSelectPopup" onSelectPopupCancel="onSelectPopupCancel"></selectpopup> <selectpopup showSelectPopup="{{showSelectPopup}}" selectPopupList="{{selectPopupList}}" onSelectPopup="onSelectPopup" onSelectPopupCancel="onSelectPopupCancel"></selectpopup>
\ No newline at end of file
pages/appDetails/appDetails.js
...@@ -47,12 +47,28 @@ create.Page({ ...@@ -47,12 +47,28 @@ create.Page({
clearInterval(interval); clearInterval(interval);
} }
requestNum++; requestNum++;
getThirdUserPlatForm().then(res => { let data = {
let relatedAppPlatformList = []; platForm: this.data.platform,
res.data.data.forEach(item => { ddUserId: getApp().globalData.userid
if (item.platform === this.data.platform) { };
getThirdUserPlatForm(data).then(res => {
console.log(JSON.stringify(res));
console.log(res.data.msg === "当前账号已被其他账号绑定！");
if (res.data.msg === "当前账号已被其他账号绑定！") {
this.setData({
isBind: false,
bindStatus: "binded"
});
setTimeout(() => {
that.setData({
isLoading: false
});
}, 10000);
clearInterval(interval);
} else if (res.data.data) {
if (res.data.data.platform === this.data.platform) {
this.setData({ this.setData({
name: item.userName, name: res.data.data.userName,
isBind: true, isBind: true,
bindStatus: "success" bindStatus: "success"
}); });
...@@ -65,7 +81,7 @@ create.Page({ ...@@ -65,7 +81,7 @@ create.Page({
this.$store.data.relatedAppNeedUpdate = true; this.$store.data.relatedAppNeedUpdate = true;
this.update(); this.update();
} }
}); }
}); });
}, 1000); }, 1000);
}, },
......
pages/index/index.js
...@@ -810,7 +810,7 @@ create.Page({ ...@@ -810,7 +810,7 @@ create.Page({
maxClickCount--; maxClickCount--;
if (maxClickCount == 0) { if (maxClickCount == 0) {
dd.alert({ dd.alert({
content: "0.0.12" content: "0.0.13"
}); });
maxClickCount = 5; maxClickCount = 5;
} }
......
pages/meetingDetail/meetingDetail.acss
...@@ -529,7 +529,6 @@ input { ...@@ -529,7 +529,6 @@ input {
} }
.affair-placeholder { .affair-placeholder {
border-top: 1px solid rgba(239, 242, 245, 1);
padding-top: 168rpx; padding-top: 168rpx;
text-align: center; text-align: center;
width: 600rpx; width: 600rpx;
......
pages/meetingDetail/meetingDetail.axml
...@@ -224,7 +224,7 @@ ...@@ -224,7 +224,7 @@
<view class="affair-list {{isExpand? '' : 'affair-list-margin-top'}} {{!isExpand&&$data.participatorList.length>1 ? 'addPadding' : ''}}" onTap="hideFileOperate"> <view class="affair-list {{isExpand? '' : 'affair-list-margin-top'}} {{!isExpand&&$data.participatorList.length>1 ? 'addPadding' : ''}}" onTap="hideFileOperate">
<view a:if="{{!isExpand}}" class="affair-list-title">会议动态</view> <view a:if="{{!isExpand}}" class="affair-list-title">会议动态</view>
<block a:if="{{!affairLoading}}"> <block a:if="{{!affairLoading}}">
<block a:for="{{affairList}}" key="{{item.id}}"> <block a:if="{{affairList && affairList.length > 0}}" a:for="{{affairList}}" key="{{item.id}}">
<view a:if="{{item.category == '3' && item.taskViewList && item.taskViewList.length > 0}}" class='compose-column'> <view a:if="{{item.category == '3' && item.taskViewList && item.taskViewList.length > 0}}" class='compose-column'>
<view class="avater task-avater"> <view class="avater task-avater">
<text class="iconfont iconicon_task1"></text> <text class="iconfont iconicon_task1"></text>
...@@ -245,10 +245,10 @@ ...@@ -245,10 +245,10 @@
</view> </view>
<view a:if="{{item.content && ((item.category == 1 || item.taskViewList && item.taskViewList.length > 0) || ( item.fileView && item.fileView.fileInfos && item.fileView.fileInfos.length > 0 ))}}" class='simple-column'>{{item.content}} {{item.createTime}}</view> <view a:if="{{item.content && ((item.category == 1 || item.taskViewList && item.taskViewList.length > 0) || ( item.fileView && item.fileView.fileInfos && item.fileView.fileInfos.length > 0 ))}}" class='simple-column'>{{item.content}} {{item.createTime}}</view>
</block> </block>
<view class="loading-more" onTap="loadAffairMore" a:if="{{current < pages}}">点击加载更多动态...</view> <view class="affair-placeholder" a:if="{{!affairList || affairList.length == 0}}">
<view class="affair-placeholder" a:if="{{affairList.length == 1 && affairList[0].logType == 'create_schedule'}}">
<template is="affair-placeholder" data="{{title: '添加文件', tip: '我们不开无准备的会，快来上传会议文件吧。'}}"/> <template is="affair-placeholder" data="{{title: '添加文件', tip: '我们不开无准备的会，快来上传会议文件吧。'}}"/>
</view> </view>
<view class="loading-more" onTap="loadAffairMore" a:if="{{current < pages}}">点击加载更多动态...</view>
</block> </block>
<view a:else></view> <view a:else></view>
<popup a:if="{{popupShow}}" title="{{popupTitle}}" show="{{popupShow}}" mask="true" onClose="closePopup"> <popup a:if="{{popupShow}}" title="{{popupTitle}}" show="{{popupShow}}" mask="true" onClose="closePopup">
......
pages/meetingRoomList/meetingRoomList.axml
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<view class="iconfont iconicon_open" onTap="selectSearchTime"></view> <view class="iconfont iconicon_open" onTap="selectSearchTime"></view>
</view> </view>
</view> </view>
<view class="roomScrollView" style="{{canScroll ? '': 'overflow:hidden'}}"> <scroll-view scroll-y="true" class="roomScrollView" disable-scroll="{{!canScroll}}">
<view class="reserveMeeting"> <view class="reserveMeeting">
<view class="meetingRoomContent" a:for="{{reserveRoomList}}" data-roomid="{{item.meetingRoomId}}" data-roomname="{{item.name}}" onTap="changeRoomTime"> <view class="meetingRoomContent" a:for="{{reserveRoomList}}" data-roomid="{{item.meetingRoomId}}" data-roomname="{{item.name}}" onTap="changeRoomTime">
<view class="roomMessage"> <view class="roomMessage">
...@@ -52,67 +52,67 @@ ...@@ -52,67 +52,67 @@
<view class="noRoomTip">当前暂无会议室</view> <view class="noRoomTip">当前暂无会议室</view>
</view> </view>
</view> </view>
<view> </scroll-view>
<popup show="{{isShowModal}}" onClose="onCancel" position="bottom"> <popup show="{{isShowModal}}" onClose="onCancel" position="bottom">
<view a:if="{{!isShowCalendar}}" class="modalContent"> <view a:if="{{!isShowCalendar}}" class="modalContent">
<view class="modalHeader"> <view class="modalHeader">
<text onTap="onDetermine">确定</text> <text onTap="onDetermine">确定</text>
</view>
<view class="modalTimeSlot">
<text a:if="{{!modalFooter.startTime || !modalFooter.endTime}}">请选择会议时间</text>
<text a:if="{{modalFooter.startTime && modalFooter.endTime}}">{{modalFooter.startTime}}至{{modalFooter.isOneDay ? modalFooter.endTime.substr(11,16):modalFooter.endTime}} 共{{modalFooter.allMinutes}}分钟</text>
</view>
<view class="changeDay">
<view class="{{dataNum == '0' ? 'dataNumSelected' : ''}}" onTap="chooseDate" data-num="0">
<view>{{TimeSlot.todayTime.split('/')[1]}}月{{TimeSlot.todayTime.split('/')[2]}}日</view>
<view>今天</view>
</view>
<view class="{{dataNum == '1' ? 'dataNumSelected' : ''}}" onTap="chooseDate" data-num="1">
<view>{{TimeSlot.tomorrowTime.split('/')[1]}}月{{TimeSlot.tomorrowTime.split('/')[2]}}日</view>
<view>明天</view>
</view>
<view class="{{dataNum == '2' ? 'dataNumSelected' : ''}}" onTap="chooseDate" data-num="2">
<view>{{TimeSlot.afterTomorrowTime.split('/')[1]}}月{{TimeSlot.afterTomorrowTime.split('/')[2]}}日</view>
<view>后天</view>
</view>
<view class="{{dataNum == '3' ? 'dataNumSelected' : ''}}" onTap="chooseDate" data-num="3">
<view>
自定义日期
</view> </view>
<view class="modalTimeSlot"> <view>
<text a:if="{{!modalFooter.startTime || !modalFooter.endTime}}">请选择会议时间</text> <text a:if="{{dataNum == '3'}}">{{meetingTime.date.split('/')[1]}}月{{meetingTime.date.split('/')[2]}}日</text>
<text a:if="{{modalFooter.startTime && modalFooter.endTime}}">{{modalFooter.startTime}}至{{modalFooter.isOneDay ? modalFooter.endTime.substr(11,16):modalFooter.endTime}} 共{{modalFooter.allMinutes}}分钟</text>
</view> </view>
<view class="changeDay"> </view>
<view class="{{dataNum == '0' ? 'dataNumSelected' : ''}}" onTap="chooseDate" data-num="0"> </view>
<view>{{TimeSlot.todayTime.split('/')[1]}}月{{TimeSlot.todayTime.split('/')[2]}}日</view> <scroll-view scroll-y='{{true}}' class="modalOccupyTimeSlot" scroll-into-view="{{toThisTime}}">
<view>今天</view> <view class="OccupyTimeList" a:for="{{modalList}}" data-index="{{index}}" onTap="onChangeModalTime" id="{{item.reserveStartTime.substr(11,15)}}">
<view>
<view a:if="{{item.status==='BeOverdue'}}" class="beOverdue">
<text class="iconfont iconicon_Agreed1"></text>
</view> </view>
<view class="{{dataNum == '1' ? 'dataNumSelected' : ''}}" onTap="chooseDate" data-num="1"> <view a:elif="{{item.status==='Uncheck'}}" class="Unchecked">
<view>{{TimeSlot.tomorrowTime.split('/')[1]}}月{{TimeSlot.tomorrowTime.split('/')[2]}}日</view> <text class="iconfont iconicon_uncheck"></text>
<view>明天</view>
</view> </view>
<view class="{{dataNum == '2' ? 'dataNumSelected' : ''}}" onTap="chooseDate" data-num="2"> <view a:elif="{{item.status==='checked'}}" class="checked">
<view>{{TimeSlot.afterTomorrowTime.split('/')[1]}}月{{TimeSlot.afterTomorrowTime.split('/')[2]}}日</view> <text class="iconfont iconicon_Agreed1"></text>
<view>后天</view>
</view>
<view class="{{dataNum == '3' ? 'dataNumSelected' : ''}}" onTap="chooseDate" data-num="3">
<view>
自定义日期
</view>
<view>
<text a:if="{{dataNum == '3'}}">{{meetingTime.date.split('/')[1]}}月{{meetingTime.date.split('/')[2]}}日</text>
</view>
</view> </view>
</view> </view>
<scroll-view scroll-y='{{true}}' class="modalOccupyTimeSlot" scroll-into-view="{{toThisTime}}"> <view>
<view class="OccupyTimeList" a:for="{{modalList}}" data-index="{{index}}" onTap="onChangeModalTime" id="{{item.reserveStartTime.substr(11,15)}}"> <view>{{item.reserveStartTime.substr(10,15)}} ~ {{item.reserveEndTime.substr(10,15)}}</view>
<view> <view class="expiredStatus" a:if="{{item.reserveStatus === 'expired'}}">
<view a:if="{{item.status==='BeOverdue'}}" class="beOverdue">
<text class="iconfont iconicon_Agreed1"></text>
</view>
<view a:elif="{{item.status==='Uncheck'}}" class="Unchecked">
<text class="iconfont iconicon_uncheck"></text>
</view>
<view a:elif="{{item.status==='checked'}}" class="checked">
<text class="iconfont iconicon_Agreed1"></text>
</view>
</view>
<view>
<view>{{item.reserveStartTime.substr(10,15)}} ~ {{item.reserveEndTime.substr(10,15)}}</view>
<view class="expiredStatus" a:if="{{item.reserveStatus === 'expired'}}">
已过期 已过期
</view> </view>
<view class="occupiedStatus" a:if="{{item.reserveStatus === 'occupied'}}"> <view class="occupiedStatus" a:if="{{item.reserveStatus === 'occupied'}}">
已被{{item.scheduleList[0].organizerName}}预定 已被{{item.scheduleList[0].organizerName}}预定
</view>
</view>
</view> </view>
</scroll-view>
</view>
<view class="calendarMoadl" a:else>
<view class="calendarTip">
自定义时间
</view> </view>
<calendar type="single" haveYear="{{false}}" selectedDate="{{meetingTime.date}}" onSelect="handleSelect" onMonthChange="onMonthChange" onYearChange="onYearChange" onSelectHasDisableDate="onSelectHasDisableDate" />
</view> </view>
</popup> </scroll-view>
\ No newline at end of file </view>
<view class="calendarMoadl" a:else>
<view class="calendarTip">
自定义时间
</view>
<calendar type="single" haveYear="{{false}}" selectedDate="{{meetingTime.date}}" onSelect="handleSelect" onMonthChange="onMonthChange" onYearChange="onYearChange" onSelectHasDisableDate="onSelectHasDisableDate" />
</view>
</popup>
\ No newline at end of file
pages/meetingRoomList/meetingRoomList.js
...@@ -951,8 +951,8 @@ create.Page({ ...@@ -951,8 +951,8 @@ create.Page({
endTimeDate.setMinutes(endTimeDate.getMinutes() + 30); endTimeDate.setMinutes(endTimeDate.getMinutes() + 30);
let data = { let data = {
meetingRoomId: this.data.meetingTime.meetingRoomId, meetingRoomId: this.data.meetingTime.meetingRoomId,
startTime: `${startTime}:00`, endTime: `${startTime}:00`,
endTime: `${endTimeDate.getFullYear()}-${ startTime: `${endTimeDate.getFullYear()}-${
endTimeDate.getMonth() + 1 < 10 endTimeDate.getMonth() + 1 < 10
? "0" + (endTimeDate.getMonth() + 1) ? "0" + (endTimeDate.getMonth() + 1)
: endTimeDate.getMonth() + 1 : endTimeDate.getMonth() + 1
...@@ -1099,11 +1099,15 @@ create.Page({ ...@@ -1099,11 +1099,15 @@ create.Page({
startTime: meetingDate startTime: meetingDate
}; };
getReserveRoomList(data).then(res => { getReserveRoomList(data).then(res => {
const isExpired =
new Date().getTime() >
new Date(`${meetingDate.replace(/-/g, "/")} 23:59:59`);
let modalList = res.data.data[0].timeSlotWithMeetingVOS.map(item => { let modalList = res.data.data[0].timeSlotWithMeetingVOS.map(item => {
// 判断是否过期 // 判断是否过期
if ( if (
item.reserveStatus === "expired" || item.reserveStatus === "expired" ||
item.reserveStatus === "occupied" item.reserveStatus === "occupied" ||
isExpired
) { ) {
return { return {
...item, ...item,
......
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