Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
为 GitLab 提交贡献
登录
切换导航
U
UbainsMeeting
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
郑礼德
UbainsMeeting
Commits
13fc9683
提交
13fc9683
authored
6 年前
作者:
曾美红
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修改预定
上级
218074f2
显示空白字符变更
内嵌
并排
正在显示
5 个修改的文件
包含
610 行增加
和
210 行删除
+610
-210
app.js
app.js
+1
-1
addmeeting.js
pages/conference/addmeeting/addmeeting.js
+5
-5
modifymeeting.js
pages/conference/modifymeeting/modifymeeting.js
+601
-202
edit.acss
pages/mine/edit/edit.acss
+1
-0
edit.axml
pages/mine/edit/edit.axml
+2
-2
没有找到文件。
app.js
浏览文件 @
13fc9683
...
...
@@ -14,7 +14,7 @@ App({
//全局数据
globalData
:
{
//domain:'http://id24iu.natappfree.cc',
//
domain:"http://dd2.ubainsyun.com",
//
domain:"http://dd2.ubainsyun.com",
domain
:
"http://zhenglide.natapp1.cc"
,
corpId
:
''
,
userId
:
''
,
...
...
This diff is collapsed.
Click to expand it.
pages/conference/addmeeting/addmeeting.js
浏览文件 @
13fc9683
...
...
@@ -154,9 +154,9 @@ Page({
})
return
false
;
}
let
res
=
dd
.
getStorageSync
({
key
:
signList
});
let
res
=
dd
.
getStorageSync
({
key
:
'signList'
});
var
topicList
=
this
.
data
.
topicList
;
console
.
log
(
this
.
data
.
topicList
);
console
.
log
(
res
.
data
);
dd
.
httpRequest
({
url
:
addmeetingeUrl
,
method
:
'POST'
,
...
...
@@ -170,7 +170,7 @@ Page({
messageName
:
e
.
detail
.
value
.
messageName
,
messageCompere
:
e
.
detail
.
value
.
messageCompere
,
topicList
:
topicList
,
signList
:
res
.
data
,
signList
:
JSON
.
stringify
(
res
.
data
)
,
messageContent
:
e
.
detail
.
value
.
messageContent
,
remindMethod
:
e
.
detail
.
value
.
remindMethod
,
remindTime
:
e
.
detail
.
value
.
remindTime
,
...
...
@@ -220,7 +220,7 @@ Page({
}
},
fail
:
function
(
res
)
{
//
console.log("httpRequestFail---", res)
console
.
log
(
"httpRequestFail---"
,
res
)
//dd.alert({ content: JSON.stringify(res) });
},
...
...
This diff is collapsed.
Click to expand it.
pages/conference/modifymeeting/modifymeeting.js
浏览文件 @
13fc9683
...
...
@@ -15,12 +15,13 @@ Page({
showView
:
true
,
conferenceList
:
[],
mid
:
null
,
message
:
null
,
message
:
{}
,
messageContent
:
""
,
//msgArray: ['无提醒', '提前十分钟', '提前半小时', '提前一小时'],
showView
:
false
,
dates
:
dateFtt
(
"yyyy-MM-dd"
,
new
Date
()),
topicList
:
[],
// signList:'',
text
:
''
,
cnum
:
''
,
allTime
:
{
...
...
@@ -81,22 +82,22 @@ Page({
},
//是否安排座位
switch
:
function
()
{
//console.log("点击");
var
mid
=
this
.
data
.
mid
;
console
.
log
(
"会议室"
,
this
.
data
.
cnum
)
// if (this.data.cnum==""){
// dd.alert({
// title: "参数错误",
// content: "会议室没有选择",
// buttonText: '确定'
// })
// return false;
// }
var
_this
=
this
;
},
//
switch: function() {
//
//console.log("点击");
//
var mid=this.data.mid;
//
console.log("会议室", this.data.cnum)
//
// if (this.data.cnum==""){
//
// dd.alert({
//
// title: "参数错误",
//
// content: "会议室没有选择",
//
// buttonText: '确定'
//
// })
//
// return false;
//
// }
//
var _this=this;
//
},
//显示隐藏(方式选项)
onChangeShowState
:
function
()
{
var
that
=
this
;
...
...
@@ -144,6 +145,15 @@ Page({
})
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
))
{
dd
.
alert
({
title
:
"参数错误"
,
...
...
@@ -152,7 +162,8 @@ Page({
})
return
false
;
}
let
res
=
dd
.
getStorageSync
({
key
:
signList
});
let
res
=
dd
.
getStorageSync
({
key
:
'signList'
});
console
.
log
(
'signList'
,
res
.
data
)
var
topicList
=
this
.
data
.
topicList
;
dd
.
httpRequest
({
url
:
savemeetingeUrl
,
...
...
@@ -166,7 +177,7 @@ Page({
messageName
:
e
.
detail
.
value
.
messageName
,
messageCompere
:
e
.
detail
.
value
.
messageCompere
,
topicList
:
topicList
,
signList
:
res
.
data
,
signList
:
JSON
.
stringify
(
res
.
data
)
,
messageContent
:
e
.
detail
.
value
.
messageContent
,
remindMethod
:
e
.
detail
.
value
.
remindMethod
,
remindTime
:
e
.
detail
.
value
.
remindTime
,
...
...
@@ -222,40 +233,168 @@ Page({
});
},
datePicker
()
{
var
timeList
=
this
.
data
.
timeList
;
var
hours
=
this
.
data
.
allTime
.
hours
;
var
minutes
=
this
.
data
.
allTime
.
minutes
;
var
_this
=
this
;
dd
.
datePicker
({
success
:
(
res
)
=>
{
_this
.
setData
({
dates
:
res
.
date
});
// datePicker() {
// var timeList = this.data.timeList;
// var hours = this.data.allTime.hours;
// var minutes = this.data.allTime.minutes;
// var _this = this;
// dd.datePicker({
// success: (res) => {
// _this.setData({
// dates: res.date
// });
// //查询当天会议时间段
// var dates = res.date;
// //清空原來的
// 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: _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
dates
=
res
.
date
;
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
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
:
_this
.
data
.
message
.
cnum
cnum
:
cnum
},
dataType
:
'json'
,
success
:
function
(
res
)
{
console
.
log
(
'success----message'
,
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
=
{};
...
...
@@ -266,45 +405,40 @@ Page({
_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
)
{
if
(
dateCompare
(
dateFtt
(
"yyyy-MM-dd"
,
new
Date
()),
_this
.
data
.
dates
)
==
0
)
{
json
[
"color"
]
=
"#ABABAB"
;
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
])
{
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
)
{
else
if
(
dateCompare
(
dateFtt
(
"yyyy-MM-dd"
,
new
Date
()),
_this
.
data
.
dates
)
==
2
)
{
json
[
"color"
]
=
""
;
json
[
"unclick"
]
=
false
;
}
...
...
@@ -315,15 +449,19 @@ Page({
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("会议开始时间", 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
);
...
...
@@ -336,111 +474,60 @@ Page({
_this
.
setData
({
timeList
})
//console.log("timeList", timeList)
dd
.
hideLoading
();
},
fail
:
function
(
res
)
{
console
.
log
(
"httpRequestFail---"
,
res
)
dd
.
alert
({
content
:
JSON
.
stringify
(
res
)
});
//
dd.alert({ content: JSON.stringify(res) });
},
complete
:
function
(
res
)
{
dd
.
hideLoading
();
//
dd.hideLoading();
}
});
}
})
},
//点击小方块
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
;
//点击时间格
datePicker
()
{
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
);
var
hours
=
this
.
data
.
allTime
.
hours
;
var
minutes
=
this
.
data
.
allTime
.
minutes
;
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
});
var
_this
=
this
;
dd
.
datePicker
({
success
:
(
res
)
=>
{
if
(
datedifference
(
dateFtt
(
"yyyy-MM-dd"
,
new
Date
()),
res
.
date
)
>
Number
(
_this
.
data
.
maxBookDay
)){
dd
.
alert
({
content
:
'该时间段不可选择'
,
buttonText
:
'我知道了'
,
success
:()
=>
{
_this
.
setData
({
dates
:
dateFtt
(
"yyyy-MM-dd"
,
new
Date
())
});
this
.
showTimeList
(
_this
,
_this
.
data
.
cnum
)
}
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
);
}
else
{
_this
.
setData
({
dates
:
res
.
date
});
this
.
showTimeList
(
_this
,
_this
.
data
.
cnum
)
}
//查询当天会议时间段
//清空原來的
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
);
}
})
},
/***
* 清空预定时间
* ***/
clearBox
:(
startTime
,
endTime
,
startIndex
,
endIndex
,
timeList
,
_this
)
=>
{
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
])
{
if
(
startIndex
[
0
]
==
endIndex
[
0
])
{
for
(
var
j
=
startIndex
[
1
];
j
<=
endIndex
[
1
];
j
++
)
{
timeList
[
startIndex
[
0
]][
j
].
color
=
""
;
}
...
...
@@ -464,9 +551,11 @@ Page({
}
}
}
endTime
=
null
;
startTime
=
null
;
startIndex
=
null
;
endIndex
=
null
;
this
.
setData
({
_
this
.
setData
({
"time.endTime"
:
endTime
,
"time.startTime"
:
startTime
,
"time.startIndex"
:
startIndex
,
...
...
@@ -474,14 +563,140 @@ Page({
"time.min"
:
0
,
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
{
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
({
...
...
@@ -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
)
{
...
...
@@ -627,6 +999,7 @@ console.log(e.currentTarget.dataset.hour);
console
.
log
(
"topicList"
,
topicList
)
_this
.
setData
({
message
:
res
.
data
.
result
,
mid
:
res
.
data
.
result
.
messageId
,
messageContent
:
res
.
data
.
result
.
messageContent
,
topicList
:
topicList
});
...
...
@@ -717,8 +1090,10 @@ console.log(e.currentTarget.dataset.hour);
var
min
=
(
eh
*
60
+
em
)
-
(
sh
*
60
+
sm
);
_this
.
setData
({
"time.endTime"
:
new
Date
(
message
.
endTime
),
"time.startTime"
:
new
Date
(
message
.
startTime
),
"time.endTime"
:
`
${
eh
}
:
${
em
}
`
,
"time.startTime"
:
`
${
sh
}
:
${
sm
}
`
,
"time.startIndex"
:
[
sh
,
parseInt
((
sm
+
15
)
/
15
)],
"time.endIndex"
:
[
eh
,
parseInt
((
em
+
15
)
/
15
)],
"time.min"
:
min
});
json
[
"color"
]
=
"#4876FF"
;
...
...
@@ -809,6 +1184,8 @@ console.log(e.currentTarget.dataset.hour);
// 页面被拉到底部
},
onShareAppMessage
()
{
// 返回自定义分享信息
var
_this
=
this
;
// 返回自定义分享信息
return
{
title
:
'My App'
,
...
...
@@ -839,12 +1216,14 @@ function dateCompare(nowDate, selectDate) {
var
aEnd
=
selectDate
.
split
(
'-'
);
var
startDateTemp
=
aStart
[
0
]
+
"/"
+
aStart
[
1
]
+
"/"
+
aStart
[
2
];
var
endDateTemp
=
aEnd
[
0
]
+
"/"
+
aEnd
[
1
]
+
"/"
+
aEnd
[
2
];
if
(
startDateTemp
>
endDateTemp
)
return
0
;
else
if
(
startDateTemp
==
endDateTemp
)
return
1
;
else
if
(
startDateTemp
<
endDateTemp
)
return
2
;
}
var
time_range
=
function
(
beginTime
,
endTime
,
nowTime
)
{
var
strb
=
beginTime
.
split
(
":"
);
...
...
@@ -879,3 +1258,23 @@ var time_range = function(beginTime, endTime, nowTime) {
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
}
This diff is collapsed.
Click to expand it.
pages/mine/edit/edit.acss
浏览文件 @
13fc9683
.user_img{
width: 80rpx;
height: 80rpx;
border-radius: 50%;
border: 1px solid #ccc;
border-radius: 67rpx;
margin-left: 340rpx;
...
...
This diff is collapsed.
Click to expand it.
pages/mine/edit/edit.axml
浏览文件 @
13fc9683
...
...
@@ -9,8 +9,8 @@
<input type='num' name="phonetel" value='{{user.phonetel}}' maxlength="11" onBlur="Phone" />
</view>
<view class='item-avatar-xs'>
<text>昵 称 :
<input value="{{user.nickname}}" name="nickname" placeholder='请输入昵称' /></text
>
<text>昵 称 :
</text>
<input value="{{user.nickname}}" name="nickname" placeholder='请输入昵称' /
>
</view>
<view class='item-avatar-xs'>
<text>邮 箱 :</text>
...
...
This diff is collapsed.
Click to expand it.
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论