Skip to content

S
schedule
Commit d46c727f by xiexiaoqin
Options

merge

parents 69aad08e 5540b7bc
Showing with 110 additions and 77 deletions
config.js
export const globalUrl = "https://gateway-beta.mingwork.com";
export const globalUrl2 = "https://third-authentication-beta.mingwork.com";
\ No newline at end of file
export const globalUrl2 = "https://third-authentication-beta.mingwork.com";
fonts/iconfont.eot
No preview for this file type
fonts/iconfont.js
This source diff could not be displayed because it is too large. You can view the blob instead.
fonts/iconfont.json
......@@ -6,6 +6,27 @@
"description": "",
"glyphs": [
{
"icon_id": "14283585",
"name": "icon_icon",
"font_class": "icon_icon",
"unicode": "e748",
"unicode_decimal": 59208
},
{
"icon_id": "14034573",
"name": "icon_uncheck",
"font_class": "icon_uncheck",
"unicode": "e747",
"unicode_decimal": 59207
},
{
"icon_id": "13973566",
"name": "icon_room2",
"font_class": "icon_room",
"unicode": "e746",
"unicode_decimal": 59206
},
{
"icon_id": "13861351",
"name": "icon_repeat",
"font_class": "icon_repeat1",
......
fonts/iconfont.svg
......@@ -20,6 +20,15 @@ Created by iconfont
/>
<missing-glyph />
<glyph glyph-name="icon_icon" unicode="&#59208;" d="M784.384 688.64h-64c0 35.328-28.672 64-64 64H207.36C172.032 752.64 143.36 723.968 143.36 688.64v-448.512c0-35.328 28.672-64 64-64v-64c-70.656 0-128 57.344-128 128V688.64c0 70.656 57.344 128 128 128h448.512c71.168 0 128.512-57.344 128.512-128z m-544.768-609.28V528.384c0 70.656 57.344 128 128 128h448.512c70.656 0 128-57.344 128-128v-448.512c0-70.656-57.344-128-128-128H367.616c-70.656-0.512-128 56.832-128 127.488z" horiz-adv-x="1024" />
<glyph glyph-name="icon_uncheck" unicode="&#59207;" d="M512 30.72c-195.072 0-353.28 158.208-353.28 353.28s158.208 353.28 353.28 353.28 353.28-158.208 353.28-353.28-158.208-353.28-353.28-353.28z m0-64c230.4 0 417.28 186.88 417.28 417.28S742.4 801.28 512 801.28 94.72 614.4 94.72 384 281.6-33.28 512-33.28z" horiz-adv-x="1024" />
<glyph glyph-name="icon_room" unicode="&#59206;" d="M480.256 429.568c-17.408 0-31.744-14.336-31.744-31.744 0-17.408 14.336-31.744 31.744-31.744s31.744 14.336 31.744 31.744c0 17.92-14.336 31.744-31.744 31.744z m0-128c-17.408 0-31.744-14.336-31.744-31.744 0-17.408 14.336-31.744 31.744-31.744s31.744 14.336 31.744 31.744c0 17.408-14.336 31.744-31.744 31.744z m180.736 342.016v-640.512h191.488V643.584h-191.488z m0 64h233.984c11.776 0 21.504-9.728 21.504-21.504v-726.016c0-11.776-9.728-21.504-21.504-21.504H129.024c-11.776 0-21.504 9.728-21.504 21.504v716.8c0 9.728 6.656 18.432 15.872 20.48l510.976 131.072c11.264 3.072 23.04-4.096 26.112-15.36 0.512-1.536 0.512-3.584 0.512-5.12v-100.352z" horiz-adv-x="1024" />
<glyph glyph-name="icon_repeat1" unicode="&#59205;" d="M115.2 233.472l-13.824-7.168c-25.6-12.8-53.248 13.824-41.472 40.448l32.768 74.752 56.832 128c5.632 14.336 21.504 21.504 36.352 17.408l134.656-37.888L407.04 424.96c26.624-7.68 30.208-44.544 5.632-57.344l-53.76-28.16c-15.872-8.704-21.504-27.648-12.8-42.496 5.12-9.216 10.752-18.944 16.384-27.136 93.184-138.752 292.352-177.664 450.048-145.408 7.168 1.536 11.264-7.168 6.656-11.776-150.528-145.408-447.488-190.464-600.576 6.656-17.408 22.016-45.056 66.048-62.464 100.352-7.68 14.848-26.112 20.992-40.96 13.824z m792.576 310.784l13.824 7.68c25.6 13.312 53.76-12.8 43.008-39.424l-31.232-75.264-53.248-129.536c-5.632-14.336-21.504-22.016-36.352-18.432l-135.68 34.816-86.016 22.016c-27.136 6.656-31.744 43.52-7.168 56.832l52.736 29.184c14.848 8.704 19.968 27.648 11.776 42.496-5.632 8.704-11.264 17.92-17.408 26.624C565.76 636.416 368.64 670.72 213.504 636.416 204.8 634.88 199.68 645.12 205.312 651.264 353.28 797.696 645.12 847.36 801.792 655.872c17.408-20.992 46.08-65.024 64.512-98.816 8.192-14.848 26.624-20.48 41.472-12.8z" horiz-adv-x="1024" />
......
fonts/iconfont.ttf
No preview for this file type
fonts/iconfont.woff
No preview for this file type
fonts/iconfont.woff2
No preview for this file type
pages/index/index.js
......@@ -29,7 +29,7 @@ import create from "dd-store";
let maxClickCount = 5;
create.Page({
data: {
sign: '',
sign: "",
refresh: false,
$data: null,
iconDay: currentDate.getDate(),
......@@ -82,8 +82,8 @@ create.Page({
}
//开启一个定时器
this.timer = setInterval(() => {
this.getData()
}, 30000)
this.getData();
}, 30000);
},
//修改重复会议
modifyErpeatMeeting() {
......@@ -115,11 +115,11 @@ create.Page({
this.timer = null;
},
refresh() {
this.onLoad()
this.onLoad();
},
onLoad(query) {
console.log(query);
if (query && JSON.stringify(query) !== '{}') {
if (query && JSON.stringify(query) !== "{}") {
this.setData({
listLoading: false
});
......@@ -163,74 +163,76 @@ create.Page({
getDynamicList({
current,
size: 10
}).then(res => {
if (!res.data.data) {
this.setData({
listLoading: false,
dynamicList: []
});
return;
}
const dynamicList = res.data.data.records.map((item, index) => {
for (let i = 0; i < item.meetingLogDataList.length; i++) {
if (item.meetingLogDataList[i].creatorInfo) {
item.meetingLogDataList[i].creatorInfo = JSON.parse(
item.meetingLogDataList[i].creatorInfo
);
}
if (item.meetingLogDataList[i].createTime) {
item.meetingLogDataList[i].createTime = getCreateShowTime(
item.meetingLogDataList[i].createTime
);
}
let itemData = item.meetingLogDataList[i].meetingLogResource;
if (itemData) {
itemData.groupId = item.groupId;
if (itemData.taskInfos || itemData.fileInfos) {
if (itemData.creatorInfo) {
itemData.creatorInfo = JSON.parse(itemData.creatorInfo);
}
if (itemData.fileInfos) {
itemData.fileInfos = JSON.parse(itemData.fileInfos);
}
if (itemData.taskInfos) {
itemData.taskInfos = JSON.parse(itemData.taskInfos);
}
if (itemData.acceptorInfo) {
itemData.acceptorInfo = JSON.parse(itemData.acceptorInfo);
})
.then(res => {
if (!res.data.data) {
this.setData({
listLoading: false,
dynamicList: []
});
return;
}
const dynamicList = res.data.data.records.map((item, index) => {
for (let i = 0; i < item.meetingLogDataList.length; i++) {
if (item.meetingLogDataList[i].creatorInfo) {
item.meetingLogDataList[i].creatorInfo = JSON.parse(
item.meetingLogDataList[i].creatorInfo
);
}
if (item.meetingLogDataList[i].createTime) {
item.meetingLogDataList[i].createTime = getCreateShowTime(
item.meetingLogDataList[i].createTime
);
}
let itemData = item.meetingLogDataList[i].meetingLogResource;
if (itemData) {
itemData.groupId = item.groupId;
if (itemData.taskInfos || itemData.fileInfos) {
if (itemData.creatorInfo) {
itemData.creatorInfo = JSON.parse(itemData.creatorInfo);
}
if (itemData.fileInfos) {
itemData.fileInfos = JSON.parse(itemData.fileInfos);
}
if (itemData.taskInfos) {
itemData.taskInfos = JSON.parse(itemData.taskInfos);
}
if (itemData.acceptorInfo) {
itemData.acceptorInfo = JSON.parse(itemData.acceptorInfo);
}
}
}
}
}
return item;
});
//第一页数据会重新请求需要替换
if (current === 1) {
this.setData({
dynamicList
return item;
});
} else {
const newDynamicList = this.data.dynamicList.concat(dynamicList);
//第一页数据会重新请求需要替换
if (current === 1) {
this.setData({
dynamicList
});
} else {
const newDynamicList = this.data.dynamicList.concat(dynamicList);
this.setData({
dynamicList: newDynamicList
});
}
this.setData({
dynamicList: newDynamicList
listLoading: false,
current: res.data.data.current,
pages: res.data.data.pages
});
}
this.setData({
listLoading: false,
current: res.data.data.current,
pages: res.data.data.pages
if (callBack) {
callBack();
}
})
.catch(err => {
if (err && err.refresh) {
this.setData({
refresh: true
});
}
});
if (callBack) {
callBack();
}
}).catch(err => {
if (err && err.refresh) {
this.setData({
refresh: true
})
}
});
},
//动态置顶
changeCollection(e) {
......@@ -376,7 +378,7 @@ create.Page({
if (err && err.refresh) {
this.setData({
refresh: true
})
});
}
});
},
......@@ -416,7 +418,6 @@ create.Page({
}
}
}
if (DateMap.has(toLocaleDateString(startTime))) {
DateMap.get(toLocaleDateString(startTime)).push(pushItem);
}
......@@ -449,10 +450,12 @@ create.Page({
const initialTimeList = item.initialTime.split("-");
const startTimeList = item.startTime.split(":");
const DTSTART = `${initialTimeList[0]}${initialTimeList[1]}${initialTimeList[2]}T${startTimeList[0]}${startTimeList[1]}00Z`;
const rule = RRule.fromString(
`${item.recurrenceModel.recurrenceRule};DTSTART=${DTSTART}`
);
let rule = { all: () => [] };
if (item.recurrenceModel.recurrenceRule) {
rule = RRule.fromString(
`${item.recurrenceModel.recurrenceRule};DTSTART=${DTSTART}`
);
}
const setDateMapValueAll = (startTime, endTime, item) => {
//如果有日程会议则用日程会议替换
let replaceItem = [];
......@@ -473,6 +476,7 @@ create.Page({
};
// 需要剔除某一天
if (item.excludePlanDates) {
const excludeData = getExcludeDate(item.excludePlanDates.split(","));
rule.all().forEach(startTime => {
//修正时间（时间有8小时时差）
......@@ -885,7 +889,7 @@ create.Page({
maxClickCount--;
if (maxClickCount == 0) {
dd.alert({
content: "0.0.13"
content: "0.0.14"
});
maxClickCount = 5;
}
......
pages/meetingDetail/meetingDetail.axml
......@@ -149,11 +149,11 @@
</view>
<view class="mettingWayText" onTap="setCopy" data-item="513410069">
<text>ID：513410069</text>
<text class="icon iconfont iconicon_task1"></text>
<text class="icon iconfont iconicon_icon"></text>
</view>
<view class="mettingWayText passWord" onTap="setCopy" data-item="4ez3am">
<text >密码:4ez3am</text>
<text class="icon iconfont iconicon_task1"></text>
<text class="icon iconfont iconicon_icon"></text>
</view>
</view>
</view>
......
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