X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=lib%2FLunarCalendar.js;h=a754f33175d6d05017579336224e064e2166548e;hb=9712089136a8268cd9b66c3aaee87190e0c0c267;hp=6f09156d01db400196a25c0730601c239d2a899c;hpb=dbda9b495a6ffb701b656c766bbab2aa228da94d;p=LunarCalendar.git diff --git a/lib/LunarCalendar.js b/lib/LunarCalendar.js index 6f09156..a754f33 100644 --- a/lib/LunarCalendar.js +++ b/lib/LunarCalendar.js @@ -1,7 +1,7 @@ /** * 农历(阴历)万年历 * LunarCalendar - * vervison : v0.1.0 + * vervison : v0.1.4 * Github : https://github.com/zzyss86/LunarCalendar * HomePage : http://www.tuijs.com/ * Author : JasonZhou @@ -329,6 +329,7 @@ * 1890年的正小寒点:01-05 16:02:31,1890年为基准点 * @param {Number} y 公历年 * @param {Number} n 第几个节气,从0小寒起算 + * 由于农历24节气交节时刻采用近似算法,可能存在少量误差(30分钟内) */ function getTerm(y,n) { var offDate = new Date( ( 31556925974.7*(y-1890) + termInfo[n]*60000 ) + Date.UTC(1890,0,5,16,2,31) ); @@ -560,7 +561,7 @@ var year = inputDate.year; var month = inputDate.month; - var firstDate = new Date(year,month,0); + var firstDate = new Date(year,month,1); var preMonthDays,preMonthData,nextMonthData; var res = { @@ -576,7 +577,7 @@ var preYear = month-1<0 ? year-1 : year; var preMonth = month-1<0 ? 11 : month-1; preMonthDays = getSolarMonthDays(preYear,preMonth); - preMonthData = creatLenArr(preYear,preMonth+1,res.firstDay+1,preMonthDays-res.firstDay); + preMonthData = creatLenArr(preYear,preMonth+1,res.firstDay,preMonthDays-res.firstDay+1); res.monthData = preMonthData.concat(res.monthData); } @@ -605,7 +606,8 @@ lunarToSolar : lunarToSolar, calendar : calendar, solarCalendar : solarCalendar, - setWorktime : setWorktime + setWorktime : setWorktime, + getSolarMonthDays : getSolarMonthDays }; if (typeof define === 'function'){