bugfix

static/js/public.js

@@ -93,18 +93,11 @@ function getHeaderInfo() {
         type: "get",
         dataType: "json",
         success: function (data) {
-<<<<<<< static/js/public.js
-            if(data.status == 500){
-                window.location="/LoginDirect.aspx";
-                return
-            }
-=======
             if (data.status == 500) {
                 window.location = "/LoginDirect.aspx";
                 return
             }
 
->>>>>>> static/js/public.js
             $("#op_name").html(data.data[0].op_name);
             $("#area").html(data.data[0].area);
             $("#op_avatar").attr('src', data.data[0].op_avatar);

static/js/zjjc.js

@@ -509,7 +509,7 @@ var getRightdata = {
     }
 }
 function getMonthDay(year, month) {
-    let days = new Date(year, month + 1, 0).getDate()
+    let days = new Date(year, month, 0).getDate()
     return days
 }
 var getBottomData = {
@@ -556,7 +556,7 @@ var getBottomData = {
         var lastDay = getMonthDay(year, month)
         console.log(year, month)
         $("#bhg-date .begin").html(year + '-' + month + '-' + '01');
-        $("#bhg-date .end").html(year + '-' + month + '-' + lastDay);
+        $("#bhg-date .end").html(year + '-' + month + '-' + Number(lastDay));
         this.getUnusual();
     },
     getUnusual: function () {