|
@@ -322,7 +322,7 @@ function copy(name) {
|
|
|
$(".copy").click(function () {
|
|
|
var texts = document.getElementById("result_title").innerText;
|
|
|
if (texts == '') {
|
|
|
- Toast('温馨提示:结果为空,无法复制', 5000000000, 'warn')
|
|
|
+ Toast('温馨提示:结果为空,无法复制', 500, 'warn')
|
|
|
return
|
|
|
}
|
|
|
var inputs = document.getElementById("inputs");
|
|
@@ -330,7 +330,7 @@ function copy(name) {
|
|
|
console.log(inputs.value)
|
|
|
inputs.select(); // 选中文本
|
|
|
document.execCommand("copy"); // 执行浏览器复制命令
|
|
|
- Toast('复制成功', 5000000000000, 'success')
|
|
|
+ Toast('复制成功', 500, 'success')
|
|
|
})
|
|
|
|
|
|
}
|
|
@@ -393,14 +393,15 @@ function getResult(pushInfo, textType) {
|
|
|
for (var i = 0; i < pushInfo.length; i++) {
|
|
|
if (pushInfo[i].content.max >= num && num >= pushInfo[i].content.min && !tmp) {
|
|
|
result = pushInfo[i].result + '(' + num + '分' + ')'
|
|
|
- proposal = pushInfo[i].pushInfo
|
|
|
+ proposal = pushInfo[i].pushInfo + ';' + proposals.join(";");
|
|
|
break
|
|
|
} else if (pushInfo[i].content.max >= num && num >= pushInfo[i].content.min && tmp) {
|
|
|
- result = pushInfo[i].result + '(' + num + '分' + ')' + ';' + tmp
|
|
|
- proposal = pushInfo[i].pushInfo
|
|
|
+ result = pushInfo[i].result + '(' + num + '分' + ')' + ';' + tmp
|
|
|
+ proposal = pushInfo[i].pushInfo + ';' + proposals.join(";");
|
|
|
break
|
|
|
} else {
|
|
|
result = tmp
|
|
|
+ proposal = proposals.join(";");
|
|
|
}
|
|
|
}
|
|
|
} else {
|
|
@@ -430,7 +431,7 @@ function getResult(pushInfo, textType) {
|
|
|
$(".foot").css('display', 'block')
|
|
|
}
|
|
|
} else {
|
|
|
- Toast('温馨提示:必填选项不能为空~', 5000000000, 'warn')
|
|
|
+ Toast('温馨提示:必填选项不能为空~', 500, 'warn')
|
|
|
}
|
|
|
})
|
|
|
$(".printing").hover(
|