Skip to content

S
schedule
Commit d6c654ba by fengzhaoyu
Options

Merge branch 'dev' into release_beta

parents 535f1de2 28fa64f8
Showing with 74 additions and 58 deletions
components/meetingTimePicker/meetingTimePicker.js
import { getInterTime } from '../../utils/utils';
const currentDate = new Date();
const weekList = ['周日', '周一', '周二', '周三', '周四', '周五', '周六'];
const durationList = [{ value: 30, label: '30分钟' }, { value: 60, label: '1小时' }, { value: 120, label: '2小时' }];
const durationList = [{ value: 30, label: '30分钟' }, { value: 60, label: '1小时' }, { value: 90, label: '1.5小时' }, { value: 120, label: '2小时' }];
const timeData = generateDate(365);
const timeHour = generateHour(24);
const timeMin = generateMin(60);
......@@ -188,10 +188,10 @@ Component({
const min = endDate.getMinutes();
endDate.setMinutes(min + 30);
// 赋值
if (this.props.startTime && new Date(this.props.startTime).getFullYear()) {
if (this.props.startTime) {
startDate = new Date(this.props.startTime);
}
if (this.props.endTime && new Date(this.props.endTime).getFullYear()) {
if (this.props.endTime) {
endDate = new Date(this.props.endTime);
}
......
components/relatedApp/relatedApp.js
......@@ -17,24 +17,8 @@ create.Component({
this.getData();
},
didUpdate() {
if (typeof this.$store.data.relatedAppNeedUpdate === "object") {
let relatedAppList = this.data.relatedAppList;
let relatedAppPlatformList = this.data.relatedAppPlatformList;
relatedAppList.push({
userName: this.$store.data.relatedAppNeedUpdate.name,
platform: this.$store.data.relatedAppNeedUpdate.platform
});
relatedAppPlatformList.push(
this.$store.data.relatedAppNeedUpdate.platform
);
this.setData({
relatedAppList: relatedAppList,
relatedAppPlatformList: relatedAppPlatformList
});
this.$store.data.relatedAppNeedUpdate = "";
this.update();
} else if (this.$store.data.relatedAppNeedUpdate === "1") {
this.$store.data.relatedAppNeedUpdate = "";
if (this.$store.data.relatedAppNeedUpdate) {
this.$store.data.relatedAppNeedUpdate = false;
this.update();
this.getData();
}
......
components/toast/toast.js
......@@ -4,7 +4,7 @@ Component({
},
props: {
showToast: false,
duration: 2000,
duration: 1000,
title: '保存成功',
toastIcon: 'iconcanjia3'
......
pages/appDetails/appDetails.axml
......@@ -29,8 +29,8 @@
{{name ? name : 'outlook'}}
</view>
</view>
<view class="{{isBind ? 'unBinding': 'binding'}} bindBtn {{isLoading ? 'loadingBtn' : ''}}">
<text onTap="{{isBind ? 'showPopup' : 'bindApp'}}">{{isBind ? '解绑' : '绑定'}}</text>
<view class="{{isBind ? 'unBinding': 'binding'}} bindBtn {{isLoading ? 'loadingBtn' : ''}}" onTap="{{isBind ? 'showPopup' : 'bindApp'}}">
<text>{{isBind ? '解绑' : '绑定'}}</text>
</view>
</view>
<view class="loadingToast" a:if="{{isLoading}}">
......
pages/appDetails/appDetails.js
......@@ -49,10 +49,8 @@ create.Page({
isBind: true,
isLoading: false
});
this.$store.data.relatedAppNeedUpdate = {
name: item.userName,
platform: this.data.platform
};
clearInterval(interval);
this.$store.data.relatedAppNeedUpdate = true;
this.update();
}
});
......@@ -94,7 +92,7 @@ create.Page({
isBind: false,
showSelectPopup: false
});
this.$store.data.relatedAppNeedUpdate = "1";
this.$store.data.relatedAppNeedUpdate = true;
this.update();
}
});
......
pages/index/index.acss
......@@ -191,8 +191,9 @@
margin-bottom: 32rpx;
}
.today {
.date .today {
border-left: 8rpx solid rgba(234, 12, 40, 1);
color: rgba(10, 10, 10, 1) !important;
}
.todayNoData {
......
pages/index/index.axml
......@@ -79,7 +79,7 @@
<!-- 天 -->
<block a:elif="{{item.type == 'day' || item.type == 'today'}}">
<view class="date li" id="{{ item.dateStr}}">
<view class="hasDateTitle {{item.type == 'today' && item.hasDateLabel ? 'today' : ''}} {{item.value.isBeOverdue ? 'overdueLabel':''}}">
<view class="hasDateTitle {{item.value.isBeOverdue ? 'overdueLabel':''}} {{item.type == 'today' && item.hasDateLabel ? 'today' : ''}}">
<view>
{{item.week}}
</view>
......
pages/index/index.js
......@@ -780,7 +780,7 @@ create.Page({
maxClickCount--;
if (maxClickCount == 0) {
dd.alert({
content: "0.0.9"
content: "0.0.10"
});
maxClickCount = 5;
}
......
pages/meetingDetail/meetingDetail.js
......@@ -154,10 +154,14 @@ create.Page({
editType: this.$store.data.updateInfo.updateType
})
} else {
this.setData({
editType: this.$store.data.updateInfo.updateType,
'centerPopup.showCenterPopup': true
})
if (this.$store.data.participatorList.length < 2) {
this.isChange(this.$store.data.updateInfo.updateType, 'only')
} else {
this.setData({
editType: this.$store.data.updateInfo.updateType,
'centerPopup.showCenterPopup': true
})
}
// this.isChange(this.$store.data.updateInfo.updateType, 'only')
}
} else {
......@@ -214,12 +218,6 @@ create.Page({
participatorUserId.push(value.participator.userId)
originUsersId.push(value.participator.userId)
originUsers.push(value.participator)
if (value.userId === getApp().globalData.userid) {
this.setData({
aheadTimes: !!value.aheadList ? value.aheadList : [],
'comListData.aheadTimesListId': !!value.aheadList ? value.aheadList : [-1]
})
}
}
}
for (let item of this.data.comListData.repeatList) {
......@@ -228,6 +226,8 @@ create.Page({
}
}
this.setData({
aheadTimes: !!res.data.data.aheadTimes ? res.data.data.aheadTimes : [],
'comListData.aheadTimesListId': !!res.data.data.aheadTimes ? res.data.data.aheadTimes : [-1],
mrReserveStatus: res.data.data.mrReserveStatus,
confirmAttendance: res.data.data.confirmAttendance === null ? -9 : res.data.data.confirmAttendance,
organizer: res.data.data.organizer,
......@@ -353,10 +353,15 @@ create.Page({
editType: 'modify_location'
})
} else {
this.setData({
editType: 'modify_location',
'centerPopup.showCenterPopup': true
})
if (this.$store.data.participatorList.length < 2) {
this.isChange('modify_location', 'only')
} else {
this.setData({
editType: 'modify_location',
'centerPopup.showCenterPopup': true
})
}
}
break
case 'meetingWayModel':
......@@ -473,7 +478,15 @@ create.Page({
editType: 'repeat'
})
} else {
this.isChange('repeat', 'only')
if (this.$store.data.participatorList.length < 2) {
this.isChange('repeat', 'only')
} else {
this.setData({
editType: 'repeat',
'centerPopup.showCenterPopup': true
})
}
}
break;
}
......@@ -596,10 +609,14 @@ create.Page({
editType: 'modify_time'
})
} else {
this.setData({
editType: 'modify_time',
'centerPopup.showCenterPopup': true
})
if (this.$store.data.participatorList.length < 2) {
this.isChange('modify_time', 'only')
} else {
this.setData({
editType: 'modify_time',
'centerPopup.showCenterPopup': true
})
}
// this.isChange('modify_time', 'only')
}
},
......@@ -706,10 +723,14 @@ create.Page({
const _that = this
switch (this.data.conSelectPopupData.selectType) {
case 'common':
if (this.data.editType === 'modify_location' || this.data.editType === 'modify_time') {
this.setData({
'centerPopup.showCenterPopup': true
})
if (this.data.editType === 'modify_location' || this.data.editType === 'modify_time' || this.data.editType === 'repeat') {
if (this.$store.data.participatorList.length < 2) {
this.isChange(this.data.editType, event.currentTarget.dataset.item.id)
} else {
this.setData({
'centerPopup.showCenterPopup': true
})
}
} else {
this.isChange(this.data.editType, event.currentTarget.dataset.item.id)
}
......@@ -1099,8 +1120,8 @@ create.Page({
}
// this.modifySchedule(data, needNotice)
}).catch(err => {
this.$store.data.startTime = this.$store.data.originalData.startTime.replace(/'-'/g, '/')
this.$store.data.endTime = this.$store.data.originalData.endTime.replace(/'-'/g, '/')
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()],
......
pages/unbindApp/unbindApp.js
......@@ -30,7 +30,7 @@ create.Page({
unbind() {
unbindingApp(this.data.item.platform).then(res => {
if (res.data.data) {
this.$store.data.relatedAppNeedUpdate = "1";
this.$store.data.relatedAppNeedUpdate = true;
this.update();
dd.navigateBack({
delta: 1
......
yarn.lock
......@@ -7,11 +7,23 @@ dd-store@^1.9.0:
resolved "https://registry.yarnpkg.com/dd-store/-/dd-store-1.9.0.tgz#8f531e28b6991919bc60a17148fa9e1bba142397"
integrity sha512-bhIkQMcHjNTDGG03riSeLp4UfdOBqWqg+qFfqqwAvgBiARrYbrEWU/YVE5tOV6XOqyfozp+MpZP3SaFyOtuUrw==
dingtalk-jsapi@^2.10.3:
version "2.10.3"
resolved "https://registry.yarnpkg.com/dingtalk-jsapi/-/dingtalk-jsapi-2.10.3.tgz#ade5c2f858f4ac41143d294ae172b34efaeb95e2"
integrity sha512-ozfuwWzOKx4qgfs+ijdN2XgylB8xZ4zxetDp4ND272YDD5C9GJLo5GKhsFR6kQ/lnU0WIzBo2rYjEwZKtMrJxw==
dependencies:
promise-polyfill "^7.1.0"
luxon@^1.21.3:
version "1.22.2"
resolved "https://registry.yarnpkg.com/luxon/-/luxon-1.22.2.tgz#799d65cc1ed0ba85b4cb3f7dd38fc08a8d1a6750"
integrity sha512-vq6eSaOOw1fKob+JXwfu0e3/UFUT4G4HTFRJab7dch8J1OdOGW/vXqCiJsY7rm2In+5gKNYx0EtnYT0Tc5V4Qw==
promise-polyfill@^7.1.0:
version "7.1.2"
resolved "https://registry.yarnpkg.com/promise-polyfill/-/promise-polyfill-7.1.2.tgz#ab05301d8c28536301622d69227632269a70ca3b"
integrity sha512-FuEc12/eKqqoRYIGBrUptCBRhobL19PS2U31vMNTfyck1FxPyMfgsXyW4Mav85y/ZN1hop3hOwRlUDok23oYfQ==
rrule@^2.6.4:
version "2.6.4"
resolved "https://registry.yarnpkg.com/rrule/-/rrule-2.6.4.tgz#7f4f31fda12bc7249bb176c891109a9bc448e035"
......
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