Commit 70c47b22 by liang ce

解决版本号冲突

parents 9b02cabc 7b622462
...@@ -83,7 +83,18 @@ create.Page({ ...@@ -83,7 +83,18 @@ create.Page({
this.update(); this.update();
} }
}, },
onLoad() { onLoad(event) {
if (JSON.stringify(event) != "{}") {
this.setData({
listLoading: false
});
let scheduleItem = JSON.parse(Object.keys(event)[0].split("=")[1]);
dd.navigateTo({
url: `./../meetingDetail/meetingDetail?scheduleItem=${encodeURIComponent(
JSON.stringify(scheduleItem)
)}`
});
}
this.setData({ this.setData({
isFullscreen: getApp().globalData.isFullscreen isFullscreen: getApp().globalData.isFullscreen
}); });
...@@ -453,6 +464,9 @@ create.Page({ ...@@ -453,6 +464,9 @@ create.Page({
} }
// 有日程长度 // 有日程长度
if (value.length !== 0) { if (value.length !== 0) {
value.sort(function(a, b) {
return a.startTime.getTime() - b.startTime.getTime();
});
value.forEach((item, index) => { value.forEach((item, index) => {
if (index === 0) { if (index === 0) {
DateList.push({ DateList.push({
...@@ -759,7 +773,7 @@ create.Page({ ...@@ -759,7 +773,7 @@ create.Page({
maxClickCount--; maxClickCount--;
if (maxClickCount == 0) { if (maxClickCount == 0) {
dd.alert({ dd.alert({
content: "版本号210" content: "版本号220"
}); });
maxClickCount = 5; maxClickCount = 5;
} }
......
...@@ -179,7 +179,7 @@ create.Page({ ...@@ -179,7 +179,7 @@ create.Page({
this.setData({ this.setData({
isIPX: checkFullScren(), isIPX: checkFullScren(),
placeholder: `${getApp().globalData.name}创建的会议`, placeholder: `${getApp().globalData.name}创建的会议`,
scheduleItem: JSON.parse(event.scheduleItem) || JSON.parse(Object.keys(event)[0].split('=')[1]), scheduleItem: JSON.parse(event.scheduleItem),
currentPeople: getApp().globalData.userid currentPeople: getApp().globalData.userid
}) })
this.getDetail() this.getDetail()
......
...@@ -49,12 +49,15 @@ create.Page({ ...@@ -49,12 +49,15 @@ create.Page({
endTime: this.$store.data.endTime.replace(/\//g, "-") endTime: this.$store.data.endTime.replace(/\//g, "-")
} }
queryAvailableMeetingRoomByTime(data).then(res => { queryAvailableMeetingRoomByTime(data).then(res => {
for (let value of res.data.data) { if (res.data && res.data.data) {
value.meetingRoomFullName = `${value.meetingRoomFullName}-${value.name}` for (let value of res.data.data) {
value.meetingRoomFullName = `${value.meetingRoomFullName}-${value.name}`
}
that.setData({
availableMeetingRoom: res.data.data
})
} }
that.setData({
availableMeetingRoom: res.data.data
})
}) })
}, },
selectPlace(event) { selectPlace(event) {
......
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