Skip to content

S
schedule
Commit 835c4216 by fengzhaoyu
Options

merge

parents 3dc43fb1 353d6790
Showing with 151 additions and 182 deletions
api/binding.js deleted 100644 → 0
import { login } from "./login";
export default function http(data) {
if (getApp().globalData.token !== "") {
return new Promise((resolve, rejects) => {
dd.httpRequest({
headers: {
"Content-Type": "application/json;charset=UTF-8",
Authorization: `Bearer ${getApp().globalData.token}`
},
url: `${getApp().globalData.globalUrl2}${data.url}`,
method: data.method,
dataType: "json",
data: data.data,
success: function (res) {
if (res.data.code == 0) {
resolve(res);
} else {
dd.alert({
content: "网络异常",
buttonText: "确定"
});
}
},
fail: function (res) {
dd.alert({
content: "网络异常",
buttonText: "确定"
});
rejects(res);
}
});
});
} else {
return new Promise((resolve, rejects) => {
login().then(res => {
// const { oapiUser } = res.data.data;
// getApp().globalData.token = res.data.data.accessToken.access_token;
// getApp().globalData.name = res.data.data.oapiUser.name;
// getApp().globalData.userid = res.data.data.oapiUser.userid;
// getApp().globalData.avatar = res.data.data.oapiUser.avatar;
// getApp().globalData.userInfo = JSON.stringify({
// username: oapiUser.name,
// userId: oapiUser.userid,
// headUrl: oapiUser.avatar,
// platform: "dingtalk"
// });
dd.httpRequest({
headers: {
"Content-Type": "application/json",
Authorization: `Bearer ${getApp().globalData.token}`
},
url: `${getApp().globalData.globalUrl}${data.url}`,
method: data.method,
data: data.data,
dataType: "json",
success: function (res) {
resolve(res);
},
fail: function (res) {
rejects(res);
}
});
});
});
}
}
api/http.js
import { login } from "./login";
export default function http(data) {
if (getApp().globalData.token !== "") {
return new Promise((resolve, rejects) => {
dd.httpRequest({
headers: {
"Content-Type": "application/json;charset=UTF-8",
Authorization: `Bearer ${getApp().globalData.token}`
},
url: `${getApp().globalData.globalUrl}${data.url}`,
method: data.method,
dataType: "json",
data: data.data,
success: function (res) {
if (res.data.code == 0) {
resolve(res);
} else {
dd.alert({
content: res.data.msg || "网络异常",
buttonText: "确定"
});
}
},
fail: function (res) {
dd.alert({
content: "网络异常",
buttonText: "确定"
});
rejects(res);
}
});
});
} else {
return new Promise((resolve, rejects) => {
login().then(res => {
// const { oapiUser } = res.data.data;
// getApp().globalData.token = res.data.data.accessToken.access_token;
// // getApp().globalData.token = 'd2563d3a-7723-4f76-ad04-005815893328';
// getApp().globalData.name = res.data.data.oapiUser.name;
// getApp().globalData.userid = res.data.data.oapiUser.userid;
// getApp().globalData.avatar = res.data.data.oapiUser.avatar;
// getApp().globalData.userInfo = JSON.stringify({
// username: oapiUser.name,
// userId: oapiUser.userid,
// headUrl: oapiUser.avatar,
// platform: "dingtalk"
// });
dd.httpRequest({
headers: {
"Content-Type": "application/json",
Authorization: `Bearer ${getApp().globalData.token}`
},
url: `${getApp().globalData.globalUrl}${data.url}`,
method: data.method,
data: data.data,
dataType: "json",
success: function (res) {
resolve(res);
},
fail: function (res) {
rejects(res);
}
});
});
});
import login from "./login";
import xFetch from './xFetch';
export default async function http(options) {
if (!getApp().globalData.token) {
await login();
}
}
return xFetch(options);
}
\ No newline at end of file
api/login.js
let lock = false;
export async function login(data) {
export default async function login() {
if (lock == true) {
await waitLockRelease(20);
return Promise.resolve();
await waitLockRelease(50);
return;
}
lock = true;
return new Promise((resolve, reject) => {
......@@ -18,11 +18,8 @@ export async function login(data) {
method: 'POST',
dataType: 'json',
success: function (res) {
const { oapiUser } = res.data.data;
getApp().globalData.token = res.data.data.accessToken.access_token;
// getApp().globalData.token = 'd2563d3a-7723-4f76-ad04-005815893328';
getApp().globalData.name = res.data.data.oapiUser.name;
getApp().globalData.userid = res.data.data.oapiUser.userid;
getApp().globalData.avatar = res.data.data.oapiUser.avatar;
......@@ -35,16 +32,17 @@ export async function login(data) {
lock = false;
resolve(res)
},
fail: function (res) {
fail: function (err) {
lock = false;
resolve(res)
console.log('err', res)
reject(err);
console.log('err:' + err);
}
})
},
fail: function (err) {
console.log(err)
lock = false;
reject(err);
console.log('fail:' + err);
}
})
})
......
api/request.js
const app = getApp();
import $http from "./http";
import $binding from "./binding";
// 区域标签树
export function getRoomTree() {
return $http({
......@@ -199,18 +197,20 @@ export function meetingCollection(data) {
}
// 获取outlook页面授权地址
export function getOutlookUrl(data) {
return $binding({
return $http({
method: "POST",
data: "",
url: `/microsoft/getThirdLoginUrl?state=${data}`
url: `/microsoft/getThirdLoginUrl?state=${data}`,
type: 'binding'
});
}
// 发送给后端outlook code
export function authorizationCodeReplacementToken(data) {
return $binding({
return $http({
method: "get",
data: data,
url: `/microsoft/authorizationCodeReplacementToken`
url: `/microsoft/authorizationCodeReplacementToken`,
type: 'binding'
});
}
// 发送给后端outlook code
......@@ -232,18 +232,20 @@ export function unbindingApp(data) {
}
// 获取zoom授权页面
export function getZoomUrl(data) {
return $binding({
return $http({
method: "get",
data: "",
url: "/zoom/auth"
url: "/zoom/auth",
type: 'binding'
});
}
//
export function sendZoomCode(data) {
return $binding({
return $http({
method: "get",
data: data,
url: "/zoom/notice"
url: "/zoom/notice",
type: 'binding'
});
}
api/xFetch.js 0 → 100644
export default function xFetch({ url, method, data, type }) {
if (type == 'binding') {
url = `${getApp().globalData.globalUrl2}${url}`
} else {
url = `${getApp().globalData.globalUrl}${url}`
}
return new Promise((resolve, rejects) => {
dd.httpRequest({
headers: {
"Content-Type": "application/json;charset=UTF-8",
Authorization: `Bearer ${getApp().globalData.token}`
},
url: url,
method: method,
dataType: "json",
data: data,
// timeout: 280,
success: function (res) {
if (res.data.code == 0) {
resolve(res);
} else {
rejects(res);
dd.alert({
content: res.data.msg || "请求数据异常",
buttonText: "确定"
});
}
},
fail: function (err) {
rejects({ refresh: true });
}
});
});
}
app.js
......@@ -2,19 +2,19 @@ import { setGlobalStore } from "dd-store";
import exampleStore from "./stores/exampleStore";
import { checkFullScren } from "./utils/checkFullScren";
setGlobalStore(exampleStore);
import login from './api/login';
App({
onLaunch(options) {
// 第一次打开
// options.query == {number:1}
// console.info('App onLaunch');
login();
this.globalData.isFullScren = checkFullScren;
},
onShow(options) {
// 从后台被 scheme 重新打开
// options.query == {number:1}
},
globalData: {
isFullScren: false,
loading: false,
......@@ -23,9 +23,9 @@ App({
userid: "",
name: "",
userInfo: "",
globalUrl: "https://gateway-beta.mingwork.com", //beta地址
globalUrl2: "https://third-authentication-beta.mingwork.com"
// globalUrl: "https://gateway2.mingwork.com", // 线上地址
// globalUrl2: "https://third-authentication.mingwork.com" //beta地址
// globalUrl: "https://gateway-beta.mingwork.com", //beta地址
// globalUrl2: "https://third-authentication-beta.mingwork.com"
globalUrl: "https://gateway2.mingwork.com", // 线上地址
globalUrl2: "https://third-authentication.mingwork.com" //线上地址
}
});
components/relatedApp/relatedApp.axml
......@@ -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>
支持会议日程双向同步，实时同步日程信息等
......
components/relatedApp/relatedApp.js
......@@ -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(
......
package-lock.json
......@@ -9,8 +9,8 @@
},
"dingtalk-jsapi": {
"version": "2.10.3",
"resolved": "https://registry.npmjs.org/dingtalk-jsapi/-/dingtalk-jsapi-2.10.3.tgz",
"integrity": "sha512-ozfuwWzOKx4qgfs+ijdN2XgylB8xZ4zxetDp4ND272YDD5C9GJLo5GKhsFR6kQ/lnU0WIzBo2rYjEwZKtMrJxw==",
"resolved": "https://registry.npm.taobao.org/dingtalk-jsapi/download/dingtalk-jsapi-2.10.3.tgz",
"integrity": "sha1-reXC+Fj0rEEUPSlK4XKzTvrrleI=",
"requires": {
"promise-polyfill": "^7.1.0"
}
......@@ -23,8 +23,8 @@
},
"promise-polyfill": {
"version": "7.1.2",
"resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-7.1.2.tgz",
"integrity": "sha512-FuEc12/eKqqoRYIGBrUptCBRhobL19PS2U31vMNTfyck1FxPyMfgsXyW4Mav85y/ZN1hop3hOwRlUDok23oYfQ=="
"resolved": "https://registry.npm.taobao.org/promise-polyfill/download/promise-polyfill-7.1.2.tgz",
"integrity": "sha1-qwUwHYwoU2MBYi1pInYyJppwyjs="
},
"rrule": {
"version": "2.6.4",
......
pages/aa/aa.axml 0 → 100644
<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
pages/aa/aa.js 0 → 100644
import openLink from "dingtalk-jsapi/api/biz/util/openLink";
Page({
data: {},
onLoad() {
// openLink({
// url: 'https://us04web.zoom.us/j/73435684909?pwd=jaYcRdSfyjuCD1x-Jw8DU8AD3iWiTw'
// });
},
});
pages/aa/aa.json 0 → 100644
{}
\ No newline at end of file
pages/bindingApp/bindingApp.js
......@@ -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;
......
pages/createMeeting/createMeeting.json
{
"pullRefresh": false,
"usingComponents": {
"popup": "../../components/popup/index",
"list": "../../components/list/list",
......
pages/index/index.acss
......@@ -388,9 +388,9 @@
.iconicon_days {
position: absolute;
left: 7rpx;
top: 10rpx;
font-size: 27rpx;
left: 10rpx;
top: 12rpx;
font-size: 23rpx;
}
.tabBarView .iconicon_days {
......
pages/index/index.js
......@@ -28,6 +28,7 @@ import create from "dd-store";
let maxClickCount = 5;
create.Page({
data: {
refresh: false,
$data: null,
iconDay: currentDate.getDate(),
scheduleList: [],
......@@ -184,6 +185,12 @@ create.Page({
if (callBack) {
callBack();
}
}).catch(err => {
// if (err && err.refresh) {
// this.setData({
// refresh: true
// })
// }
});
},
//动态置顶
......@@ -425,7 +432,7 @@ create.Page({
}
// 取出DateMap的value值平铺到DateList
const DateList = [];
DateMap.forEach(function(value, key) {
DateMap.forEach(function (value, key) {
const keyDate = new Date(key);
const year = keyDate.getFullYear();
const month = keyDate.getMonth();
......@@ -458,13 +465,13 @@ create.Page({
value: `第${getWeekNumber(year, month, date)}周，${month +
1}月${date}日 - ${
rangeMonth2 == month ? "" : rangeMonth2 + 1 + "月"
}${rangeDay2}日`,
}${rangeDay2}日`,
dateStr: `${year}/${month + 1}/${date}-week`
});
}
// 有日程长度
if (value.length !== 0) {
value.sort(function(a, b) {
value.sort(function (a, b) {
return a.startTime.getTime() - b.startTime.getTime();
});
value.forEach((item, index) => {
......@@ -508,6 +515,8 @@ create.Page({
),
loading: false
});
//定位到当前日期
this.backToToday("first");
},
//日程上拉加载
lower() {
......@@ -690,7 +699,7 @@ create.Page({
createMeeting() {
dd.navigateTo({ url: "./../createMeeting/createMeeting" });
},
nextDetail: throttle(function(e) {
nextDetail: throttle(function (e) {
dd.navigateTo({
url: `./../meetingDetail/meetingDetail?scheduleItem=${encodeURIComponent(
JSON.stringify(e.target.dataset.item)
......@@ -773,7 +782,11 @@ create.Page({
maxClickCount--;
if (maxClickCount == 0) {
dd.alert({
content: "版本号220"
<<<<<<< Updated upstream
content: "版本号222"
=======
content: "0.0.5"
>>>>>>> Stashed changes
});
maxClickCount = 5;
}
......
pages/meetingDetail/meetingDetail.acss
......@@ -415,6 +415,7 @@ input {
.remindTimeContaint {
display: inline-block;
flex-wrap: nowrap;
max-width: 400rpx;
overflow: scroll;
white-space: nowrap;
......@@ -607,4 +608,8 @@ input {
.addPadding {
padding-bottom: 270rpx;
}
.lineThrough {
text-decoration: line-through;
}
\ No newline at end of file
pages/meetingDetail/meetingDetail.axml
......@@ -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">
......
pages/meetingDetail/meetingDetail.js
......@@ -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),
......
pages/meetingDetail/meetingDetail.json
{
"pullRefresh": false,
"usingComponents": {
"popup": "../../components/popup/index",
"task-list": "../../components/taskList/taskList",
......
pages/unbindApp/unbindApp.axml
......@@ -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