Skip to content

S
schedule
Commit edf88b22 by xiexiaoqin
Options

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

parents 5c242a50 55bc1bf5
Showing with 201 additions and 140 deletions
api/http.js
...@@ -11,7 +11,7 @@ export default function http(data) { ...@@ -11,7 +11,7 @@ export default function http(data) {
method: data.method, method: data.method,
dataType: "json", dataType: "json",
data: data.data, data: data.data,
success: function (res) { success: function(res) {
if (res.data.code == 0) { if (res.data.code == 0) {
resolve(res); resolve(res);
} else { } else {
...@@ -21,7 +21,7 @@ export default function http(data) { ...@@ -21,7 +21,7 @@ export default function http(data) {
}); });
} }
}, },
fail: function (res) { fail: function(res) {
dd.alert({ dd.alert({
content: "网络异常", content: "网络异常",
buttonText: "确定" buttonText: "确定"
...@@ -53,10 +53,10 @@ export default function http(data) { ...@@ -53,10 +53,10 @@ export default function http(data) {
method: data.method, method: data.method,
data: data.data, data: data.data,
dataType: "json", dataType: "json",
success: function (res) { success: function(res) {
resolve(res); resolve(res);
}, },
fail: function (res) { fail: function(res) {
rejects(res); rejects(res);
} }
}); });
......
api/request.js
...@@ -310,3 +310,11 @@ export function authorizationCodeReplacementToken(data) { ...@@ -310,3 +310,11 @@ export function authorizationCodeReplacementToken(data) {
url: `https://third-authentication-beta.mingwork.com/microsoft/authorizationCodeReplacementToken` url: `https://third-authentication-beta.mingwork.com/microsoft/authorizationCodeReplacementToken`
}); });
} }
// 发送给后端outlook code
export function getThirdUserPlatForm(data) {
return $http({
method: "get",
data: data,
url: `/admin/third/user/getThirdUserPlatForm`
});
}
app.json
...@@ -11,7 +11,8 @@ ...@@ -11,7 +11,8 @@
"pages/uploadFile/uploadFile", "pages/uploadFile/uploadFile",
"pages/participantsDetail/participantsDetail", "pages/participantsDetail/participantsDetail",
"pages/applicationDetails/applicationDetails", "pages/applicationDetails/applicationDetails",
"pages/attendeeList/attendeeList" "pages/attendeeList/attendeeList",
"pages/outlookDetails/outlookDetails"
], ],
"window": { "window": {
"allowsBounceVertical": "YES" "allowsBounceVertical": "YES"
......
components/popup/index.axml
<view class="dm-popup {{show ? 'dm-popup-show' : ''}} {{ animation ? 'animation': '' }}" disable-scroll="{{disableScroll}}"> <view class="dm-popup {{show ? 'dm-popup-show' : ''}} {{ animation ? 'animation': '' }}">
<view class="dm-popup-mask" a:if="{{mask}}" onTap="onMaskTap" style="z-index: {{zIndex}}"></view> <view class="dm-popup-mask" a:if="{{mask}}" onTap="onMaskTap" style="z-index: {{zIndex}}"></view>
<view class="dm-popup-content {{className}} dm-popup-{{position}}" style="z-index: {{zIndex}}"> <view class="dm-popup-content {{className}} dm-popup-{{position}}" style="z-index: {{zIndex}}">
<view a:if="{{position == 'bottom'}}" class="close-icon"> <view a:if="{{position == 'bottom'}}" class="close-icon">
......
components/popup/index.js
...@@ -7,7 +7,6 @@ Component({ ...@@ -7,7 +7,6 @@ Component({
position: 'bottom', position: 'bottom',
mask: true, mask: true,
animation: true, animation: true,
disableScroll: true,
zIndex: 1000 zIndex: 1000
}, },
methods: { methods: {
......
components/relatedApp/relatedApp.acss
...@@ -91,10 +91,10 @@ ...@@ -91,10 +91,10 @@
color: rgba(27, 38, 61, .5) color: rgba(27, 38, 61, .5)
} }
.Outlook { .outlook {
background: url(../../assests/outlookLogo.png) center /100% 100%; background: url(../../assests/outlookLogo.png) center /100% 100%;
} }
.Zoom { .zoom {
background: url(../../assests/zoomLogo.png) center /100% 100%; background: url(../../assests/zoomLogo.png) center /100% 100%;
} }
\ No newline at end of file
components/relatedApp/relatedApp.axml
...@@ -4,17 +4,17 @@ ...@@ -4,17 +4,17 @@
<template is="avater" data="{{item: userInfo}}"/> <template is="avater" data="{{item: userInfo}}"/>
<view>{{ userInfo.username }}</view> <view>{{ userInfo.username }}</view>
</view> </view>
<view class="hasAssociated"> <view class="hasAssociated" a:if="{{relatedAppList.length === 1}}">
<view class="associated"> <view class="associated">
已关联应用 已关联应用
</view> </view>
<view class="applicationList"> <view class="applicationList" a:for="{{relatedAppList}}" a:if="{{item.platform !== 'dingTalk'}}">
<view class="applicationLogo Zoom"> <view class="applicationLogo {{item.platform}}">
</view> </view>
<view class="applicationMsg"> <view class="applicationMsg">
<view> <view>
<view> <view>
Outlook日历 {{item.thirdUserIdentify}}
</view> </view>
<view> <view>
支持会议日程双向同步，实时同步日程信息等 支持会议日程双向同步，实时同步日程信息等
...@@ -26,12 +26,12 @@ ...@@ -26,12 +26,12 @@
</view> </view>
</view> </view>
</view> </view>
<view class="unAssociated"> <view class="unAssociated" a:if="{{relatedAppList.length === 3}}">
<view class="associated"> <view class="associated">
可关联应用 可关联应用
</view> </view>
<view class="applicationList"> <view class="applicationList" a:if="{{relatedAppPlatformList.indexOf('outlook') === -1}}">
<view class="applicationLogo Outlook"> <view class="applicationLogo outlook">
</view> </view>
<view class="applicationMsg" catchTap="bindingOutlook"> <view class="applicationMsg" catchTap="bindingOutlook">
<view> <view>
...@@ -47,5 +47,22 @@ ...@@ -47,5 +47,22 @@
</view> </view>
</view> </view>
</view> </view>
<view class="applicationList" a:if="{{relatedAppPlatformList.indexOf('zoom') === -1}}">
<view class="applicationLogo zoom">
</view>
<view class="applicationMsg">
<view>
<view>
Zoom
</view>
<view>
支持快速发起音视频会议
</view>
</view>
<view class="operateIcon">
<text class="iconfont iconright"></text>
</view>
</view>
</view>
</view> </view>
</view> </view>
\ No newline at end of file
components/relatedApp/relatedApp.js
Component({ import { getThirdUserPlatForm } from "../../api/request";
import create from "dd-store";
create.Component({
mixins: [], mixins: [],
data: { data: {
userInfo: {} $data: null,
userInfo: {},
relatedAppList: [],
relatedAppPlatformList: []
}, },
props: {}, props: {},
didMount() { didMount() {
...@@ -9,9 +14,27 @@ Component({ ...@@ -9,9 +14,27 @@ Component({
userInfo: JSON.parse(getApp().globalData.userInfo) userInfo: JSON.parse(getApp().globalData.userInfo)
}); });
}, },
didUpdate() {}, didUpdate() {
if (this.$store.data.relatedAppNeedUpdate) {
this.$store.data.relatedAppNeedUpdate = false;
this.update();
this.getDate();
}
},
didUnmount() {}, didUnmount() {},
methods: { methods: {
getDate() {
getThirdUserPlatForm().then(res => {
let relatedAppPlatformList = [];
res.data.data.forEach(item => {
relatedAppPlatformList.push(item.platform);
});
this.setData({
relatedAppList: res.data.data,
relatedAppPlatformList: relatedAppPlatformList
});
});
},
preventSort() { preventSort() {
return false; return false;
}, },
......
pages/bindingOutlook/bindingOutlook.axml
<web-view id="web-view-1" src="{{url}}" onMessage="test"></web-view> <web-view id="web-view-1" src="{{url}}" onMessage="test">
\ No newline at end of file </web-view>
\ No newline at end of file
pages/bindingOutlook/bindingOutlook.js
...@@ -2,8 +2,10 @@ import { ...@@ -2,8 +2,10 @@ import {
getOutlookUrl, getOutlookUrl,
authorizationCodeReplacementToken authorizationCodeReplacementToken
} from "../../api/request"; } from "../../api/request";
Page({ import create from "dd-store";
create.Page({
data: { data: {
$data: null,
url: "" url: ""
}, },
onLoad() { onLoad() {
...@@ -16,12 +18,20 @@ Page({ ...@@ -16,12 +18,20 @@ Page({
}); });
}, },
test(e) { test(e) {
const code = e.detail.code;
console.log(code);
const data = { const data = {
code: code, code: code,
state: `${getApp().globalData.userid},${dd.corpId}` state: `${getApp().globalData.userid},${dd.corpId}`
}; };
authorizationCodeReplacementToken(data).then(res => { authorizationCodeReplacementToken(data).then(res => {
console.log(res); if (res.data.data) {
this.$store.data.relatedAppNeedUpdate = true;
this.update();
dd.navigateBack({
delta: 1
});
}
}); });
} }
}); });
pages/meetingRoomList/meetingRoomList.acss
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
left: 0; left: 0;
top: 0; top: 0;
z-index: 99; z-index: 99;
border-bottom: 1px solid rgba(25, 31, 37, 0.12); border-bottom: 2rpx solid rgba(25, 31, 37, 0.12);
font-size: 26rpx; font-size: 26rpx;
letter-spacing: -0.31rpx; letter-spacing: -0.31rpx;
height: 96rpx; height: 96rpx;
...@@ -107,11 +107,7 @@ ...@@ -107,11 +107,7 @@
height: 24rpx; height: 24rpx;
width: 24rpx; width: 24rpx;
border-radius: 2rpx; border-radius: 2rpx;
box-sizing: border-box; margin: 2rpx;
margin-top: 6rpx;
margin-right: 6rpx;
background: #F3F6FA;
border: 1px solid rgba(27, 38, 61, 0.10);
} }
.reserveRoomTimeBarBg>view:nth-of-type(47), .reserveRoomTimeBarBg>view:nth-of-type(48) { .reserveRoomTimeBarBg>view:nth-of-type(47), .reserveRoomTimeBarBg>view:nth-of-type(48) {
...@@ -124,19 +120,22 @@ ...@@ -124,19 +120,22 @@
.expired { .expired {
background: url(../../assests/cancel.png) center /100% 100% !important; background: url(../../assests/cancel.png) center /100% 100% !important;
border: 1px solid rgba(27, 38, 61, 0.04) !important; border: 2rpx solid rgba(27, 38, 61, 0.04) !important;
} }
.reservation { .reservation {
background: #F3F6FA!important; background: #F3F6FA!important;
border: 1px solid rgba(27, 38, 61, 0.1) !important; border: 2rpx solid rgba(27, 38, 61, 0.1) !important;
} }
.occupied { .occupied {
background: rgba(10, 10, 10, 0.2) !important; background: rgba(10, 10, 10, 0.2) !important;
border: 1rpx solid rgba(27, 38, 61, 0.1) !important; border: 1rpx solid rgba(27, 38, 61, 0.1) !important;
} }
.myOccupied {
background: rgba(234, 12, 40, 1) !important;
border: 1rpx solid rgba(27, 38, 61, 0.1) !important;
}
.myReservation { .myReservation {
background: rgba(234, 12, 40, 1); background: rgba(234, 12, 40, 1);
border: 1rpx solid rgba(27, 38, 61, 0.1); border: 1rpx solid rgba(27, 38, 61, 0.1);
...@@ -144,7 +143,7 @@ ...@@ -144,7 +143,7 @@
.reserveRoomTimeBarNum { .reserveRoomTimeBarNum {
display: flex; display: flex;
margin-top: 12rpx; margin-top: 10rpx;
font-size: 20rpx; font-size: 20rpx;
font-family: DINAlternate-Bold, DINAlternate; font-family: DINAlternate-Bold, DINAlternate;
font-weight: bold; font-weight: bold;
...@@ -153,9 +152,7 @@ ...@@ -153,9 +152,7 @@
.reserveRoomTimeBarNum>view { .reserveRoomTimeBarNum>view {
text-align: center; text-align: center;
margin-right: 6rpx;
flex: 1; flex: 1;
width: 24rpx;
} }
/* 弹框的样式 */ /* 弹框的样式 */
...@@ -163,18 +160,23 @@ ...@@ -163,18 +160,23 @@
.modalContent, .calendarMoadl { .modalContent, .calendarMoadl {
width: 100%; width: 100%;
height: 732rpx; height: 732rpx;
overflow: hidden;
margin-top: 10rpx; margin-top: 10rpx;
} }
.modalContent {
position: relative;
}
.modalHeader { .modalHeader {
height: 32rpx; position: relative;
line-height: 1; right: 32rpx;
top: -32rpx;
font-size: 32rpx; font-size: 32rpx;
padding: 0 32rpx;
text-align: right; text-align: right;
color: #0A0A0A; color: #0A0A0A;
box-sizing: border-box; box-sizing: border-box;
z-index: 99999;
height: 32rpx;
} }
.modalHeader>view { .modalHeader>view {
...@@ -184,7 +186,7 @@ ...@@ -184,7 +186,7 @@
.changeDay { .changeDay {
width: 100%; width: 100%;
border-bottom: 1px solid rgba(25, 31, 37, 0.12); border-bottom: 2rpx solid rgba(25, 31, 37, 0.12);
font-size: 30rpx; font-size: 30rpx;
text-align: center; text-align: center;
display: flex; display: flex;
...@@ -218,12 +220,6 @@ ...@@ -218,12 +220,6 @@
width: 750rpx; width: 750rpx;
} }
.modalOccupyTimeSlot>view {
height: 80rpx;
width: 100%;
padding-left: 32rpx;
}
.OccupyTimeList { .OccupyTimeList {
height: 100rpx; height: 100rpx;
width: 100%; width: 100%;
...@@ -248,7 +244,7 @@ ...@@ -248,7 +244,7 @@
height: 100rpx; height: 100rpx;
line-height: 100rpx; line-height: 100rpx;
box-sizing: border-box; box-sizing: border-box;
border-bottom: 1px solid rgba(25, 31, 37, 0.12); border-bottom: 2rpx solid rgba(25, 31, 37, 0.12);
} }
.OccupyTimeList>view:nth-of-type(2) view { .OccupyTimeList>view:nth-of-type(2) view {
......
pages/meetingRoomList/meetingRoomList.axml
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
<view class="iconfont iconicon_open"></view> <view class="iconfont iconicon_open"></view>
</view> </view>
</view> </view>
<scroll-view scroll-y="{{canScroll}}" class="roomScrollView"> <view class="roomScrollView" style="{{canScroll ? '': 'overflow:hidden'}}"">
<view class="reserveMeeting"> <view class="reserveMeeting">
<view class="meetingRoomContent" a:for="{{reserveRoomList}}" data-roomid="{{item.meetingRoomId}}" data-roomname="{{item.meetingRoomFullName}}" onTap="changeRoomTime"> <view class="meetingRoomContent" a:for="{{reserveRoomList}}" data-roomid="{{item.meetingRoomId}}" data-roomname="{{item.name}}" onTap="changeRoomTime">
<view class="roomMessage"> <view class="roomMessage">
<view class="reserveRoomMsg"> <view class="reserveRoomMsg">
<view class="reserveRoomTitle"> <view class="reserveRoomTitle">
...@@ -28,7 +28,9 @@ ...@@ -28,7 +28,9 @@
<block a:for="{{item.timeSlotWithMeetingVOS}}" a:for-item="item2" a:for-index="index2"> <block a:for="{{item.timeSlotWithMeetingVOS}}" a:for-item="item2" a:for-index="index2">
<view class="expired" a:if="{{item2.reserveStatus === 'expired'}}"> <view class="expired" a:if="{{item2.reserveStatus === 'expired'}}">
</view> </view>
<view class="occupied" a:if="{{item2.reserveStatus === 'occupied'}}"> <view class="occupied" a:if="{{item2.reserveStatus === 'occupied' && item2.scheduleList[0].organizer !== userId}}">
</view>
<view class="myOccupied" a:if="{{item2.reserveStatus === 'occupied' && item2.scheduleList[0].organizer === userId}}">
</view> </view>
<view class="reservation" a:if="{{item2.reserveStatus === 'reservation'}}"> <view class="reservation" a:if="{{item2.reserveStatus === 'reservation'}}">
</view> </view>
...@@ -50,67 +52,67 @@ ...@@ -50,67 +52,67 @@
<view class="noRoomTip">当前暂无会议室</view> <view class="noRoomTip">当前暂无会议室</view>
</view> </view>
</view> </view>
</scroll-view> <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" onTap="onDetermine">
<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> <view class="modalTimeSlot">
<text a:if="{{dataNum == '3'}}">{{meetingTime.date.split('/')[1]}}月{{meetingTime.date.split('/')[2]}}日</text> <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>
</view> <view class="changeDay">
</view> <view class="{{dataNum == '0' ? 'dataNumSelected' : ''}}" onTap="chooseDate" data-num="0">
<scroll-view scroll-y='{{true}}' class="modalOccupyTimeSlot" scroll-into-view="{{toThisTime}}"> <view>{{TimeSlot.todayTime.split('/')[1]}}月{{TimeSlot.todayTime.split('/')[2]}}日</view>
<view class="OccupyTimeList" a:for="{{modalList}}" data-index="{{index}}" onTap="onChangeModalTime" id="{{item.reserveStartTime.substr(11,15)}}"> <view>今天</view>
<view>
<view a:if="{{item.status==='BeOverdue'}}" class="beOverdue">
<text class="iconfont iconicon_Agreed1"></text>
</view> </view>
<view a:elif="{{item.status==='Uncheck'}}" class="Unchecked"> <view class="{{dataNum == '1' ? 'dataNumSelected' : ''}}" onTap="chooseDate" data-num="1">
<text class="iconfont iconicon_uncheck"></text> <view>{{TimeSlot.tomorrowTime.split('/')[1]}}月{{TimeSlot.tomorrowTime.split('/')[2]}}日</view>
<view>明天</view>
</view> </view>
<view a:elif="{{item.status==='checked'}}" class="checked"> <view class="{{dataNum == '2' ? 'dataNumSelected' : ''}}" onTap="chooseDate" data-num="2">
<text class="iconfont iconicon_Agreed1"></text> <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>
<text a:if="{{dataNum == '3'}}">{{meetingTime.date.split('/')[1]}}月{{meetingTime.date.split('/')[2]}}日</text>
</view>
</view> </view>
</view> </view>
<view> <scroll-view scroll-y='{{true}}' class="modalOccupyTimeSlot" scroll-into-view="{{toThisTime}}">
<view>{{item.reserveStartTime.substr(10,15)}} ~ {{item.reserveEndTime.substr(10,15)}}</view> <view class="OccupyTimeList" a:for="{{modalList}}" data-index="{{index}}" onTap="onChangeModalTime" id="{{item.reserveStartTime.substr(11,15)}}">
<view class="expiredStatus" a:if="{{item.reserveStatus === 'expired'}}"> <view>
<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>
</view> </scroll-view>
</view> </view>
</scroll-view> <view class="calendarMoadl" a:else>
</view> <view class="calendarTip">
<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" /> <calendar type="single" haveYear="{{false}}" selectedDate="{{meetingTime.date}}" onSelect="handleSelect" onMonthChange="onMonthChange" onYearChange="onYearChange" onSelectHasDisableDate="onSelectHasDisableDate" />
</view> </view>
</popup> </popup>
\ No newline at end of file \ No newline at end of file
pages/meetingRoomList/meetingRoomList.js
...@@ -38,8 +38,7 @@ create.Page({ ...@@ -38,8 +38,7 @@ create.Page({
20, 20,
21, 21,
22, 22,
23, 23
24
], ],
search: { search: {
category: "", category: "",
...@@ -71,11 +70,12 @@ create.Page({ ...@@ -71,11 +70,12 @@ create.Page({
tomorrowTime: "", tomorrowTime: "",
afterTomorrowTime: "", afterTomorrowTime: "",
customTime: "" customTime: ""
} },
userId: ""
}, },
onLoad(query) { onLoad(query) {
let date = new Date(this.$store.data.startTime.replace(/-/g, "/")); // let date = new Date(this.$store.data.startTime.replace(/-/g, "/"));
// let date = new Date(); let date = new Date();
let year = date.getFullYear(); let year = date.getFullYear();
let month = padZero(date.getMonth() + 1); let month = padZero(date.getMonth() + 1);
let day = padZero(date.getDate()); let day = padZero(date.getDate());
...@@ -96,7 +96,8 @@ create.Page({ ...@@ -96,7 +96,8 @@ create.Page({
)}/${padZero(tomorrowTime.getDate())}`, )}/${padZero(tomorrowTime.getDate())}`,
"TimeSlot.afterTomorrowTime": `${year}/${padZero( "TimeSlot.afterTomorrowTime": `${year}/${padZero(
afterTomorrowTime.getMonth() + 1 afterTomorrowTime.getMonth() + 1
)}/${padZero(afterTomorrowTime.getDate())}` )}/${padZero(afterTomorrowTime.getDate())}`,
userId: getApp().globalData.userid
}); });
this.getPageData(); this.getPageData();
}, },
...@@ -1216,18 +1217,19 @@ create.Page({ ...@@ -1216,18 +1217,19 @@ create.Page({
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 ( if (this.$store.data.originalData && this.$store.data.locationName) {
this.$store.data.locationName != if (
this.$store.data.originalData.location.locationName || this.$store.data.locationName !=
this.$store.data.roomId != this.$store.data.originalData.meetingRoomId this.$store.data.originalData.location.locationName ||
) { this.$store.data.roomId != this.$store.data.originalData.meetingRoomId
(this.$store.data.updateInfo = { ) {
updateType: "modify_location", (this.$store.data.updateInfo = {
isUpate: true updateType: "modify_location",
}), isUpate: true
this.update(); }),
this.update();
}
} }
dd.navigateBack({ dd.navigateBack({
delta: 2 delta: 2
}); });
......
pages/place/place.axml
...@@ -24,7 +24,7 @@ ...@@ -24,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 icon_facility1" style="margin-right: 9rpx;"></text> <text class="iconfont iconshebei iconicon_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>
......
stores/exampleStore.js
class Store { class Store {
data = { data = {
locationName: '', locationName: "",
participatorList: [], participatorList: [],
participatorUserId: [], // 参会人的userId participatorUserId: [], // 参会人的userId
roomId: '', roomId: "",
startTime: '', startTime: "",
endTime: '', endTime: "",
originUsers: [], originUsers: [],
originUsersId: [], originUsersId: [],
originalData: null, originalData: null,
indexNeedUpdate: false, indexNeedUpdate: false,
tabBarIndex: '0', relatedAppNeedUpdate: false,
updateInfo: { tabBarIndex: "0",
updateType: '', updateInfo: {
isUpate: false updateType: "",
}, isUpate: false
} }
};
} }
export default new Store() export default new Store();
\ No newline at end of file
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