Skip to content

S
schedule
Commit 195f7bbc by liang ce
Options

修改outlook绑定页面

parent 8b8553ea
Showing with 132 additions and 107 deletions
api/request.js
...@@ -302,3 +302,11 @@ export function getOutlookUrl(data) { ...@@ -302,3 +302,11 @@ export function getOutlookUrl(data) {
url: `https://third-authentication-beta.mingwork.com/microsoft/getThirdLoginUrl?state=${data}` url: `https://third-authentication-beta.mingwork.com/microsoft/getThirdLoginUrl?state=${data}`
}); });
} }
// 发送给后端outlook code
export function authorizationCodeReplacementToken(data) {
return $binding({
method: "get",
data: data,
url: `https://third-authentication-beta.mingwork.com/microsoft/authorizationCodeReplacementToken`
});
}
pages/bindingOutlook/bindingOutlook.js
import { getOutlookUrl } from "../../api/request"; import {
getOutlookUrl,
authorizationCodeReplacementToken
} from "../../api/request";
Page({ Page({
data: { data: {
url: "" url: ""
}, },
onLoad() { onLoad() {
setTimeout(() => { this.webViewContext = dd.createWebViewContext("web-view-1");
let data = `0968162722860917,${dd.corpId}`; let data = `${getApp().globalData.userid},${dd.corpId}`;
getOutlookUrl(data).then(res => { getOutlookUrl(data).then(res => {
this.setData({ this.setData({
url: res.data.data url: res.data.data
}); });
}, 2000);
}); });
}, },
test(e) { test(e) {
dd.alert({ const data = {
content: JSON.stringify(e.detail) code: code,
state: `${getApp().globalData.userid},${dd.corpId}`
};
authorizationCodeReplacementToken(data).then(res => {
console.log(res);
}); });
} }
}); });
pages/meetingRoomList/meetingRoomList.acss
...@@ -128,25 +128,34 @@ ...@@ -128,25 +128,34 @@
} }
.reservation { .reservation {
background: #F3F6FA !important; background: #F3F6FA!important;
border: 1px solid rgba(27, 38, 61, 0.10) !important; border: 1px solid rgba(27, 38, 61, 0.1) !important;
} }
.occupied { .occupied {
background: rgba(48, 112, 242, 0.28) !important; background: rgba(10, 10, 10, 0.2) !important;
border: 1rpx solid rgba(27, 38, 61, 0.10) !important; border: 1rpx solid rgba(27, 38, 61, 0.1) !important;
}
.myReservation {
background: rgba(234, 12, 40, 1);
border: 1rpx solid rgba(27, 38, 61, 0.1);
} }
.reserveRoomTimeBarNum { .reserveRoomTimeBarNum {
display: flex; display: flex;
margin-top: 12rpx; margin-top: 12rpx;
font-size: 20rpx; font-size: 20rpx;
color: #A3A5A8; font-family: DINAlternate-Bold, DINAlternate;
font-weight: bold;
color: rgba(25, 31, 37, 0.56);
} }
.reserveRoomTimeBarNum>view { .reserveRoomTimeBarNum>view {
text-align: center; text-align: center;
margin-right: 6rpx;
flex: 1; flex: 1;
width: 24rpx;
} }
/* 弹框的样式 */ /* 弹框的样式 */
...@@ -349,7 +358,7 @@ ...@@ -349,7 +358,7 @@
} }
.checked .iconicon_Agreed1 { .checked .iconicon_Agreed1 {
color: #3296FA; color: rgba(234, 12, 40, 1);
font-size: 40rpx; font-size: 40rpx;
} }
......
pages/meetingRoomList/meetingRoomList.axml
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
{{item.name}} {{item.name}}
</view> </view>
<view class="reserveRoomEquipFacility" a:if="{{item.equipFacilityNames.length>0}}"> <view class="reserveRoomEquipFacility" a:if="{{item.equipFacilityNames.length>0}}">
<text class="locationIcon iconfont iconicon_app1"></text> <text class="locationIcon iconfont iconicon_facility1"></text>
<text a:for="{{item.equipFacilityNames}}" a:if="{{item2 !== null}}" a:for-item="item2" a:for-index="index2">{{item2}}{{index2 === item.equipFacilityNames.length-1 ? '' : '/'}}</text> <text a:for="{{item.equipFacilityNames}}" a:if="{{item2 !== null}}" a:for-item="item2" a:for-index="index2">{{item2}}{{index2 === item.equipFacilityNames.length-1 ? '' : '/'}}</text>
</view> </view>
<view class="reserveRoomNumAndLocation"> <view class="reserveRoomNumAndLocation">
......
pages/meetingRoomList/meetingRoomList.js
...@@ -174,8 +174,8 @@ create.Page({ ...@@ -174,8 +174,8 @@ create.Page({
? "0" + modalDate.getHours() ? "0" + modalDate.getHours()
: modalDate.getHours() : modalDate.getHours()
: modalDate.getHours() + 1 < 10 : modalDate.getHours() + 1 < 10
? "0" + (modalDate.getHours() + 1) ? "0" + (modalDate.getHours() + 1)
: modalDate.getHours() + 1; : modalDate.getHours() + 1;
let num = ""; let num = "";
if (dateTime.replace(/-/g, "/") === this.data.TimeSlot.todayTime) { if (dateTime.replace(/-/g, "/") === this.data.TimeSlot.todayTime) {
num = "0"; num = "0";
...@@ -259,19 +259,19 @@ create.Page({ ...@@ -259,19 +259,19 @@ create.Page({
modalFooterTime.getMonth() < 9 modalFooterTime.getMonth() < 9
? "0" + (modalFooterTime.getMonth() + 1) ? "0" + (modalFooterTime.getMonth() + 1)
: modalFooterTime.getMonth() + 1 : modalFooterTime.getMonth() + 1
}-${ }-${
modalFooterTime.getDate() < 10 modalFooterTime.getDate() < 10
? "0" + modalFooterTime.getDate() ? "0" + modalFooterTime.getDate()
: modalFooterTime.getDate() : modalFooterTime.getDate()
} ${ } ${
modalFooterTime.getHours() < 10 modalFooterTime.getHours() < 10
? "0" + modalFooterTime.getHours() ? "0" + modalFooterTime.getHours()
: modalFooterTime.getHours() : modalFooterTime.getHours()
}:${ }:${
modalFooterTime.getMinutes() < 10 modalFooterTime.getMinutes() < 10
? "0" + modalFooterTime.getMinutes() ? "0" + modalFooterTime.getMinutes()
: modalFooterTime.getMinutes() : modalFooterTime.getMinutes()
}`, }`,
"modalFooter.allMinutes": 30, "modalFooter.allMinutes": 30,
"modalFooter.isOneDay": true "modalFooter.isOneDay": true
}); });
...@@ -328,19 +328,19 @@ create.Page({ ...@@ -328,19 +328,19 @@ create.Page({
modalFooterTime.getMonth() < 9 modalFooterTime.getMonth() < 9
? "0" + (modalFooterTime.getMonth() + 1) ? "0" + (modalFooterTime.getMonth() + 1)
: modalFooterTime.getMonth() + 1 : modalFooterTime.getMonth() + 1
}-${ }-${
modalFooterTime.getDate() < 10 modalFooterTime.getDate() < 10
? "0" + modalFooterTime.getDate() ? "0" + modalFooterTime.getDate()
: modalFooterTime.getDate() : modalFooterTime.getDate()
} ${ } ${
modalFooterTime.getHours() < 10 modalFooterTime.getHours() < 10
? "0" + modalFooterTime.getHours() ? "0" + modalFooterTime.getHours()
: modalFooterTime.getHours() : modalFooterTime.getHours()
}:${ }:${
modalFooterTime.getMinutes() < 10 modalFooterTime.getMinutes() < 10
? "0" + modalFooterTime.getMinutes() ? "0" + modalFooterTime.getMinutes()
: modalFooterTime.getMinutes() : modalFooterTime.getMinutes()
}`, }`,
"modalFooter.allMinutes": allMinutes, "modalFooter.allMinutes": allMinutes,
"modalFooter.isOneDay": true "modalFooter.isOneDay": true
}, },
...@@ -377,19 +377,19 @@ create.Page({ ...@@ -377,19 +377,19 @@ create.Page({
modalFooterTime.getMonth() < 9 modalFooterTime.getMonth() < 9
? "0" + (modalFooterTime.getMonth() + 1) ? "0" + (modalFooterTime.getMonth() + 1)
: modalFooterTime.getMonth() + 1 : modalFooterTime.getMonth() + 1
}-${ }-${
modalFooterTime.getDate() < 10 modalFooterTime.getDate() < 10
? "0" + modalFooterTime.getDate() ? "0" + modalFooterTime.getDate()
: modalFooterTime.getDate() : modalFooterTime.getDate()
} ${ } ${
modalFooterTime.getHours() < 10 modalFooterTime.getHours() < 10
? "0" + modalFooterTime.getHours() ? "0" + modalFooterTime.getHours()
: modalFooterTime.getHours() : modalFooterTime.getHours()
}:${ }:${
modalFooterTime.getMinutes() < 10 modalFooterTime.getMinutes() < 10
? "0" + modalFooterTime.getMinutes() ? "0" + modalFooterTime.getMinutes()
: modalFooterTime.getMinutes() : modalFooterTime.getMinutes()
}`, }`,
"modalFooter.allMinutes": allMinutes, "modalFooter.allMinutes": allMinutes,
"modalFooter.isOneDay": false "modalFooter.isOneDay": false
}, },
...@@ -438,19 +438,19 @@ create.Page({ ...@@ -438,19 +438,19 @@ create.Page({
modalFooterTime.getMonth() < 9 modalFooterTime.getMonth() < 9
? "0" + (modalFooterTime.getMonth() + 1) ? "0" + (modalFooterTime.getMonth() + 1)
: modalFooterTime.getMonth() + 1 : modalFooterTime.getMonth() + 1
}-${ }-${
modalFooterTime.getDate() < 10 modalFooterTime.getDate() < 10
? "0" + modalFooterTime.getDate() ? "0" + modalFooterTime.getDate()
: modalFooterTime.getDate() : modalFooterTime.getDate()
} ${ } ${
modalFooterTime.getHours() < 10 modalFooterTime.getHours() < 10
? "0" + modalFooterTime.getHours() ? "0" + modalFooterTime.getHours()
: modalFooterTime.getHours() : modalFooterTime.getHours()
}:${ }:${
modalFooterTime.getMinutes() < 10 modalFooterTime.getMinutes() < 10
? "0" + modalFooterTime.getMinutes() ? "0" + modalFooterTime.getMinutes()
: modalFooterTime.getMinutes() : modalFooterTime.getMinutes()
}`, }`,
"modalFooter.allMinutes": allMinutes, "modalFooter.allMinutes": allMinutes,
"modalFooter.isOneDay": true "modalFooter.isOneDay": true
}, },
...@@ -486,19 +486,19 @@ create.Page({ ...@@ -486,19 +486,19 @@ create.Page({
modalFooterTime.getMonth() < 9 modalFooterTime.getMonth() < 9
? "0" + (modalFooterTime.getMonth() + 1) ? "0" + (modalFooterTime.getMonth() + 1)
: modalFooterTime.getMonth() + 1 : modalFooterTime.getMonth() + 1
}-${ }-${
modalFooterTime.getDate() < 10 modalFooterTime.getDate() < 10
? "0" + modalFooterTime.getDate() ? "0" + modalFooterTime.getDate()
: modalFooterTime.getDate() : modalFooterTime.getDate()
} ${ } ${
modalFooterTime.getHours() < 10 modalFooterTime.getHours() < 10
? "0" + modalFooterTime.getHours() ? "0" + modalFooterTime.getHours()
: modalFooterTime.getHours() : modalFooterTime.getHours()
}:${ }:${
modalFooterTime.getMinutes() < 10 modalFooterTime.getMinutes() < 10
? "0" + modalFooterTime.getMinutes() ? "0" + modalFooterTime.getMinutes()
: modalFooterTime.getMinutes() : modalFooterTime.getMinutes()
}`, }`,
"modalFooter.allMinutes": allMinutes, "modalFooter.allMinutes": allMinutes,
"modalFooter.isOneDay": false "modalFooter.isOneDay": false
}, },
...@@ -530,19 +530,19 @@ create.Page({ ...@@ -530,19 +530,19 @@ create.Page({
startTimeDate.getMonth() + 1 < 10 startTimeDate.getMonth() + 1 < 10
? "0" + (startTimeDate.getMonth() + 1) ? "0" + (startTimeDate.getMonth() + 1)
: startTimeDate.getMonth() + 1 : startTimeDate.getMonth() + 1
}-${ }-${
startTimeDate.getDate() < 10 startTimeDate.getDate() < 10
? "0" + startTimeDate.getDate() ? "0" + startTimeDate.getDate()
: startTimeDate.getDate() : startTimeDate.getDate()
} ${ } ${
startTimeDate.getHours() < 10 startTimeDate.getHours() < 10
? "0" + startTimeDate.getHours() ? "0" + startTimeDate.getHours()
: startTimeDate.getHours() : startTimeDate.getHours()
}:${ }:${
startTimeDate.getMinutes() < 10 startTimeDate.getMinutes() < 10
? "0" + startTimeDate.getMinutes() ? "0" + startTimeDate.getMinutes()
: startTimeDate.getMinutes() : startTimeDate.getMinutes()
}`; }`;
if (meetingStartTime === this.data.meetingTime.endTime) { if (meetingStartTime === this.data.meetingTime.endTime) {
let modalFooterTime = new Date( let modalFooterTime = new Date(
that.data.meetingTime.endTime.replace(/-/g, "/") that.data.meetingTime.endTime.replace(/-/g, "/")
...@@ -557,19 +557,19 @@ create.Page({ ...@@ -557,19 +557,19 @@ create.Page({
modalFooterTime.getMonth() < 9 modalFooterTime.getMonth() < 9
? "0" + (modalFooterTime.getMonth() + 1) ? "0" + (modalFooterTime.getMonth() + 1)
: modalFooterTime.getMonth() + 1 : modalFooterTime.getMonth() + 1
}-${ }-${
modalFooterTime.getDate() < 10 modalFooterTime.getDate() < 10
? "0" + modalFooterTime.getDate() ? "0" + modalFooterTime.getDate()
: modalFooterTime.getDate() : modalFooterTime.getDate()
} ${ } ${
modalFooterTime.getHours() < 10 modalFooterTime.getHours() < 10
? "0" + modalFooterTime.getHours() ? "0" + modalFooterTime.getHours()
: modalFooterTime.getHours() : modalFooterTime.getHours()
}:${ }:${
modalFooterTime.getMinutes() < 10 modalFooterTime.getMinutes() < 10
? "0" + modalFooterTime.getMinutes() ? "0" + modalFooterTime.getMinutes()
: modalFooterTime.getMinutes() : modalFooterTime.getMinutes()
}`, }`,
"modalFooter.allMinutes": 30, "modalFooter.allMinutes": 30,
"modalFooter.isOneDay": true "modalFooter.isOneDay": true
}, },
...@@ -594,19 +594,19 @@ create.Page({ ...@@ -594,19 +594,19 @@ create.Page({
modalFooterTime.getMonth() < 9 modalFooterTime.getMonth() < 9
? "0" + (modalFooterTime.getMonth() + 1) ? "0" + (modalFooterTime.getMonth() + 1)
: modalFooterTime.getMonth() + 1 : modalFooterTime.getMonth() + 1
}-${ }-${
modalFooterTime.getDate() < 10 modalFooterTime.getDate() < 10
? "0" + modalFooterTime.getDate() ? "0" + modalFooterTime.getDate()
: modalFooterTime.getDate() : modalFooterTime.getDate()
} ${ } ${
modalFooterTime.getHours() < 10 modalFooterTime.getHours() < 10
? "0" + modalFooterTime.getHours() ? "0" + modalFooterTime.getHours()
: modalFooterTime.getHours() : modalFooterTime.getHours()
}:${ }:${
modalFooterTime.getMinutes() < 10 modalFooterTime.getMinutes() < 10
? "0" + modalFooterTime.getMinutes() ? "0" + modalFooterTime.getMinutes()
: modalFooterTime.getMinutes() : modalFooterTime.getMinutes()
}`, }`,
"modalFooter.allMinutes": allMinutes "modalFooter.allMinutes": allMinutes
}, },
() => { () => {
...@@ -625,19 +625,19 @@ create.Page({ ...@@ -625,19 +625,19 @@ create.Page({
endTimeDate.getMonth() + 1 < 10 endTimeDate.getMonth() + 1 < 10
? "0" + (endTimeDate.getMonth() + 1) ? "0" + (endTimeDate.getMonth() + 1)
: endTimeDate.getMonth() + 1 : endTimeDate.getMonth() + 1
}-${ }-${
endTimeDate.getDate() < 10 endTimeDate.getDate() < 10
? "0" + endTimeDate.getDate() ? "0" + endTimeDate.getDate()
: endTimeDate.getDate() : endTimeDate.getDate()
} ${ } ${
endTimeDate.getHours() < 10 endTimeDate.getHours() < 10
? "0" + endTimeDate.getHours() ? "0" + endTimeDate.getHours()
: endTimeDate.getHours() : endTimeDate.getHours()
}:${ }:${
endTimeDate.getMinutes() < 10 endTimeDate.getMinutes() < 10
? "0" + endTimeDate.getMinutes() ? "0" + endTimeDate.getMinutes()
: endTimeDate.getMinutes() : endTimeDate.getMinutes()
}`; }`;
if (meetingEndTime === this.data.meetingTime.startTime) { if (meetingEndTime === this.data.meetingTime.startTime) {
let modalFooterTime = new Date( let modalFooterTime = new Date(
this.data.meetingTime.startTime.replace(/-/g, "/") this.data.meetingTime.startTime.replace(/-/g, "/")
...@@ -651,19 +651,19 @@ create.Page({ ...@@ -651,19 +651,19 @@ create.Page({
modalFooterTime.getMonth() < 9 modalFooterTime.getMonth() < 9
? "0" + (modalFooterTime.getMonth() + 1) ? "0" + (modalFooterTime.getMonth() + 1)
: modalFooterTime.getMonth() + 1 : modalFooterTime.getMonth() + 1
}-${ }-${
modalFooterTime.getDate() < 10 modalFooterTime.getDate() < 10
? "0" + modalFooterTime.getDate() ? "0" + modalFooterTime.getDate()
: modalFooterTime.getDate() : modalFooterTime.getDate()
} ${ } ${
modalFooterTime.getHours() < 10 modalFooterTime.getHours() < 10
? "0" + modalFooterTime.getHours() ? "0" + modalFooterTime.getHours()
: modalFooterTime.getHours() : modalFooterTime.getHours()
}:${ }:${
modalFooterTime.getMinutes() < 10 modalFooterTime.getMinutes() < 10
? "0" + modalFooterTime.getMinutes() ? "0" + modalFooterTime.getMinutes()
: modalFooterTime.getMinutes() : modalFooterTime.getMinutes()
}`, }`,
"modalFooter.allMinutes": 30 "modalFooter.allMinutes": 30
}, },
() => { () => {
...@@ -687,19 +687,19 @@ create.Page({ ...@@ -687,19 +687,19 @@ create.Page({
modalFooterTime.getMonth() < 9 modalFooterTime.getMonth() < 9
? "0" + (modalFooterTime.getMonth() + 1) ? "0" + (modalFooterTime.getMonth() + 1)
: modalFooterTime.getMonth() + 1 : modalFooterTime.getMonth() + 1
}-${ }-${
modalFooterTime.getDate() < 10 modalFooterTime.getDate() < 10
? "0" + modalFooterTime.getDate() ? "0" + modalFooterTime.getDate()
: modalFooterTime.getDate() : modalFooterTime.getDate()
} ${ } ${
modalFooterTime.getHours() < 10 modalFooterTime.getHours() < 10
? "0" + modalFooterTime.getHours() ? "0" + modalFooterTime.getHours()
: modalFooterTime.getHours() : modalFooterTime.getHours()
}:${ }:${
modalFooterTime.getMinutes() < 10 modalFooterTime.getMinutes() < 10
? "0" + modalFooterTime.getMinutes() ? "0" + modalFooterTime.getMinutes()
: modalFooterTime.getMinutes() : modalFooterTime.getMinutes()
}`, }`,
"modalFooter.allMinutes": allMinutes "modalFooter.allMinutes": allMinutes
}, },
() => { () => {
...@@ -738,19 +738,19 @@ create.Page({ ...@@ -738,19 +738,19 @@ create.Page({
modalFooterTime.getMonth() < 9 modalFooterTime.getMonth() < 9
? "0" + (modalFooterTime.getMonth() + 1) ? "0" + (modalFooterTime.getMonth() + 1)
: modalFooterTime.getMonth() + 1 : modalFooterTime.getMonth() + 1
}-${ }-${
modalFooterTime.getDate() < 10 modalFooterTime.getDate() < 10
? "0" + modalFooterTime.getDate() ? "0" + modalFooterTime.getDate()
: modalFooterTime.getDate() : modalFooterTime.getDate()
} ${ } ${
modalFooterTime.getHours() < 10 modalFooterTime.getHours() < 10
? "0" + modalFooterTime.getHours() ? "0" + modalFooterTime.getHours()
: modalFooterTime.getHours() : modalFooterTime.getHours()
}:${ }:${
modalFooterTime.getMinutes() < 10 modalFooterTime.getMinutes() < 10
? "0" + modalFooterTime.getMinutes() ? "0" + modalFooterTime.getMinutes()
: modalFooterTime.getMinutes() : modalFooterTime.getMinutes()
}`, }`,
"modalFooter.allMinutes": allMinutes, "modalFooter.allMinutes": allMinutes,
"modalFooter.isOneDay": true "modalFooter.isOneDay": true
}, },
...@@ -784,19 +784,19 @@ create.Page({ ...@@ -784,19 +784,19 @@ create.Page({
modalFooterTime.getMonth() < 9 modalFooterTime.getMonth() < 9
? "0" + (modalFooterTime.getMonth() + 1) ? "0" + (modalFooterTime.getMonth() + 1)
: modalFooterTime.getMonth() + 1 : modalFooterTime.getMonth() + 1
}-${ }-${
modalFooterTime.getDate() < 10 modalFooterTime.getDate() < 10
? "0" + modalFooterTime.getDate() ? "0" + modalFooterTime.getDate()
: modalFooterTime.getDate() : modalFooterTime.getDate()
} ${ } ${
modalFooterTime.getHours() < 10 modalFooterTime.getHours() < 10
? "0" + modalFooterTime.getHours() ? "0" + modalFooterTime.getHours()
: modalFooterTime.getHours() : modalFooterTime.getHours()
}:${ }:${
modalFooterTime.getMinutes() < 10 modalFooterTime.getMinutes() < 10
? "0" + modalFooterTime.getMinutes() ? "0" + modalFooterTime.getMinutes()
: modalFooterTime.getMinutes() : modalFooterTime.getMinutes()
}`, }`,
"modalFooter.allMinutes": allMinutes, "modalFooter.allMinutes": allMinutes,
"modalFooter.isOneDay": false "modalFooter.isOneDay": false
}, },
...@@ -847,19 +847,19 @@ create.Page({ ...@@ -847,19 +847,19 @@ create.Page({
modalFooterTime2.getMonth() < 9 modalFooterTime2.getMonth() < 9
? "0" + (modalFooterTime2.getMonth() + 1) ? "0" + (modalFooterTime2.getMonth() + 1)
: modalFooterTime2.getMonth() + 1 : modalFooterTime2.getMonth() + 1
}-${ }-${
modalFooterTime2.getDate() < 10 modalFooterTime2.getDate() < 10
? "0" + modalFooterTime2.getDate() ? "0" + modalFooterTime2.getDate()
: modalFooterTime2.getDate() : modalFooterTime2.getDate()
} ${ } ${
modalFooterTime2.getHours() < 10 modalFooterTime2.getHours() < 10
? "0" + modalFooterTime2.getHours() ? "0" + modalFooterTime2.getHours()
: modalFooterTime2.getHours() : modalFooterTime2.getHours()
}:${ }:${
modalFooterTime2.getMinutes() < 10 modalFooterTime2.getMinutes() < 10
? "0" + modalFooterTime2.getMinutes() ? "0" + modalFooterTime2.getMinutes()
: modalFooterTime2.getMinutes() : modalFooterTime2.getMinutes()
}`, }`,
"modalFooter.allMinutes": allMinutes, "modalFooter.allMinutes": allMinutes,
"modalFooter.isOneDay": true "modalFooter.isOneDay": true
}, },
...@@ -893,19 +893,19 @@ create.Page({ ...@@ -893,19 +893,19 @@ create.Page({
modalFooterTime.getMonth() < 9 modalFooterTime.getMonth() < 9
? "0" + (modalFooterTime.getMonth() + 1) ? "0" + (modalFooterTime.getMonth() + 1)
: modalFooterTime.getMonth() + 1 : modalFooterTime.getMonth() + 1
}-${ }-${
modalFooterTime.getDate() < 10 modalFooterTime.getDate() < 10
? "0" + modalFooterTime.getDate() ? "0" + modalFooterTime.getDate()
: modalFooterTime.getDate() : modalFooterTime.getDate()
} ${ } ${
modalFooterTime.getHours() < 10 modalFooterTime.getHours() < 10
? "0" + modalFooterTime.getHours() ? "0" + modalFooterTime.getHours()
: modalFooterTime.getHours() : modalFooterTime.getHours()
}:${ }:${
modalFooterTime.getMinutes() < 10 modalFooterTime.getMinutes() < 10
? "0" + modalFooterTime.getMinutes() ? "0" + modalFooterTime.getMinutes()
: modalFooterTime.getMinutes() : modalFooterTime.getMinutes()
}`, }`,
"modalFooter.allMinutes": allMinutes, "modalFooter.allMinutes": allMinutes,
"modalFooter.isOneDay": false "modalFooter.isOneDay": false
}, },
...@@ -934,19 +934,19 @@ create.Page({ ...@@ -934,19 +934,19 @@ create.Page({
endTimeDate.getMonth() + 1 < 10 endTimeDate.getMonth() + 1 < 10
? "0" + (endTimeDate.getMonth() + 1) ? "0" + (endTimeDate.getMonth() + 1)
: endTimeDate.getMonth() + 1 : endTimeDate.getMonth() + 1
}-${ }-${
endTimeDate.getDate() < 10 endTimeDate.getDate() < 10
? "0" + endTimeDate.getDate() ? "0" + endTimeDate.getDate()
: endTimeDate.getDate() : endTimeDate.getDate()
} ${ } ${
endTimeDate.getHours() < 10 endTimeDate.getHours() < 10
? "0" + endTimeDate.getHours() ? "0" + endTimeDate.getHours()
: endTimeDate.getHours() : endTimeDate.getHours()
}:${ }:${
endTimeDate.getMinutes() < 10 endTimeDate.getMinutes() < 10
? "0" + endTimeDate.getMinutes() ? "0" + endTimeDate.getMinutes()
: endTimeDate.getMinutes() : endTimeDate.getMinutes()
}:00` }:00`
}; };
return getAllScheduleWithMeetingRoomByTime(data).then(res => { return getAllScheduleWithMeetingRoomByTime(data).then(res => {
return res.data.data; return res.data.data;
...@@ -1040,8 +1040,8 @@ create.Page({ ...@@ -1040,8 +1040,8 @@ create.Page({
e.currentTarget.dataset.num == "0" e.currentTarget.dataset.num == "0"
? this.data.TimeSlot.todayTime ? this.data.TimeSlot.todayTime
: e.currentTarget.dataset.num == "1" : e.currentTarget.dataset.num == "1"
? this.data.TimeSlot.tomorrowTime ? this.data.TimeSlot.tomorrowTime
: this.data.TimeSlot.afterTomorrowTime, : this.data.TimeSlot.afterTomorrowTime,
dataNum: e.currentTarget.dataset.num dataNum: e.currentTarget.dataset.num
}, },
() => { () => {
...@@ -1060,18 +1060,18 @@ create.Page({ ...@@ -1060,18 +1060,18 @@ create.Page({
? "0" + modalDate.getHours() ? "0" + modalDate.getHours()
: modalDate.getHours() : modalDate.getHours()
: modalDate.getHours() + 1 < 10 : modalDate.getHours() + 1 < 10
? "0" + (modalDate.getHours() + 1) ? "0" + (modalDate.getHours() + 1)
: modalDate.getHours() + 1; : modalDate.getHours() + 1;
let selectDate = new Date(this.data.meetingTime.date); let selectDate = new Date(this.data.meetingTime.date);
let meetingDate = `${selectDate.getFullYear()}-${ let meetingDate = `${selectDate.getFullYear()}-${
selectDate.getMonth() + 1 < 10 selectDate.getMonth() + 1 < 10
? "0" + (selectDate.getMonth() + 1) ? "0" + (selectDate.getMonth() + 1)
: selectDate.getMonth() + 1 : selectDate.getMonth() + 1
}-${ }-${
selectDate.getDate() < 10 selectDate.getDate() < 10
? "0" + selectDate.getDate() ? "0" + selectDate.getDate()
: selectDate.getDate() : selectDate.getDate()
}`; }`;
let data = { let data = {
meetingRoomId: that.data.meetingTime.meetingRoomId, meetingRoomId: that.data.meetingTime.meetingRoomId,
startTime: meetingDate startTime: meetingDate
...@@ -1174,19 +1174,19 @@ create.Page({ ...@@ -1174,19 +1174,19 @@ create.Page({
endTimeDate.getMonth() + 1 < 10 endTimeDate.getMonth() + 1 < 10
? "0" + (endTimeDate.getMonth() + 1) ? "0" + (endTimeDate.getMonth() + 1)
: endTimeDate.getMonth() + 1 : endTimeDate.getMonth() + 1
}/${ }/${
endTimeDate.getDate() < 10 endTimeDate.getDate() < 10
? "0" + endTimeDate.getDate() ? "0" + endTimeDate.getDate()
: endTimeDate.getDate() : endTimeDate.getDate()
} ${ } ${
endTimeDate.getHours() < 10 endTimeDate.getHours() < 10
? "0" + endTimeDate.getHours() ? "0" + endTimeDate.getHours()
: endTimeDate.getHours() : endTimeDate.getHours()
}:${ }:${
endTimeDate.getMinutes() < 10 endTimeDate.getMinutes() < 10
? "0" + endTimeDate.getMinutes() ? "0" + endTimeDate.getMinutes()
: endTimeDate.getMinutes() : endTimeDate.getMinutes()
}:00`; }:00`;
this.$store.data.locationName = this.data.meetingTime.meetingRoomName; this.$store.data.locationName = this.data.meetingTime.meetingRoomName;
this.$store.data.roomId = this.data.meetingTime.meetingRoomId; this.$store.data.roomId = this.data.meetingTime.meetingRoomId;
this.update(); this.update();
...@@ -1200,28 +1200,31 @@ create.Page({ ...@@ -1200,28 +1200,31 @@ create.Page({
endTimeDate.getMonth() + 1 < 10 endTimeDate.getMonth() + 1 < 10
? "0" + (endTimeDate.getMonth() + 1) ? "0" + (endTimeDate.getMonth() + 1)
: endTimeDate.getMonth() + 1 : endTimeDate.getMonth() + 1
}/${ }/${
endTimeDate.getDate() < 10 endTimeDate.getDate() < 10
? "0" + endTimeDate.getDate() ? "0" + endTimeDate.getDate()
: endTimeDate.getDate() : endTimeDate.getDate()
} ${ } ${
endTimeDate.getHours() < 10 endTimeDate.getHours() < 10
? "0" + endTimeDate.getHours() ? "0" + endTimeDate.getHours()
: endTimeDate.getHours() : endTimeDate.getHours()
}:${ }:${
endTimeDate.getMinutes() < 10 endTimeDate.getMinutes() < 10
? "0" + endTimeDate.getMinutes() ? "0" + endTimeDate.getMinutes()
: endTimeDate.getMinutes() : endTimeDate.getMinutes()
}:00`; }:00`;
this.$store.data.locationName = this.data.meetingTime.meetingRoomName; this.$store.data.locationName = this.data.meetingTime.meetingRoomName;
this.$store.data.roomId = this.data.meetingTime.meetingRoomId; this.$store.data.roomId = this.data.meetingTime.meetingRoomId;
} }
if ((this.$store.data.locationName != this.$store.data.originalData.location.locationName) || (this.$store.data.roomId != this.$store.data.originalData.meetingRoomId)) { if (
this.$store.data.updateInfo = { this.$store.data.locationName !=
updateType: 'modify_location', this.$store.data.originalData.location.locationName ||
this.$store.data.roomId != this.$store.data.originalData.meetingRoomId
) {
(this.$store.data.updateInfo = {
updateType: "modify_location",
isUpate: true isUpate: true
}, }),
this.update(); this.update();
} }
...@@ -1292,8 +1295,8 @@ create.Page({ ...@@ -1292,8 +1295,8 @@ create.Page({
} }
); );
}, },
onMonthChange() { }, onMonthChange() {},
onYearChange() { }, onYearChange() {},
onSelectHasDisableDate() { onSelectHasDisableDate() {
my.alert({ my.alert({
content: "SelectHasDisableDate" content: "SelectHasDisableDate"
......
pages/place/place.axml
...@@ -13,8 +13,7 @@ ...@@ -13,8 +13,7 @@
</view> </view>
<block a:for="{{availableMeetingRoom}}"> <block a:for="{{availableMeetingRoom}}">
<view class="mettingRoom" data-locationName="{{item.meetingRoomFullName ? item.meetingRoomFullName : item.name}}" data-locationid="{{item.meetingRoomId}}" onTap="selectMeetingRoom"> <view class="mettingRoom" data-locationName="{{item.meetingRoomFullName ? item.meetingRoomFullName : item.name}}" data-locationid="{{item.meetingRoomId}}" onTap="selectMeetingRoom">
<view class="icon iconfont iconicon_room iconhuiyishi2"> <!--<view class="icon iconfont iconicon_room iconhuiyishi2"></view> -->
</view>
<view class="mettingRoomRight"> <view class="mettingRoomRight">
<view class="name"> <view class="name">
{{item.meetingRoomFullName ? item.meetingRoomFullName : item.name}} {{item.meetingRoomFullName ? item.meetingRoomFullName : item.name}}
...@@ -25,7 +24,7 @@ ...@@ -25,7 +24,7 @@
<text>{{item.capacityNum}}</text> <text>{{item.capacityNum}}</text>
</view> </view>
<view class="equipment" a:if="{{item.equipFacilityLabelList}}"> <view class="equipment" a:if="{{item.equipFacilityLabelList}}">
<text class="iconfont iconshebei iconicon_attender" style="margin-right: 9rpx;"></text> <text class="iconfont iconshebei icon_facility1" style="margin-right: 9rpx;"></text>
<text a:for="{{item.equipFacilityLabelList}}" a:for-item="equipmentList">{{equipmentList.name}}</text> <text a:for="{{item.equipFacilityLabelList}}" a:for-item="equipmentList">{{equipmentList.name}}</text>
</view> </view>
</view> </view>
......
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