Commit a57070e5 by liang ce

首页兼容IOS时间格式

parent cc5b26c7
{ {
"pages": [ "pages": [
"pages/scheduleDetail/scheduleDetail",
"pages/index/index", "pages/index/index",
"pages/scheduleDetail/scheduleDetail",
"pages/attendingSituation/attendingSituation", "pages/attendingSituation/attendingSituation",
"pages/createOrEditSchedule/createOrEditSchedule", "pages/createOrEditSchedule/createOrEditSchedule",
"pages/place/place", "pages/place/place",
......
...@@ -38,7 +38,7 @@ page { ...@@ -38,7 +38,7 @@ page {
} }
.dateTime>view { .dateTime>view {
font-size: 24rpx; font-size: 22rpx;
line-height: 24rpx; line-height: 24rpx;
color: #191F25; color: #191F25;
/* margin-bottom: 8rpx; */ /* margin-bottom: 8rpx; */
......
...@@ -76,11 +76,11 @@ Page({ ...@@ -76,11 +76,11 @@ Page({
} }
} }
for(let y=0;y<this.data.AllScheduleList.length;y++) { for(let y=0;y<this.data.AllScheduleList.length;y++) {
let date1 = this.data.AllScheduleList[y].startTime.slice(0,10) let date1 = this.data.AllScheduleList[y].startTime.slice(0,10).replace(/-/g, '/')
let date2 = this.data.AllScheduleList[y].endTime.slice(0,10) let date2 = this.data.AllScheduleList[y].endTime.slice(0,10).replace(/-/g, '/')
let count = this.count(date1, date2) let count = this.count(date1, date2)
if(count == 0) { if(count == 0) {
DateMap.get(`${new Date(this.data.AllScheduleList[y].startTime).toLocaleDateString()}`).scheduleList.push(this.data.AllScheduleList[y]) DateMap.get(`${new Date(this.data.AllScheduleList[y].startTime.replace(/-/g, '/')).toLocaleDateString()}`).scheduleList.push(this.data.AllScheduleList[y])
} else { } else {
for(let j = 0;j<=count;j++) { for(let j = 0;j<=count;j++) {
let time = new Date(); let time = new Date();
...@@ -185,11 +185,10 @@ Page({ ...@@ -185,11 +185,10 @@ Page({
}, },
nextPage() { nextPage() {
dd.navigateTo({ url: './../createOrEditSchedule/createOrEditSchedule' }) dd.navigateTo({ url: './../createOrEditSchedule/createOrEditSchedule' })
}, },
nextDetail () { nextDetail (e) {
dd.navigateTo({ url: './../scheduleDetail/scheduleDetail' })
dd.navigateTo({ url: './../scheduleDetail/scheduleDetail' })
} }
}); });
import { getScheduleDetail, uploadPermissions } from '../../api/request.js' import { getScheduleDetail } from '../../api/request.js'
Page({ Page({
data: { data: {
title: '', title: '',
...@@ -8,10 +8,7 @@ Page({ ...@@ -8,10 +8,7 @@ Page({
weeks: ['周一', '周二', '周三', '周四', '周五', '周六', '周日'], weeks: ['周一', '周二', '周三', '周四', '周五', '周六', '周日'],
week: '', week: '',
userList: [], userList: [],
aheadTimes: [], isAcrossDay: true
isAcrossDay: true,
describe: '',
spaceId: ''
}, },
onLoad() { onLoad() {
...@@ -28,16 +25,9 @@ Page({ ...@@ -28,16 +25,9 @@ Page({
startTime: res.data.data.startTime, startTime: res.data.data.startTime,
endTime: res.data.data.endTime, endTime: res.data.data.endTime,
userList: res.data.data.userList, userList: res.data.data.userList,
aheadTimes: res.data.data.aheadTimes, week: this.data.weeks[new Date(res.data.data.startTime).getDay()- 1]
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) this.acrossDay(res.data.data.startTime, res.data.data.endTime)
return uploadPermissions()
}).then(res => {
this.setData({
spaceId: res.data.data
})
}) })
}, },
// 是否跨天 // 是否跨天
...@@ -56,7 +46,7 @@ Page({ ...@@ -56,7 +46,7 @@ Page({
}, },
// 处理时间 // 处理时间
dealTime(time) { dealTime(time) {
let time1 = time.replace(/-/g, "/") let time1 = time.replace(/-/g,"/")
let date = new Date(time1) let date = new Date(time1)
let day = date.getDate() let day = date.getDate()
let year = date.getFullYear() let year = date.getFullYear()
...@@ -66,28 +56,6 @@ Page({ ...@@ -66,28 +56,6 @@ Page({
month: month, month: month,
day: day day: day
} }
},
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"]
success: (res) => {
console.log(JSON.stringify(res), 1111)
dd.alert({
content: '上传成功'
})
},
fail: (err) => {
console.log(JSON.stringify(err), 1111)
dd.alert({
content: '上传失败'
})
console.log(err)
}
})
} }
}); });
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