Skip to content

U
UbainsMeeting
提交 13fc9683 authored 作者: 曾美红's avatar 曾美红
浏览文件
操作

修改预定

上级 218074f2
隐藏空白字符变更
内嵌 并排
正在显示 包含 610 行增加 和 210 行删除
app.js
浏览文件 @ 13fc9683
...@@ -14,7 +14,7 @@ App({ ...@@ -14,7 +14,7 @@ App({
//全局数据 //全局数据
globalData: { globalData: {
//domain:'http://id24iu.natappfree.cc', //domain:'http://id24iu.natappfree.cc',
// domain:"http://dd2.ubainsyun.com", //domain:"http://dd2.ubainsyun.com",
domain: "http://zhenglide.natapp1.cc" , domain: "http://zhenglide.natapp1.cc" ,
corpId: '', corpId: '',
userId:'', userId:'',
......
pages/conference/addmeeting/addmeeting.js
浏览文件 @ 13fc9683
...@@ -154,9 +154,9 @@ Page({ ...@@ -154,9 +154,9 @@ Page({
}) })
return false; return false;
} }
let res = dd.getStorageSync({ key: signList }); let res = dd.getStorageSync({ key: 'signList' });
var topicList=this.data.topicList; var topicList=this.data.topicList;
console.log(this.data.topicList); console.log(res.data);
dd.httpRequest({ dd.httpRequest({
url: addmeetingeUrl, url: addmeetingeUrl,
method: 'POST', method: 'POST',
...@@ -170,7 +170,7 @@ Page({ ...@@ -170,7 +170,7 @@ Page({
messageName: e.detail.value.messageName, messageName: e.detail.value.messageName,
messageCompere: e.detail.value.messageCompere, messageCompere: e.detail.value.messageCompere,
topicList: topicList, topicList: topicList,
signList:res.data, signList:JSON.stringify(res.data),
messageContent: e.detail.value.messageContent, messageContent: e.detail.value.messageContent,
remindMethod : e.detail.value.remindMethod, remindMethod : e.detail.value.remindMethod,
remindTime: e.detail.value.remindTime, remindTime: e.detail.value.remindTime,
...@@ -220,7 +220,7 @@ Page({ ...@@ -220,7 +220,7 @@ Page({
} }
}, },
fail: function(res) { fail: function(res) {
//console.log("httpRequestFail---", res) console.log("httpRequestFail---", res)
//dd.alert({ content: JSON.stringify(res) }); //dd.alert({ content: JSON.stringify(res) });
}, },
......
pages/conference/modifymeeting/modifymeeting.js
浏览文件 @ 13fc9683
...@@ -15,12 +15,13 @@ Page({ ...@@ -15,12 +15,13 @@ Page({
showView: true, showView: true,
conferenceList: [], conferenceList: [],
mid:null, mid:null,
message:null, message: {},
messageContent:"", messageContent:"",
//msgArray: ['无提醒', '提前十分钟', '提前半小时', '提前一小时'], //msgArray: ['无提醒', '提前十分钟', '提前半小时', '提前一小时'],
showView: false, showView: false,
dates: dateFtt("yyyy-MM-dd", new Date()), dates: dateFtt("yyyy-MM-dd", new Date()),
topicList: [], topicList: [],
// signList:'',
text: '', text: '',
cnum:'', cnum:'',
allTime: { allTime: {
...@@ -81,22 +82,22 @@ Page({ ...@@ -81,22 +82,22 @@ Page({
}, },
//是否安排座位 //是否安排座位
switch: function() { // switch: function() {
//console.log("点击"); // //console.log("点击");
var mid=this.data.mid; // var mid=this.data.mid;
console.log("会议室", this.data.cnum) // console.log("会议室", this.data.cnum)
// if (this.data.cnum==""){ // // if (this.data.cnum==""){
// dd.alert({ // // dd.alert({
// title: "参数错误", // // title: "参数错误",
// content: "会议室没有选择", // // content: "会议室没有选择",
// buttonText: '确定' // // buttonText: '确定'
// }) // // })
// return false; // // return false;
// } // // }
var _this=this; // var _this=this;
}, // },
//显示隐藏（方式选项） //显示隐藏（方式选项）
onChangeShowState: function() { onChangeShowState: function() {
var that = this; var that = this;
...@@ -144,6 +145,15 @@ Page({ ...@@ -144,6 +145,15 @@ Page({
}) })
return false; return false;
} }
if (e.detail.value.messageCompere == "") {
dd.alert({
title: "参数错误",
content: "会议主持人没有填写",
buttonText: '确定'
})
return false;
}
//console.log(this.data.time.startTime);
if ((this.data.time.startTime == ""|| this.data.time.startTime == null) && (this.data.time.endTime=="" || this.data.time.endTime == null)) { if ((this.data.time.startTime == ""|| this.data.time.startTime == null) && (this.data.time.endTime=="" || this.data.time.endTime == null)) {
dd.alert({ dd.alert({
title: "参数错误", title: "参数错误",
...@@ -152,7 +162,8 @@ Page({ ...@@ -152,7 +162,8 @@ Page({
}) })
return false; return false;
} }
let res = dd.getStorageSync({ key: signList }); let res = dd.getStorageSync({ key: 'signList' });
console.log('signList',res.data)
var topicList=this.data.topicList; var topicList=this.data.topicList;
dd.httpRequest({ dd.httpRequest({
url: savemeetingeUrl, url: savemeetingeUrl,
...@@ -166,7 +177,7 @@ Page({ ...@@ -166,7 +177,7 @@ Page({
messageName: e.detail.value.messageName, messageName: e.detail.value.messageName,
messageCompere: e.detail.value.messageCompere, messageCompere: e.detail.value.messageCompere,
topicList: topicList, topicList: topicList,
signList:res.data, signList:JSON.stringify(res.data),
messageContent: e.detail.value.messageContent, messageContent: e.detail.value.messageContent,
remindMethod : e.detail.value.remindMethod, remindMethod : e.detail.value.remindMethod,
remindTime: e.detail.value.remindTime, remindTime: e.detail.value.remindTime,
...@@ -180,7 +191,7 @@ Page({ ...@@ -180,7 +191,7 @@ Page({
//console.log("预定成功"); //console.log("预定成功");
dd.removeStorage({ dd.removeStorage({
key:'signList', key:'signList',
success:function(res){ success:function(res){
//console.log('清除已添加外部人员记录成功'); //console.log('清除已添加外部人员记录成功');
} }
}) })
...@@ -222,225 +233,301 @@ Page({ ...@@ -222,225 +233,301 @@ Page({
}); });
}, },
datePicker() { // datePicker() {
var timeList = this.data.timeList; // var timeList = this.data.timeList;
var hours = this.data.allTime.hours; // var hours = this.data.allTime.hours;
var minutes = this.data.allTime.minutes; // var minutes = this.data.allTime.minutes;
var _this = this; // var _this = this;
dd.datePicker({ // dd.datePicker({
success: (res) => { // success: (res) => {
_this.setData({ // _this.setData({
dates: res.date // dates: res.date
}); // });
//查询当天会议时间段 // //查询当天会议时间段
var dates = res.date; // var dates = res.date;
//清空原來的 // //清空原來的
timeList = []; // timeList = [];
_this.setData({ // _this.setData({
timeList // timeList
}); // });
var msgTime = this.data.msgTime; // var msgTime = this.data.msgTime;
var nowHour = new Date().getHours(); // var nowHour = new Date().getHours();
var nowMinute = new Date().getMinutes(); // var nowMinute = new Date().getMinutes();
msgTime = []; // msgTime = [];
// _this.setData({
// msgTime
// });
// dd.httpRequest({
// url: messageListUrl,
// method: 'POST',
// data: {
// date: _this.data.dates,
// cnum: _this.data.message.cnum
// },
// dataType: 'json',
// success: function(res) {
// console.log('success----message', res)
// var msg = res.data.result;
// for (var i = 0; i < msg.length; i++) {
// var json = {};
// json["startTime"] = msg[i].startTimeFormat;
// json["endTime"] = msg[i].endTimeFormat;
// msgTime.push(json);
// }
// _this.setData({
// msgTime
// });
// console.log(msgTime)
// if (timeList.length == 0) {
// for (var i = 0; i < hours.length; i++) {
// var arr = new Array;
// for (var j = 0; j < minutes.length; j++) {
// //console.log(hours[i]);
// // console.log(minutes[j]);
// //dateCompare(startDate, endDate)
// //Date.parse(new Date(e.detail.value)) < Date.parse(new Date())
// var json = {};
// json["hour"] = hours[i];
// json["minute"] = minutes[j];
// if (dateCompare(dateFtt("yyyy-MM-dd", new Date()), dates) == 0) {
// json["color"] = "#ABABAB";
// json["unclick"] = true;
// } else if (dateCompare(dateFtt("yyyy-MM-dd", new Date()), dates) == 1) {
// if (nowHour > hours[i]) {
// json["color"] = "#ABABAB";
// json["unclick"] = true;
// } else {
// json["color"] = "";
// json["unclick"] = false;
// }
// if (nowHour == hours[i]) {
// if (nowMinute > minutes[j]) {
// json["color"] = "#ABABAB";
// json["unclick"] = true;
// } else {
// json["color"] = "";
// json["unclick"] = false;
// }
// }
// }
// else if (dateCompare(dateFtt("yyyy-MM-dd", new Date()), dates) == 2) {
// json["color"] = "";
// json["unclick"] = false;
// }
// // console.log(msgTime);
// if (msgTime.length > 0) {
// for (var k = 0; k < msgTime.length; k++) {
// var msgstart = Number(msgTime[k].startTime.split(":")[0]);
// var msgend = Number(msgTime[k].endTime.split(":")[0]);
// var msgstartmin = Number(msgTime[k].startTime.split(":")[1]) - 15;
// var msgendmin = Number(msgTime[k].endTime.split(":")[1]);
// console.log("会议开始时间", msgstart + ":" + msgstartmin);
// // console.log(msgTime[k].startTime.split(":")[0]);
// if (time_range(msgstart + ":" + msgstartmin, msgTime[k].endTime, hours[i] + ":" + minutes[j])) {
// json["color"] = "#EEAD0E";
// json["unclick"] = true;
// }
// }
// }
// arr.push(json);
// }
// timeList.push(arr);
// }
// }
// //console.log(status);
// _this.setData({
// timeList
// })
// dd.hideLoading();
// },
// fail: function(res) {
// console.log("httpRequestFail---", res)
// dd.alert({ content: JSON.stringify(res) });
// },
// complete: function(res) {
// dd.hideLoading();
// }
// });
// }
// })
// },
/**
*
* 显示时间轴
*/
showTimeList:(_this,cnum)=>{
//查询当天会议时间段
var timeList = _this.data.timeList;
var hours = _this.data.allTime.hours;
var minutes = _this.data.allTime.minutes;
//清空原來的
timeList = [];
_this.setData({
timeList
});
var msgTime = _this.data.msgTime;
var nowHour = new Date().getHours();
var nowMinute = new Date().getMinutes();
msgTime = [];
_this.setData({
msgTime
});
dd.httpRequest({
url: messageListUrl,
method: 'POST',
data: {
date: _this.data.dates,
cnum: cnum
},
dataType: 'json',
success: function(res) {
// console.log('success----message', res);
// this.clearTime(timeList,hours,minutes,this);
var msg = res.data.result;
for (var i = 0; i < msg.length; i++) {
var json = {};
json["startTime"] = msg[i].startTimeFormat;
json["endTime"] = msg[i].endTimeFormat;
msgTime.push(json);
}
_this.setData({ _this.setData({
msgTime msgTime
}); });
dd.httpRequest({ if (timeList.length == 0) {
url: messageListUrl, for (var i = 0; i < hours.length; i++) {
method: 'POST', var arr = new Array;
data: {
date: _this.data.dates,
cnum: _this.data.message.cnum
},
dataType: 'json',
success: function(res) {
console.log('success----message', res)
var msg = res.data.result;
for (var i = 0; i < msg.length; i++) {
var json = {};
json["startTime"] = msg[i].startTimeFormat;
json["endTime"] = msg[i].endTimeFormat;
msgTime.push(json);
}
_this.setData({
msgTime
});
console.log(msgTime)
if (timeList.length == 0) {
for (var i = 0; i < hours.length; i++) {
var arr = new Array;
for (var j = 0; j < minutes.length; j++) {
for (var j = 0; j < minutes.length; j++) {
//console.log(hours[i]); var json = {};
// console.log(minutes[j]); json["hour"] = hours[i];
//dateCompare(startDate, endDate) json["minute"] = minutes[j];
//Date.parse(new Date(e.detail.value)) < Date.parse(new Date()) if (dateCompare(dateFtt("yyyy-MM-dd", new Date()), _this.data.dates) == 0) {
var json = {};
json["hour"] = hours[i];
json["minute"] = minutes[j];
if (dateCompare(dateFtt("yyyy-MM-dd", new Date()), dates) == 0) {
json["color"] = "#ABABAB"; json["color"] = "#ABABAB";
json["unclick"] = true; json["unclick"] = true;
} else if (dateCompare(dateFtt("yyyy-MM-dd", new Date()), dates) == 1) { } else if (dateCompare(dateFtt("yyyy-MM-dd", new Date()), _this.data.dates) == 1) {
if (nowHour > hours[i]) { if (nowHour > hours[i]) {
json["color"] = "#ABABAB"; json["color"] = "#ABABAB";
json["unclick"] = true; json["unclick"] = true;
} else { } else {
json["color"] = ""; json["color"] = "";
json["unclick"] = false; json["unclick"] = false;
} }
if (nowHour == hours[i]) { if (nowHour == hours[i]) {
if (nowMinute > minutes[j]) { if (nowMinute > minutes[j]) {
json["color"] = "#ABABAB"; json["color"] = "#ABABAB";
json["unclick"] = true; json["unclick"] = true;
} else { } else {
json["color"] = ""; json["color"] = "";
json["unclick"] = false; json["unclick"] = false;
} }
} }
} }
else if (dateCompare(dateFtt("yyyy-MM-dd", new Date()), dates) == 2) { else if (dateCompare(dateFtt("yyyy-MM-dd", new Date()), _this.data.dates) == 2) {
json["color"] = ""; json["color"] = "";
json["unclick"] = false; json["unclick"] = false;
} }
// console.log(msgTime); // console.log(msgTime);
if (msgTime.length > 0) { if (msgTime.length > 0) {
for (var k = 0; k < msgTime.length; k++) { for (var k = 0; k < msgTime.length; k++) {
var msgstart = Number(msgTime[k].startTime.split(":")[0]); var msgstart = Number(msgTime[k].startTime.split(":")[0]);
var msgend = Number(msgTime[k].endTime.split(":")[0]); var msgend = Number(msgTime[k].endTime.split(":")[0]);
var msgstartmin = Number(msgTime[k].startTime.split(":")[1]) - 15; var msgstartmin = Number(msgTime[k].startTime.split(":")[1]) - 15;
var msgendmin = Number(msgTime[k].endTime.split(":")[1]); var msgendmin = Number(msgTime[k].endTime.split(":")[1]);
console.log("会议开始时间", msgstart + ":" + msgstartmin); // console.log("会议开始时间", msgstart + ":" + msgstartmin);
// console.log(msgTime[k].startTime.split(":")[0]); // console.log(msgTime[k].startTime.split(":")[0]);
if (time_range(msgstart + ":" + msgstartmin, msgTime[k].endTime, hours[i] + ":" + minutes[j])) {
json["color"] = "#EEAD0E";
json["unclick"] = true;
}
}
}
arr.push(json);
if (time_range(msgstart + ":" + msgstartmin, msgTime[k].endTime, hours[i] + ":" + minutes[j])) {
json["color"] = "#EEAD0E";
json["unclick"] = true;
}
} }
timeList.push(arr);
} }
}
//console.log(status); arr.push(json);
_this.setData({
timeList
})
dd.hideLoading();
},
fail: function(res) {
console.log("httpRequestFail---", res)
dd.alert({ content: JSON.stringify(res) });
},
complete: function(res) {
dd.hideLoading();
}
});
}
})
},
}
timeList.push(arr);
//点击小方块 }
selTime:function(e){ }
//console.log(status);
_this.setData({
timeList
})
//console.log("timeList", timeList)
dd.hideLoading();
},
fail: function(res) {
console.log("httpRequestFail---", res)
// dd.alert({ content: JSON.stringify(res) });
},
complete: function(res) {
//dd.hideLoading();
}
var startTime=this.data.time.startTime; });
var endTime = this.data.time.endTime; },
var startIndex = this.data.time.startIndex; //点击时间格
var endIndex = this.data.time.endIndex; datePicker() {
var timeList = this.data.timeList; var timeList = this.data.timeList;
var unclick= e.currentTarget.dataset.unclick; var hours = this.data.allTime.hours;
// console.log(startIndex); var minutes = this.data.allTime.minutes;
if (!unclick){
if(startTime==null){
if (e.currentTarget.dataset.hour<10){
var hour = "0" + e.currentTarget.dataset.hour
if (e.currentTarget.dataset.minute==0){
startTime = hour + ":00" ;
}else {
startTime = hour+ ":" + e.currentTarget.dataset.minute;
}
}else {
if (e.currentTarget.dataset.minute == 0) {
startTime = e.currentTarget.dataset.hour + ":00";
} else {
startTime = e.currentTarget.dataset.hour + ":" + e.currentTarget.dataset.minute;
}
}
console.log("会议开始时间"+startTime);
timeList[e.currentTarget.dataset.hourIndex][e.currentTarget.dataset.minIndex].color ="#4876FF";
this.setData({
"time.startTime": startTime,
"time.startIndex": [e.currentTarget.dataset.hourIndex, e.currentTarget.dataset.minIndex]
,timeList});
}
if (startTime != null && endTime == null && startIndex!=null){
if (startIndex[0] == e.currentTarget.dataset.hourIndex){ var _this = this;
for (var j = startIndex[1]; j <= e.currentTarget.dataset.minIndex; j++) { dd.datePicker({
timeList[e.currentTarget.dataset.hourIndex][j].color = "#4876FF"; success: (res) => {
}
} if(datedifference(dateFtt("yyyy-MM-dd", new Date()),res.date)>Number(_this.data.maxBookDay)){
if (startIndex[0] < e.currentTarget.dataset.hourIndex) { dd.alert({
for (var i = startIndex[0]; i <= e.currentTarget.dataset.hourIndex; i++) { content: '该时间段不可选择',
if (i == startIndex[0]){ buttonText: '我知道了',
for (var j = startIndex[1]; j <=3; j++){ success:()=>{
timeList[i][j].color = "#4876FF"; _this.setData({
} dates: dateFtt("yyyy-MM-dd", new Date())
} });
if (i > startIndex[0] && i < e.currentTarget.dataset.hourIndex) { this.showTimeList(_this,_this.data.cnum)
for (var j =0; j <= 3; j++) {
timeList[i][j].color = "#4876FF";
}
}
if (i== e.currentTarget.dataset.hourIndex) {
for (var j = 0; j <= e.currentTarget.dataset.minIndex; j++) {
timeList[i][j].color = "#4876FF";
} }
} })
}else {
_this.setData({
dates: res.date
});
this.showTimeList(_this,_this.data.cnum)
} }
//查询当天会议时间段
//清空原來的
} }
if (e.currentTarget.dataset.hour < 10) { })
var hour = "0" + e.currentTarget.dataset.hour },
endTime = hour+ ":" + (e.currentTarget.dataset.minute + 15);
} else {
endTime = e.currentTarget.dataset.hour + ":" + (e.currentTarget.dataset.minute + 15);
}
console.log("会议结束时间" + endTime);
var sh =Number(this.data.time.startTime.split(":")[0]);
var sm = Number (this.data.time.startTime.split(":")[1]);
var eh = Number(e.currentTarget.dataset.hour);
var em = Number(e.currentTarget.dataset.minute + 15);
var minutes=(eh*60+em) -(sh*60+sm); /***
this.setData({ * 清空预定时间
"time.endTime": endTime, * ***/
"time.endIndex": [e.currentTarget.dataset.hourIndex, e.currentTarget.dataset.minIndex], clearBox:(startTime,endTime,startIndex,endIndex,timeList,_this)=>{
"time.min": minutes,
timeList if (startIndex[0] == endIndex[0]) {
});
}
if (startTime != null && endTime != null && startIndex != null && endIndex != null) {
endTime =null;
startTime = null;
if (startIndex[0] ==endIndex[0]) {
for (var j = startIndex[1]; j <= endIndex[1]; j++) { for (var j = startIndex[1]; j <= endIndex[1]; j++) {
timeList[startIndex[0]][j].color = ""; timeList[startIndex[0]][j].color = "";
} }
...@@ -464,9 +551,11 @@ Page({ ...@@ -464,9 +551,11 @@ Page({
} }
} }
} }
endTime =null;
startTime = null;
startIndex=null; startIndex=null;
endIndex = null; endIndex = null;
this.setData({ _this.setData({
"time.endTime": endTime, "time.endTime": endTime,
"time.startTime": startTime, "time.startTime": startTime,
"time.startIndex": startIndex, "time.startIndex": startIndex,
...@@ -474,14 +563,140 @@ Page({ ...@@ -474,14 +563,140 @@ Page({
"time.min": 0, "time.min": 0,
timeList timeList
}); });
},
//点击小方块
selTime:function(e){
var startTime=this.data.time.startTime;
var endTime = this.data.time.endTime;
var startIndex = this.data.time.startIndex;
var endIndex = this.data.time.endIndex;
var timeList = this.data.timeList;
var unclick= e.currentTarget.dataset.unclick;
if(unclick){
dd.alert({
content: '该时间段不可选择',
buttonText: '我知道了',
})
return false;
} }
if (!unclick){
var h= e.currentTarget.dataset.hour;
var m= e.currentTarget.dataset.minute;
if(startTime == null){
//开始时间
var sHour = h.toString().padStart(2,'0');
var sMinute =m.toString().padStart(2,'0');
startTime= `${sHour}:${sMinute}`
var eHour = m+15 ===60 ? (h + 1).toString().padStart(2,'0'): h.toString().padStart(2,'0');
var eMinute =m+15 ===60 ? '00' : (m+15).toString().padStart(2,'0');
endTime= `${eHour}:${eMinute}`;
timeList[e.currentTarget.dataset.hourIndex][e.currentTarget.dataset.minIndex].color ="#4876FF";
this.setData({
"time.startTime": startTime,
"time.endTime": endTime,
"time.startIndex": [e.currentTarget.dataset.hourIndex, e.currentTarget.dataset.minIndex],
"time.endIndex": [e.currentTarget.dataset.hourIndex, e.currentTarget.dataset.minIndex],
timeList,
"time.min":15
});
}else {
var hh = h.toString().padStart(2,'0');
var ss =m.toString().padStart(2,'0');
var time= `${hh}:${ss}`;
var eHour = m+15 ===60 ? (h + 1).toString().padStart(2,'0'): h.toString().padStart(2,'0');
var eMinute =m+15 ===60 ? '00' : (m+15).toString().padStart(2,'0');
var eTime= `${eHour}:${eMinute}`
console.log(`time :${time} eTime:${eTime} startTime :${startTime} endTime:${endTime}`)
if(toSecond(endTime) == toSecond(eTime) && toSecond(startTime) == toSecond(time)){
return false;
}
if (toSecond(startTime) > toSecond(time) ){
//重新设置开始时间
startTime=time;
//变色
var loop = startIndex[1];
var condi =0;
for(var i= startIndex[0]; e.currentTarget.dataset.hourIndex<=i;i-- ){
for(var j= loop;j>=condi;j--){
timeList[i][j].color = "#4876FF";
if(i==e.currentTarget.dataset.hourIndex){
condi=e.currentTarget.dataset.minIndex;
}
}
loop=3;
}
this.setData({
"time.startTime": startTime,
"time.startIndex": [e.currentTarget.dataset.hourIndex, e.currentTarget.dataset.minIndex],
});
}else if(toSecond(endTime) < toSecond(eTime)){
//重新设置结束时间
endTime= eTime
var loop = endIndex[1];
var condi =3
for(var i= endIndex[0]; i<=e.currentTarget.dataset.hourIndex ;i++ ){
for(var j= loop;j<=condi;j++){
// console.log(`i:${i}--------j:${j}----condi${condi}-----loop =${loop}`)
timeList[i][j].color = "#4876FF";
if(i==e.currentTarget.dataset.hourIndex){
condi=e.currentTarget.dataset.minIndex;
}
}
loop=0;
}
this.setData({
"time.endTime": endTime,
"time.endIndex": [e.currentTarget.dataset.hourIndex, e.currentTarget.dataset.minIndex],
});
}else if(toSecond(endTime) >= toSecond(eTime) && toSecond(startTime) <= toSecond(time)){
this.clearBox(startTime,endTime,startIndex,endIndex,timeList,this);
return false;
}
var sh =Number(startTime.split(":")[0]);
var sm = Number (startTime.split(":")[1]);
var eh =Number(endTime.split(":")[0]);
var em = Number (endTime.split(":")[1]);
var minutes=(eh*60+em) -(sh*60+sm);
var hours= minutes/60;
var maxBookTime = e.currentTarget.dataset.maxBookTime;
if(hours > maxBookTime){
dd.alert({
content: '超过最大预定时长，请重新选择',
buttonText: '我知道了',
success: () => {
var startTime=this.data.time.startTime;
var endTime = this.data.time.endTime;
var startIndex = this.data.time.startIndex;
var endIndex = this.data.time.endIndex;
var timeList = this.data.timeList;
this.clearBox(startTime,endTime,startIndex,endIndex,timeList,this);
}
});
}
this.setData({
"time.startTime": startTime,
"time.endTime": endTime,
timeList,
"time.min":minutes
});
console.log('开始时间',this.data.time.startTime);
console.log('结束时间',this.data.time.endTime)
}
}else { }else {
return false; return false;
} }
console.log(e.currentTarget.dataset.hour);
console.log(e.currentTarget.dataset.minute);
// console.log(e.currentTarget.dataset.hourIndex);
// console.log(e.currentTarget.dataset.minIndex);
}, },
getSite:function(){ getSite:function(){
dd.chooseDepartments({ dd.chooseDepartments({
...@@ -508,6 +723,163 @@ console.log(e.currentTarget.dataset.hour); ...@@ -508,6 +723,163 @@ console.log(e.currentTarget.dataset.hour);
}); });
}, },
// //点击小方块
// selTime:function(e){
// var startTime=this.data.time.startTime;
// var endTime = this.data.time.endTime;
// var startIndex = this.data.time.startIndex;
// var endIndex = this.data.time.endIndex;
// var timeList = this.data.timeList;
// var unclick= e.currentTarget.dataset.unclick;
// // console.log(startIndex);
// if (!unclick){
// if(startTime==null){
// if (e.currentTarget.dataset.hour<10){
// var hour = "0" + e.currentTarget.dataset.hour
// if (e.currentTarget.dataset.minute==0){
// startTime = hour + ":00" ;
// }else {
// startTime = hour+ ":" + e.currentTarget.dataset.minute;
// }
// }else {
// if (e.currentTarget.dataset.minute == 0) {
// startTime = e.currentTarget.dataset.hour + ":00";
// } else {
// startTime = e.currentTarget.dataset.hour + ":" + e.currentTarget.dataset.minute;
// }
// }
// console.log("会议开始时间"+startTime);
// timeList[e.currentTarget.dataset.hourIndex][e.currentTarget.dataset.minIndex].color ="#4876FF";
// this.setData({
// "time.startTime": startTime,
// "time.startIndex": [e.currentTarget.dataset.hourIndex, e.currentTarget.dataset.minIndex]
// ,timeList});
// }
// if (startTime != null && endTime == null && startIndex!=null){
// if (startIndex[0] == e.currentTarget.dataset.hourIndex){
// for (var j = startIndex[1]; j <= e.currentTarget.dataset.minIndex; j++) {
// timeList[e.currentTarget.dataset.hourIndex][j].color = "#4876FF";
// }
// }
// if (startIndex[0] < e.currentTarget.dataset.hourIndex) {
// for (var i = startIndex[0]; i <= e.currentTarget.dataset.hourIndex; i++) {
// if (i == startIndex[0]){
// for (var j = startIndex[1]; j <=3; j++){
// timeList[i][j].color = "#4876FF";
// }
// }
// if (i > startIndex[0] && i < e.currentTarget.dataset.hourIndex) {
// for (var j =0; j <= 3; j++) {
// timeList[i][j].color = "#4876FF";
// }
// }
// if (i== e.currentTarget.dataset.hourIndex) {
// for (var j = 0; j <= e.currentTarget.dataset.minIndex; j++) {
// timeList[i][j].color = "#4876FF";
// }
// }
// }
// }
// if (e.currentTarget.dataset.hour < 10) {
// var hour = "0" + e.currentTarget.dataset.hour
// endTime = hour+ ":" + (e.currentTarget.dataset.minute + 15);
// } else {
// endTime = e.currentTarget.dataset.hour + ":" + (e.currentTarget.dataset.minute + 15);
// }
// console.log("会议结束时间" + endTime);
// var sh =Number(this.data.time.startTime.split(":")[0]);
// var sm = Number (this.data.time.startTime.split(":")[1]);
// var eh = Number(e.currentTarget.dataset.hour);
// var em = Number(e.currentTarget.dataset.minute + 15);
// var minutes=(eh*60+em) -(sh*60+sm);
// this.setData({
// "time.endTime": endTime,
// "time.endIndex": [e.currentTarget.dataset.hourIndex, e.currentTarget.dataset.minIndex],
// "time.min": minutes,
// timeList
// });
// }
// if (startTime != null && endTime != null && startIndex != null && endIndex != null) {
// endTime =null;
// startTime = null;
// if (startIndex[0] ==endIndex[0]) {
// for (var j = startIndex[1]; j <= endIndex[1]; j++) {
// timeList[startIndex[0]][j].color = "";
// }
// }
// if (startIndex[0] < endIndex[0]) {
// for (var i = startIndex[0]; i <= endIndex[0]; i++) {
// if (i == startIndex[0]) {
// for (var j = startIndex[1]; j <= 3; j++) {
// timeList[i][j].color = "";
// }
// }
// if (i > startIndex[0] && i < endIndex[0]) {
// for (var j = 0; j <= 3; j++) {
// timeList[i][j].color = "";
// }
// }
// if (i == endIndex[0]) {
// for (var j = 0; j <= endIndex[1]; j++) {
// timeList[i][j].color = "";
// }
// }
// }
// }
// startIndex=null;
// endIndex = null;
// this.setData({
// "time.endTime": endTime,
// "time.startTime": startTime,
// "time.startIndex": startIndex,
// "time.endIndex": endIndex,
// "time.min": 0,
// timeList
// });
// }
// }else {
// return false;
// }
// console.log(e.currentTarget.dataset.hour);
// console.log(e.currentTarget.dataset.minute);
// // console.log(e.currentTarget.dataset.hourIndex);
// // console.log(e.currentTarget.dataset.minIndex);
// },
// getSite:function(){
// dd.chooseDepartments({
// title: "选择与会人", //标题
// multiple: true, //是否多选
// limitTips: "超出了", //超过限定人数返回提示
// maxDepartments: 100, //最大选择部门数量
// pickedDepartments: [], //已选部门
// disabledDepartments: [], //不可选部门
// requiredDepartments: [], //必选部门（不可取消选中状态）
// appId: 158, //微应用的Id
// permissionType: "xxx", //选人权限，目前只有GLOBAL这个参数
// success: function(res) {
// /**
// {
// userCount:1, //选择人数
// departmentsCount:1，//选择的部门数量
// departments:[{"id":,"name":"","number":}]//返回已选部门列表，列表中每个对象包含id（部门id）、name（部门名称）、number（部门人数）
// }
// */
// },
// fail: function(err) {
// }
// });
// },
//消息选择 //消息选择
bindPickerChange: function(e) { bindPickerChange: function(e) {
...@@ -627,6 +999,7 @@ console.log(e.currentTarget.dataset.hour); ...@@ -627,6 +999,7 @@ console.log(e.currentTarget.dataset.hour);
console.log("topicList",topicList) console.log("topicList",topicList)
_this.setData({ _this.setData({
message: res.data.result, message: res.data.result,
mid:res.data.result.messageId,
messageContent: res.data.result.messageContent, messageContent: res.data.result.messageContent,
topicList:topicList topicList:topicList
}); });
...@@ -717,8 +1090,10 @@ console.log(e.currentTarget.dataset.hour); ...@@ -717,8 +1090,10 @@ console.log(e.currentTarget.dataset.hour);
var min = (eh * 60 + em) - (sh * 60 + sm); var min = (eh * 60 + em) - (sh * 60 + sm);
_this.setData({ _this.setData({
"time.endTime": new Date(message.endTime), "time.endTime": `${eh}:${em}`,
"time.startTime": new Date(message.startTime), "time.startTime": `${sh}:${sm}`,
"time.startIndex": [sh,parseInt((sm+15)/15)],
"time.endIndex": [eh,parseInt((em+15)/15)],
"time.min": min "time.min": min
}); });
json["color"] = "#4876FF"; json["color"] = "#4876FF";
...@@ -809,6 +1184,8 @@ console.log(e.currentTarget.dataset.hour); ...@@ -809,6 +1184,8 @@ console.log(e.currentTarget.dataset.hour);
// 页面被拉到底部 // 页面被拉到底部
}, },
onShareAppMessage() { onShareAppMessage() {
// 返回自定义分享信息
var _this = this;
// 返回自定义分享信息 // 返回自定义分享信息
return { return {
title: 'My App', title: 'My App',
...@@ -839,12 +1216,14 @@ function dateCompare(nowDate, selectDate) { ...@@ -839,12 +1216,14 @@ function dateCompare(nowDate, selectDate) {
var aEnd = selectDate.split('-'); var aEnd = selectDate.split('-');
var startDateTemp = aStart[0] + "/" + aStart[1] + "/" + aStart[2]; var startDateTemp = aStart[0] + "/" + aStart[1] + "/" + aStart[2];
var endDateTemp = aEnd[0] + "/" + aEnd[1] + "/" + aEnd[2]; var endDateTemp = aEnd[0] + "/" + aEnd[1] + "/" + aEnd[2];
if (startDateTemp > endDateTemp) if (startDateTemp > endDateTemp)
return 0; return 0;
else if (startDateTemp == endDateTemp) else if (startDateTemp == endDateTemp)
return 1; return 1;
else if (startDateTemp < endDateTemp) else if (startDateTemp < endDateTemp)
return 2; return 2;
} }
var time_range = function(beginTime, endTime, nowTime) { var time_range = function(beginTime, endTime, nowTime) {
var strb = beginTime.split(":"); var strb = beginTime.split(":");
...@@ -879,3 +1258,23 @@ var time_range = function(beginTime, endTime, nowTime) { ...@@ -879,3 +1258,23 @@ var time_range = function(beginTime, endTime, nowTime) {
return false; return false;
} }
} }
function datedifference(sDate1, sDate2) { //sDate1和sDate2是2006-12-18格式
var dateSpan,
tempDate,
iDays;
sDate1 = Date.parse(sDate1);
sDate2 = Date.parse(sDate2);
dateSpan = sDate2 - sDate1;
dateSpan = Math.abs(dateSpan);
iDays = Math.floor(dateSpan / (24 * 3600 * 1000));
return iDays
};
function toSecond(time) {
let str = time;
let arr = str.split(':');
let hs = parseInt(arr[0] * 3600);
let ms = parseInt(arr[1] * 60);
let seconds = hs + ms
return seconds
}
pages/mine/edit/edit.acss
浏览文件 @ 13fc9683
.user_img{ .user_img{
width: 80rpx; width: 80rpx;
height: 80rpx; height: 80rpx;
border-radius: 50%;
border: 1px solid #ccc; border: 1px solid #ccc;
border-radius: 67rpx; border-radius: 67rpx;
margin-left: 340rpx; margin-left: 340rpx;
......
pages/mine/edit/edit.axml
浏览文件 @ 13fc9683
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
<input type='num' name="phonetel" value='{{user.phonetel}}' maxlength="11" onBlur="Phone" /> <input type='num' name="phonetel" value='{{user.phonetel}}' maxlength="11" onBlur="Phone" />
</view> </view>
<view class='item-avatar-xs'> <view class='item-avatar-xs'>
<text>昵 称 ： <text>昵 称 ： </text>
<input value="{{user.nickname}}" name="nickname" placeholder='请输入昵称' /></text> <input value="{{user.nickname}}" name="nickname" placeholder='请输入昵称' />
</view> </view>
<view class='item-avatar-xs'> <view class='item-avatar-xs'>
<text>邮 箱 ：</text> <text>邮 箱 ：</text>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论