diff --git a/lib/layui_plugins/okLayer/okLayer.js b/lib/layui_plugins/okLayer/okLayer.js index c0cc0d5..21c5ba1 100644 --- a/lib/layui_plugins/okLayer/okLayer.js +++ b/lib/layui_plugins/okLayer/okLayer.js @@ -44,42 +44,39 @@ layui.define(["layer"], function (exports) { // msg弹窗默认消失时间 time: 1000, // 绿色勾 - greenTick: function (content, time, callbackFunction) { - var options = {icon: 1, time: okLayer.msg.timeCompute(time), anim: okLayer.animChoose()}; + greenTick: function (content, callbackFunction) { + var options = {icon: 1, time: okLayer.msg.time, anim: okLayer.animChoose()}; layer.msg(content, options, callbackFunction); }, // 红色叉 redCross: function (content, callbackFunction) { - var options = {icon: 2, time: okLayer.msg.timeCompute(time), anim: okLayer.animChoose()}; + var options = {icon: 2, time: okLayer.msg.time, anim: okLayer.animChoose()}; layer.msg(content, options, callbackFunction); }, // 黄色问号 yellowQuestion: function (content, callbackFunction) { - var options = {icon: 3, time: okLayer.msg.timeCompute(time), anim: okLayer.animChoose()}; + var options = {icon: 3, time: okLayer.msg.time, anim: okLayer.animChoose()}; layer.msg(content, options, callbackFunction); }, // 灰色锁 grayLock: function (content, callbackFunction) { - var options = {icon: 4, time: okLayer.msg.timeCompute(time), anim: okLayer.animChoose()}; + var options = {icon: 4, time: okLayer.msg.time, anim: okLayer.animChoose()}; layer.msg(content, options, callbackFunction); }, // 红色哭脸 redCry: function (content, callbackFunction) { - var options = {icon: 5, time: okLayer.msg.timeCompute(time), anim: okLayer.animChoose()}; + var options = {icon: 5, time: okLayer.msg.time, anim: okLayer.animChoose()}; layer.msg(content, options, callbackFunction); }, // 绿色笑脸 greenLaugh: function (content, callbackFunction) { - var options = {icon: 6, time: okLayer.msg.timeCompute(time), anim: okLayer.animChoose()}; + var options = {icon: 6, time: okLayer.msg.time, anim: okLayer.animChoose()}; layer.msg(content, options, callbackFunction); }, // 黄色感叹号 yellowSigh: function (content, callbackFunction) { - var options = {icon: 7, time: okLayer.msg.timeCompute(time), anim: okLayer.animChoose()}; + var options = {icon: 7, time: okLayer.msg.time, anim: okLayer.animChoose()}; layer.msg(content, options, callbackFunction); - }, - timeCompute: function (time) { - return time ? time : okLayer.msg.time; } }, /**