Skip to content

S
schedule
Commit 3f63a050 by liang ce
Options

修改绑定第三方账号流程

parent 38cb4896
Showing with 203 additions and 102 deletions
app.json
......@@ -3,7 +3,7 @@
"pages/index/index",
"pages/aa/aa",
"pages/meetingRoomList/meetingRoomList",
"pages/bindingApp/bindingApp",
"pages/appDetails/appDetails",
"pages/meetingDetail/meetingDetail",
"pages/excutorList/excutorList",
"pages/createMeeting/createMeeting",
......@@ -12,8 +12,7 @@
"pages/uploadFile/uploadFile",
"pages/participantsDetail/participantsDetail",
"pages/applicationDetails/applicationDetails",
"pages/attendeeList/attendeeList",
"pages/unbindApp/unbindApp"
"pages/attendeeList/attendeeList"
],
"window": {
"allowsBounceVertical": "YES"
......
components/relatedApp/relatedApp.axml
......@@ -11,7 +11,7 @@
<view class="applicationList" a:for="{{relatedAppList}}" a:if="{{item.platform !== 'dingTalk'}}">
<view class="applicationLogo {{item.platform}}">
</view>
<view class="applicationMsg" data-item="{{item}}" catchTap="toAppDetails">
<view class="applicationMsg" data-name="{{item.userName}}" data-platform="{{item.platform}}" catchTap="toAppDetails">
<view>
<view>
{{item.userName}}
......@@ -21,7 +21,7 @@
</view>
</view>
<view class="operateIcon">
<text class="iconfont iconicon_setting1"></text>
<text class="iconfont iconright"></text>
</view>
</view>
</view>
......@@ -33,7 +33,7 @@
<view class="applicationList" a:if="{{relatedAppPlatformList.indexOf('outlook') === -1}}">
<view class="applicationLogo outlook">
</view>
<view class="applicationMsg" data-platform="outlook" catchTap="bindingApp">
<view class="applicationMsg" data-name="" data-platform="outlook" catchTap="toAppDetails">
<view>
<view>
Outlook日历
......@@ -50,7 +50,7 @@
<view class="applicationList" a:if="{{relatedAppPlatformList.indexOf('zoom') === -1}}">
<view class="applicationLogo zoom">
</view>
<view class="applicationMsg" data-platform="zoom" catchTap="bindingApp">
<view class="applicationMsg" data-name="" data-platform="zoom" catchTap="toAppDetails">
<view>
<view>
Zoom
......
components/relatedApp/relatedApp.js
......@@ -56,16 +56,9 @@ create.Component({
preventSort() {
return false;
},
bindingApp(e) {
dd.navigateTo({
url: `./../bindingApp/bindingApp?platform=${e.target.dataset.platform}`
});
},
toAppDetails(e) {
dd.navigateTo({
url: `./../unbindApp/unbindApp?item=${JSON.stringify(
e.target.dataset.item
)}`
url: `./../appDetails/appDetails?userName=${e.target.dataset.name}&platform=${e.target.dataset.platform}`
});
}
}
......
pages/appDetails/appDetails.acss 0 → 100644
.platformMsg {
display: flex;
padding: 26rpx 32rpx;
align-items: center;
background: #FFFFFF;
margin-top: 16rpx;
}
.platformImg {
width: 60rpx;
height: 60rpx;
margin-right: 24rpx;
}
.outlook {
background: url(../../assests/outlookLogo.png) center /100% 100%;
}
.zoom {
background: url(../../assests/zoomLogo.png) center /100% 100%;
}
.title {
font-size: 28rpx;
color: rgba(25, 31, 37, 1);
line-height: 34rpx;
}
.tip {
font-size: 20rpx;
line-height: 26rpx;
color: rgba(25, 31, 37, .56)
}
.bindBtn {
height: 112rpx;
line-height: 112rpx;
text-align: center;
margin-top: 16rpx;
background: #FFFFFF;
}
.binding {
color: rgba(10, 10, 10, 1);
}
.unBinding {
color: rgba(242, 86, 67, 1);
}
.loadingBtn {
color: rgba(10, 10, 10, 0.4) !important;
}
.loadingToast {
position: fixed;
left: 0;
top: 0;
width: 100%;
height: 100%;
display: flex;
align-items: center;
justify-content: center;
}
.loadingToast view {
font-size: 28rpx;
color: #FFFFFF;
padding: 18rpx 26rpx;
border-radius: 40rpx;
background: rgba(0, 0, 0, .59)
}
\ No newline at end of file
pages/appDetails/appDetails.axml 0 → 100644
<view class="relatedAppPage">
<view class="platformMsg" a:if="{{platform === 'outlook'}}">
<view class="platformImg {{platform}}">
</view>
<view class="platformName" a:if="{{!name}}">
<view class="title">
Outlook日历
</view>
<view class="tip">
支持会议日程双向同步，实时同步日程信息等
</view>
</view>
<view class="platformName" a:else>
{{name}}
</view>
</view>
<view class="platformMsg" a:if="{{platform === 'zoom'}}">
<view class="platformImg {{platform}}">
</view>
<view class="platformName" a:if="{{!name}}">
<view class="title">
Zoom
</view>
<view class="tip">
支持快速发起音视频会议
</view>
</view>
<view class="platformName" a:else>
{{name ? name : 'outlook'}}
</view>
</view>
<view class="{{isBind ? 'unBinding': 'binding'}} bindBtn {{isLoading ? 'loadingBtn' : ''}}">
<text onTap="{{isBind ? 'unbind' : 'bindApp'}}">{{isBind ? '解绑' : '绑定'}}</text>
</view>
</view>
<view class="loadingToast" a:if="{{isLoading}}">
<view>
账号关联中···
</view>
</view>
<selectpopup showSelectPopup="{{showSelectPopup}}" selectPopupList="{{selectPopupList}}" onSelectPopup="onSelectPopup" onSelectPopupCancel="onSelectPopupCancel"></selectpopup>
\ No newline at end of file
pages/bindingApp/bindingApp.js → pages/appDetails/appDetails.js
import {
getOutlookUrl,
getZoomUrl,
getThirdUserPlatForm
getThirdUserPlatForm,
unbindingApp
} from "../../api/request";
import "dingtalk-jsapi/entry/mobile";
import openLink from "dingtalk-jsapi/api/biz/util/openLink";
import create from "dd-store";
let interval = "";
let requestNum = 0;
create.Page({
data: {
$data: null,
url: "",
platform: "",
appName: ""
name: "",
isBind: false,
isLoading: false,
showSelectPopup: false,
selectPopupList: [{ text: "取消关联" }]
},
onLoad(e) {
console.log(e);
this.setData({
platform: e.platform,
appName: e.platform
name: e.userName,
isBind: e.userName ? true : false
});
},
onShow() {
const interval = setInterval(() => {
onShow() {},
sendRequest() {
let that = this;
interval = setInterval(() => {
if (requestNum >= 300) {
requestNum = 0;
that.setData({
isBind: true,
isLoading: false
});
clearInterval(interval);
}
requestNum++;
getThirdUserPlatForm().then(res => {
let relatedAppPlatformList = [];
res.data.data.forEach(item => {
if (item.platform === this.data.platform) {
clearInterval(interval);
this.setData({
name: item.userName,
isBind: true,
isLoading: false
});
this.$store.data.relatedAppNeedUpdate = {
name: item.userName,
platform: this.data.platform
};
this.update();
dd.navigateBack({
delta: 1
});
}
});
});
}, 1000);
},
bindApp() {
if (this.data.isLoading) {
return false;
}
this.setData({
isLoading: true
});
this.sendRequest();
if (this.data.platform === "outlook") {
let data = `${getApp().globalData.userid},${dd.corpId}`;
getOutlookUrl(data).then(res => {
......@@ -58,5 +86,35 @@ create.Page({
});
});
}
},
unbind() {
unbindingApp(this.data.platform).then(res => {
if (res.data.data) {
this.setData({
name: "",
isBind: false
});
this.$store.data.relatedAppNeedUpdate = "1";
this.update();
}
});
},
onSelectPopup(e) {
if (e.target.dataset.item.text === "取消关联") {
this.unbind();
}
},
onSelectPopupCancel() {
this.setData({
showSelectPopup: false
});
},
showPopup() {
this.setData({
showSelectPopup: true
});
},
onUnload() {
clearInterval(interval);
}
});
pages/bindingApp/bindingApp.acss deleted 100644 → 0
.relatedAppPage {
height: 100vh;
background: #FFFFFF;
}
.platformMsg {
display: flex;
padding: 34rpx 32rpx;
align-items: center;
}
.platformImg {
width: 60rpx;
height: 60rpx;
margin-right: 24rpx;
}
.outlook {
background: url(../../assests/outlookLogo.png) center /100% 100%;
}
.zoom {
background: url(../../assests/zoomLogo.png) center /100% 100%;
}
.unBinding {
width: 686rpx;
height: 96rpx;
margin: 22rpx auto;
border-radius: 48rpx;
border: 2rpx solid rgba(222, 222, 222, 1);
text-align: center;
line-height: 0.96rem;
font-size: 34rpx;
color: rgba(242, 86, 67, 1);
}
\ No newline at end of file
pages/bindingApp/bindingApp.axml deleted 100644 → 0
<view class="relatedAppPage">
<view class="platformMsg" a:if="{{platform === 'outlook'}}">
<view class="platformImg {{platform}}">
</view>
<view class="platformName">
{{appName}}
</view>
</view>
<view class="platformMsg" a:if="{{platform === 'zoom'}}">
<view class="platformImg {{platform}}">
</view>
<view class="platformName">
{{zoom}}
</view>
</view>
<view class="unBinding" onTap="bindApp">
关联{{platform}}
</view>
</view>
<selectpopup showSelectPopup="{{showSelectPopup}}" selectPopupList="{{selectPopupList}}" onSelectPopup="onSelectPopup" onSelectPopupCancel="onSelectPopupCancel"></selectpopup>
\ No newline at end of file
pages/meetingRoomList/meetingRoomList.acss
......@@ -132,10 +132,12 @@
background: rgba(10, 10, 10, 0.2) !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 {
background: rgba(234, 12, 40, 1);
border: 1rpx solid rgba(27, 38, 61, 0.1);
......@@ -179,11 +181,6 @@
height: 32rpx;
}
.modalHeader>view {
flex: 1;
color: #191F25;
}
.changeDay {
width: 100%;
border-bottom: 2rpx solid rgba(25, 31, 37, 0.12);
......
pages/meetingRoomList/meetingRoomList.axml
......@@ -55,8 +55,8 @@
<view>
<popup show="{{isShowModal}}" onClose="onCancel" position="bottom">
<view a:if="{{!isShowCalendar}}" class="modalContent">
<view class="modalHeader" onTap="onDetermine">
确定
<view class="modalHeader">
<text onTap="onDetermine">确定</text>
</view>
<view class="modalTimeSlot">
<text a:if="{{!modalFooter.startTime || !modalFooter.endTime}}">请选择会议时间</text>
......
pages/meetingRoomList/meetingRoomList.js
......@@ -77,26 +77,23 @@ create.Page({
parentStr: "",
onLoad(query) {
let date = new Date(this.$store.data.startTime.replace(/-/g, "/"));
// let date = new Date();
let year = date.getFullYear();
let month = padZero(date.getMonth() + 1);
let day = padZero(date.getDate());
let hour = padZero(date.getHours());
let minute = padZero(date.getMinutes());
let todayTime = `${year}/${padZero(date.getMonth() + 1)}/${padZero(
date.getDate()
)}`;
let tomorrowTime = new Date(date);
let toDayDate = new Date();
let tomorrowTime = new Date(toDayDate);
tomorrowTime.setDate(tomorrowTime.getDate() + 1);
let afterTomorrowTime = new Date(date);
let afterTomorrowTime = new Date(toDayDate);
afterTomorrowTime.setDate(afterTomorrowTime.getDate() + 2);
this.setData({
"search.time": `${year}-${month}-${day}`,
"TimeSlot.todayTime": todayTime,
"TimeSlot.tomorrowTime": `${year}/${padZero(
"TimeSlot.todayTime": `${toDayDate.getFullYear()}/${padZero(
toDayDate.getMonth() + 1
)}/${padZero(toDayDate.getDate())}`,
"TimeSlot.tomorrowTime": `${tomorrowTime.getFullYear()}/${padZero(
tomorrowTime.getMonth() + 1
)}/${padZero(tomorrowTime.getDate())}`,
"TimeSlot.afterTomorrowTime": `${year}/${padZero(
"TimeSlot.afterTomorrowTime": `${afterTomorrowTime.getFullYear()}/${padZero(
afterTomorrowTime.getMonth() + 1
)}/${padZero(afterTomorrowTime.getDate())}`,
userId: getApp().globalData.userid
......@@ -1325,8 +1322,8 @@ create.Page({
}
);
},
onMonthChange() { },
onYearChange() { },
onMonthChange() {},
onYearChange() {},
onSelectHasDisableDate() {
my.alert({
content: "SelectHasDisableDate"
......
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