lxm_front/lunar-javascript
1
0
Fork 0
mirror of synced 2026-03-25 05:18:34 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4 from Weidge/master

Browse Source 
bug修复：反推八字Solar_fromBaZi函数，在阳历元旦后、农历新年前，反推失败的bug
This commit is contained in:
6tail
2022-01-01 22:53:01 +08:00
committed by GitHub
parent ca64cf0a73 34469699a5
commit 8d131aa31a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lunar.js
View File

@@ -304,7 +304,7 @@
if(offsetYear<0){
offsetYear = offsetYear+60;
}
var startYear = today.getYear() - offsetYear;
var startYear = lunar.getYear() - offsetYear;
var hour = 0;
var timeZhi = timeGanZhi.substr(1);
for(var i=0,j=LunarUtil.ZHI.length;i<j;i++){
@@ -366,7 +366,7 @@
fromYmdHms:function(y,m,d,hour,minute,second){return _fromYmdHms(y,m,d,hour,minute,second);},
fromDate:function(date){return _fromDate(date);},
fromJulianDay:function(julianDay){return _fromJulianDay(julianDay);},
fromBaZi:function(yearGanZhi,monthGanZhi,dayGanZhi,timeGanZhi){return _fromBaZi(yearGanZhi,monthGanZhi,dayGanZhi,timeGanZhi);}
fromBaZi:function(yearGanZhi,monthGanZhi,dayGanZhi,timeGanZhi,sect,baseYear){return _fromBaZi(yearGanZhi,monthGanZhi,dayGanZhi,timeGanZhi,sect,baseYear);}
};
})();
var Lunar = (function(){