Commit b7ae50a8 by fengzhaoyu

暂存

parent cc5b26c7
const app = getApp()
import $http from './http'
// 获取创建会议室的会议室列表
export function getMeetingRoom (data) {
export function getMeetingRoom(data) {
return new Promise((resolve, reject) => {
$http({
method: 'get',
......@@ -14,7 +14,7 @@ export function getMeetingRoom (data) {
})
})
}
export function getMeetingGlobalSetting (data) {
export function getMeetingGlobalSetting(data) {
return new Promise((resolve, reject) => {
$http({
method: 'get',
......@@ -33,7 +33,7 @@ export function getMeetingGlobalSetting (data) {
// OFFICE_FACILITY(1,"meeting_room_facility")
// 会议室分类
// OFFICE_CATEGORY(2,"meeting_room_category")
export function getLabelTree (data) {
export function getLabelTree(data) {
return new Promise((resolve, reject) => {
$http({
method: 'get',
......@@ -45,7 +45,7 @@ export function getLabelTree (data) {
})
}
// 更新办公区域,设施,分类
export function getMettingRoomLabelUpdate (data) {
export function getMettingRoomLabelUpdate(data) {
return new Promise((resolve, reject) => {
$http({
method: 'POST',
......@@ -57,7 +57,7 @@ export function getMettingRoomLabelUpdate (data) {
})
}
// 添加办公区域、会议室分类、会议室设置
export function getMettingRoomLabelSave (data) {
export function getMettingRoomLabelSave(data) {
return new Promise((resolve, reject) => {
$http({
method: 'POST',
......@@ -69,7 +69,7 @@ export function getMettingRoomLabelSave (data) {
})
}
// 删除办公区域、会议室分类、会议室设置
export function getMettingRoomLabelRemove (data) {
export function getMettingRoomLabelRemove(data) {
return $http({
method: 'get',
data: data,
......@@ -77,7 +77,7 @@ export function getMettingRoomLabelRemove (data) {
})
}
// 删除会议室
export function getRemoveMeetingRoom (data) {
export function getRemoveMeetingRoom(data) {
return $http({
method: 'get',
data: '',
......@@ -85,7 +85,7 @@ export function getRemoveMeetingRoom (data) {
})
}
// 创建会议室
export function saveMettingRoom (data) {
export function saveMettingRoom(data) {
return $http({
method: 'post',
data: JSON.stringify(data),
......@@ -93,7 +93,7 @@ export function saveMettingRoom (data) {
})
}
// 修改会议室
export function mettingRoomUpdate (data) {
export function mettingRoomUpdate(data) {
return $http({
method: 'post',
data: JSON.stringify(data),
......@@ -101,7 +101,7 @@ export function mettingRoomUpdate (data) {
})
}
// 获取会议室详情
export function getMeetingRoomVOByUuid (data) {
export function getMeetingRoomVOByUuid(data) {
return $http({
method: 'get',
data: '',
......@@ -109,7 +109,7 @@ export function getMeetingRoomVOByUuid (data) {
})
}
// 获取我的会议
export function myMeetingPage (data) {
export function myMeetingPage(data) {
return $http({
method: 'post',
data: JSON.stringify(data),
......@@ -117,7 +117,7 @@ export function myMeetingPage (data) {
})
}
// 获取预定会议室列表
export function getReserveRoomList (data) {
export function getReserveRoomList(data) {
return $http({
method: 'post',
data: JSON.stringify(data),
......@@ -126,7 +126,7 @@ export function getReserveRoomList (data) {
}
// 获取预定会议详情
export function getMyMeetingDetails (data) {
export function getMyMeetingDetails(data) {
return $http({
method: 'get',
data: '',
......@@ -135,7 +135,7 @@ export function getMyMeetingDetails (data) {
}
// 修改预定时间设置
export function updateGlobalSetting (data) {
export function updateGlobalSetting(data) {
return $http({
method: 'post',
data: JSON.stringify(data),
......@@ -144,7 +144,7 @@ export function updateGlobalSetting (data) {
}
// 获取首页信息
export function getHomeUserSchedule (data) {
export function getHomeUserSchedule(data) {
return $http({
method: 'post',
data: JSON.stringify(data),
......@@ -155,7 +155,7 @@ export function getHomeUserSchedule (data) {
/* 创建日程全部请求 */
// 创建日程
export function addSchedule (data) {
export function addSchedule(data) {
return $http({
method: 'post',
data: JSON.stringify(data),
......@@ -163,7 +163,7 @@ export function addSchedule (data) {
})
}
// 获取参会会人员的日程
export function getUserScheduleInTime (data) {
export function getUserScheduleInTime(data) {
return $http({
method: 'post',
data: JSON.stringify(data),
......@@ -171,7 +171,7 @@ export function getUserScheduleInTime (data) {
})
}
// 获取日程详情
export function getScheduleDetail (data) {
export function getScheduleDetail(data) {
return $http({
method: 'post',
data: JSON.stringify(data),
......@@ -179,7 +179,14 @@ export function getScheduleDetail (data) {
})
}
// 文件上传
export function uploadPermissions () {
export function uploadPermissions() {
return $http({
method: 'get',
url: `/admin/ddOpenApi/getCustomSpaceAndGrantCustomSpace?type=add&ddUserId=${getApp().globalData.userid}`
})
}
// 文件上传
export function previewPermissions() {
return $http({
method: 'get',
url: `/admin/ddOpenApi/getCustomSpaceAndGrantCustomSpace?type=add&ddUserId=${getApp().globalData.userid}`
......
{
"pages": [
"pages/scheduleDetail/scheduleDetail",
"pages/index/index",
"pages/scheduleDetail/scheduleDetail",
"pages/attendingSituation/attendingSituation",
"pages/createOrEditSchedule/createOrEditSchedule",
"pages/place/place",
......
......@@ -57,7 +57,7 @@
</view>
</view>
<!-- 会议描述 -->
<view class="describe" a:if="describe">
<view class="describe" a:if="{{!!describe}}">
<view class="icon iconhuiyimiaoshu iconfont">
</view>
<view class="text">
......
......@@ -29,7 +29,7 @@ Page({
endTime: res.data.data.endTime,
userList: res.data.data.userList,
aheadTimes: res.data.data.aheadTimes,
describe: res.data.data.describe,
// describe: res.data.data.describe,
week: this.data.weeks[new Date(res.data.data.startTime).getDay() - 1]
})
this.acrossDay(res.data.data.startTime, res.data.data.endTime)
......@@ -70,24 +70,23 @@ Page({
upload() {
dd.uploadAttachmentToDingTalk({
image: { multiple: true, compress: false, max: 9, spaceId: this.data.spaceId },
space: { spaceId: this.data.spaceId, max: 9 },
file: { spaceId: this.data.spaceId, max: 1 },
types: ["photo", "camera", "file", "space"],//PC端仅支持["photo","file","space"]
space: { spaceId: this.data.spaceId, isCopy: 1, max: 9 },
file: { spaceId: 'this.data.spaceId', max: 1 },
types: ["photo", "camera", "space"],//PC端仅支持["photo","file","space"]
success: (res) => {
console.log(JSON.stringify(res), 1111)
dd.alert({
content: '上传成功'
})
console.log(JSON.stringify(res), 111111)
},
fail: (err) => {
console.log(JSON.stringify(err), 1111)
dd.alert({
content: '上传失败'
content: JSON.stringify(err)
})
console.log(err)
}
})
},
preview() {
}
});
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