Commit f8a9ad0e by xiexiaoqin
parents 2b0826ba f43ac61c
{
"pages": [
"pages/index/index",
"pages/aa/aa",
"pages/meetingRoomList/meetingRoomList",
"pages/bindingApp/bindingApp",
"pages/meetingDetail/meetingDetail",
......@@ -16,5 +17,6 @@
],
"window": {
"allowsBounceVertical": "YES"
}
},
"pullRefresh": false
}
\ No newline at end of file
......@@ -2,7 +2,7 @@
<view class="sidebarContent" catchTap="preventSort">
<view class="sidebarLogo">
<template is="avater" data="{{item: userInfo}}"/>
<view>{{ userInfo.username }}</view>
<view>{{ userInfo.userName }}</view>
</view>
<view class="hasAssociated" a:if="{{relatedAppList.length !== 1}}">
<view class="associated">
......@@ -14,7 +14,7 @@
<view class="applicationMsg" data-item="{{item}}" catchTap="toAppDetails">
<view>
<view>
{{item.thirdUserIdentify}}
{{item.userName}}
</view>
<view>
支持会议日程双向同步,实时同步日程信息等
......
......@@ -21,7 +21,7 @@ create.Component({
let relatedAppList = this.data.relatedAppList;
let relatedAppPlatformList = this.data.relatedAppPlatformList;
relatedAppList.push({
thirdUserIdentify: this.$store.data.relatedAppNeedUpdate.name,
userName: this.$store.data.relatedAppNeedUpdate.name,
platform: this.$store.data.relatedAppNeedUpdate.platform
});
relatedAppPlatformList.push(
......
<view>
<web-view id="web-view-1" src="https://us04web.zoom.us/j/73435684909?pwd=jaYcRdSfyjuCD1x-Jw8DU8AD3iWiTw" onMessage="test"></web-view></view>
\ No newline at end of file
import openLink from "dingtalk-jsapi/api/biz/util/openLink";
Page({
data: {},
onLoad() {
// openLink({
// url: 'https://us04web.zoom.us/j/73435684909?pwd=jaYcRdSfyjuCD1x-Jw8DU8AD3iWiTw'
// });
},
});
{}
\ No newline at end of file
......@@ -2,7 +2,8 @@ import {
getOutlookUrl,
getZoomUrl,
authorizationCodeReplacementToken,
sendZoomCode
sendZoomCode,
getThirdUserPlatForm
} from "../../api/request";
import "dingtalk-jsapi/entry/mobile";
import openLink from "dingtalk-jsapi/api/biz/util/openLink";
......@@ -24,9 +25,6 @@ create.Page({
openLink({
url: res.data.data
});
// this.setData({
// url: res.data.data
// });
});
} else if (e.platform === "zoom") {
getZoomUrl("").then(res => {
......@@ -36,6 +34,26 @@ create.Page({
});
}
},
onShow() {
const interval = setInterval(() => {
getThirdUserPlatForm().then(res => {
let relatedAppPlatformList = [];
res.data.data.forEach(item => {
if (item.platform === this.data.platform) {
clearInterval(interval);
this.$store.data.relatedAppNeedUpdate = {
name: item.userName,
platform: this.data.platform
};
this.update();
dd.navigateBack({
delta: 1
});
}
});
});
}, 1000);
},
test(e) {
const code = e.detail.code;
const state = e.detail.state;
......
{
"pullRefresh": false,
"usingComponents": {
"popup": "../../components/popup/index",
"list": "../../components/list/list",
......
......@@ -782,7 +782,7 @@ create.Page({
maxClickCount--;
if (maxClickCount == 0) {
dd.alert({
content: "版本号222"
content: "0.0.5"
});
maxClickCount = 5;
}
......
......@@ -415,6 +415,7 @@ input {
.remindTimeContaint {
display: inline-block;
flex-wrap: nowrap;
max-width: 400rpx;
overflow: scroll;
white-space: nowrap;
......@@ -608,3 +609,7 @@ input {
.addPadding {
padding-bottom: 270rpx;
}
.lineThrough {
text-decoration: line-through;
}
\ No newline at end of file
......@@ -45,7 +45,7 @@
<view class="noPlace" a:if="{{!$data.locationName}}" onTap="nextPage" data-nextPage="location">
添加地点
</view>
<view class="hasplace" onTap="nextPage" data-nextPage="location" a:else>
<view class="hasplace {{mrReserveStatus === 'N' ? 'lineThrough' : ''}} " onTap="nextPage" data-nextPage="location" a:else>
{{$data.locationName}}
</view>
<view class=" icon iconfont iconicon_close close" a:if="{{!!$data.locationName&&(currentPeople == organizer)}}" data-close="location" catchTap="close">
......
......@@ -106,7 +106,8 @@ create.Page({
editType: '',
confirmAttendance: null,
isExpand: false,
placeholder: ''
placeholder: '',
mrReserveStatus: ''
},
onShow() {
// this.conflictPeople()
......@@ -227,6 +228,7 @@ create.Page({
}
}
this.setData({
mrReserveStatus: res.data.data.mrReserveStatus,
confirmAttendance: res.data.data.confirmAttendance === null ? -9 : res.data.data.confirmAttendance,
organizer: res.data.data.organizer,
'comListData.meetingWayModelId': res.data.data.meetingWayModel.model === null ? null : (res.data.data.meetingWayModel.model === 'dingtalk' ? 1 : 0),
......
{
"pullRefresh": false,
"usingComponents": {
"popup": "../../components/popup/index",
"task-list": "../../components/taskList/taskList",
......
<view class="searchHeader">
<view class="searchTime">
<view onTap="selectSearchTime">{{search.time.split('-')[0]}}年{{search.time.split('-')[1]}}月{{search.time.split('-')[2]}}日</view>
<view class="iconfont iconicon_open"></view>
<view class="iconfont iconicon_open" onTap="selectSearchTime"></view>
</view>
</view>
<view class="roomScrollView" style="{{canScroll ? '': 'overflow:hidden'}}"">
......
......@@ -1266,6 +1266,10 @@ create.Page({
};
getReserveRoomList(data).then(res => {
if (res.data.data) {
for (let value of res.data.data) {
value.name = `${this.getParentStr(value.locationId)}${value.name}`;
this.parentStr = "";
}
let reserveRoomList = res.data.data.map(item => {
let startTime = parseInt(
item.timeSlotWithMeetingVOS[0].reserveStartTime.substring(0, 2)
......@@ -1321,8 +1325,8 @@ create.Page({
}
);
},
onMonthChange() {},
onYearChange() {},
onMonthChange() { },
onYearChange() { },
onSelectHasDisableDate() {
my.alert({
content: "SelectHasDisableDate"
......
......@@ -3,14 +3,14 @@
<view class="platformImg {{item.platform}}">
</view>
<view class="platformName">
{{item.thirdUserIdentify}}
{{item.userName}}
</view>
</view>
<view class="platformMsg" a:if="{{item.platform === 'zoom'}}">
<view class="platformImg {{item.platform}}">
</view>
<view class="platformName">
{{item.thirdUserIdentify}}
{{item.userName}}
</view>
</view>
<view class="unBinding" onTap="showPopup">
......
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