更新layui版本

web/calendar.html

@@ -63,40 +63,41 @@
 <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 day=$('#day')[0].value
-            let intervalText=$('#interval').find("option:selected").text();
-            intervalText=intervalText.replace('X',day)
+            let interval = $('#interval')[0].value
+            let day = $('#day')[0].value
+            let intervalText = $('#interval').find("option:selected").text();
+            intervalText = intervalText.replace('X', day)
             layer.open({
                 title: '确认'
-                ,content: '确认从'+dayDateObj.date+'号开始， '+intervalText+' 开始提醒？'
-                ,yes:function (index, layero) {
-                    
+                , content: '确认从' + dayDateObj.date + '号开始， ' + intervalText + ' 开始提醒？'
+                , yes: function (index, layero) {
+
                 }
             });