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