更新layui版本

web/calendar.html

@@ -63,39 +63,40 @@
 <script src="layui/layui.js"></script>
 <script src="layui/jquery-3.2.1.js"></script>
 <script>
+    let marks = []
+    let laydate;
+    let datatmp;
     layui.use('laydate', function () {
         let dayDateObj
-        let marks = {}
-        let laydate = layui.laydate;
-        function showLayDate() {
-            laydate.render({
-                elem: '#calendar' //指定元素
-                , position: 'static'
-                , mark: marks
-                , done: function (value, date, endDate) {
-                    console.log(date)
-                    dayDateObj=date;
-                    $('#dateText')[0].innerHTML = "从" + date.date + "号开始计算"
 
-                }
+        laydate = layui.laydate;
-            });
+        datatmp = laydate.render({
-        }
+            elem: '#calendar' //指定元素
+            , position: 'static'
+            //  , mark: marks
+            , holidays: marks
+            , done: function (value, date, endDate) {
+                console.log(date)
+                dayDateObj = date;
+                $('#dateText')[0].innerHTML = "从" + date.date + "号开始计算"
+            }
+        });
         $.get("/calendar/all.do", function (json) {
             //执行一个laydate实例
-            marks = json.data.date;
+            // marks = json.data.date;
             showLayDate()
         })
 
 
         $('#setCalendar').click(function () {
-            let interval=$('#interval')[0].value
+            let interval = $('#interval')[0].value
-            let day=$('#day')[0].value
+            let day = $('#day')[0].value
-            let intervalText=$('#interval').find("option:selected").text();
+            let intervalText = $('#interval').find("option:selected").text();
-            intervalText=intervalText.replace('X',day)
+            intervalText = intervalText.replace('X', day)
             layer.open({
                 title: '确认'
-                ,content: '确认从'+dayDateObj.date+'号开始， '+intervalText+' 开始提醒？'
+                , content: '确认从' + dayDateObj.date + '号开始， ' + intervalText + ' 开始提醒？'
-                ,yes:function (index, layero) {
+                , yes: function (index, layero) {
 
                 }
             });

web/layui/css/modules/code.css

@@ -1 +1 @@
-html #layuicss-skincodecss{display:none;position:absolute;width:1989px}.layui-code-h3,.layui-code-view{position:relative;font-size:12px}.layui-code-view{display:block;margin:10px 0;padding:0;border:1px solid #eee;border-left-width:6px;background-color:#FAFAFA;color:#333;font-family:Courier New}.layui-code-h3{padding:0 10px;height:40px;line-height:40px;border-bottom:1px solid #eee}.layui-code-h3 a{position:absolute;right:10px;top:0;color:#999}.layui-code-view .layui-code-ol{position:relative;overflow:auto}.layui-code-view .layui-code-ol li{position:relative;margin-left:45px;line-height:20px;padding:0 10px;border-left:1px solid #e2e2e2;list-style-type:decimal-leading-zero;*list-style-type:decimal;background-color:#fff}.layui-code-view .layui-code-ol li:first-child{padding-top:10px}.layui-code-view .layui-code-ol li:last-child{padding-bottom:10px}.layui-code-view pre{margin:0}.layui-code-notepad{border:1px solid #0C0C0C;border-left-color:#3F3F3F;background-color:#0C0C0C;color:#C2BE9E}.layui-code-notepad .layui-code-h3{border-bottom:none}.layui-code-notepad .layui-code-ol li{background-color:#3F3F3F;border-left:none}.layui-code-demo .layui-code{visibility:visible!important;margin:-15px;border-top:none;border-right:none;border-bottom:none}.layui-code-demo .layui-tab-content{padding:15px;border-top:none}
+html #layuicss-skincodecss{display:none;position:absolute;width:1989px}.layui-code-view{display:block;position:relative;margin:10px 0;padding:0;border:1px solid #eee;border-left-width:6px;background-color:#fafafa;color:#333;font-family:Courier New;font-size:13px}.layui-code-title{position:relative;padding:0 10px;height:40px;line-height:40px;border-bottom:1px solid #eee;font-size:12px}.layui-code-title>.layui-code-about{position:absolute;right:10px;top:0;color:#b7b7b7}.layui-code-about>a{padding-left:10px}.layui-code-view>.layui-code-ol,.layui-code-view>.layui-code-ul{position:relative;overflow:auto}.layui-code-view>.layui-code-ol>li{position:relative;margin-left:45px;line-height:20px;padding:0 10px;border-left:1px solid #e2e2e2;list-style-type:decimal-leading-zero;*list-style-type:decimal;background-color:#fff}.layui-code-view>.layui-code-ol>li:first-child,.layui-code-view>.layui-code-ul>li:first-child{padding-top:10px}.layui-code-view>.layui-code-ol>li:last-child,.layui-code-view>.layui-code-ul>li:last-child{padding-bottom:10px}.layui-code-view>.layui-code-ul>li{position:relative;line-height:20px;padding:0 10px;list-style-type:none;*list-style-type:none;background-color:#fff}.layui-code-view pre{margin:0}.layui-code-dark{border:1px solid #0c0c0c;border-left-color:#3f3f3f;background-color:#0c0c0c;color:#c2be9e}.layui-code-dark>.layui-code-title{border-bottom:none}.layui-code-dark>.layui-code-ol>li,.layui-code-dark>.layui-code-ul>li{background-color:#3f3f3f;border-left:none}.layui-code-dark>.layui-code-ul>li{margin-left:6px}.layui-code-demo .layui-code{visibility:visible!important;margin:-15px;border-top:none;border-right:none;border-bottom:none}.layui-code-demo .layui-tab-content{padding:15px;border-top:none}