v1.0.27 修复八字排盘流年干支错误。
This commit is contained in:
7
lunar.js
7
lunar.js
@@ -2855,17 +2855,18 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
var buildDaYun = function(yun, index){
|
var buildDaYun = function(yun, index){
|
||||||
|
var birthYear = yun.getLunar().getSolar().getYear();
|
||||||
var year = yun.getStartSolar().getYear();
|
var year = yun.getStartSolar().getYear();
|
||||||
var startYear,startAge,endYear,endAge;
|
var startYear,startAge,endYear,endAge;
|
||||||
if (index < 1) {
|
if (index < 1) {
|
||||||
startYear = lunar.getSolar().getYear();
|
startYear = birthYear;
|
||||||
startAge = 1;
|
startAge = 1;
|
||||||
endYear = year - 1;
|
endYear = year - 1;
|
||||||
endAge = yun.getStartYear();
|
endAge = year - birthYear;
|
||||||
} else {
|
} else {
|
||||||
var add = (index - 1) * 10;
|
var add = (index - 1) * 10;
|
||||||
startYear = year + add;
|
startYear = year + add;
|
||||||
startAge = yun.getStartYear() + add + 1;
|
startAge = startYear - birthYear + 1;
|
||||||
endYear = startYear + 9;
|
endYear = startYear + 9;
|
||||||
endAge = startAge + 9;
|
endAge = startAge + 9;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "lunar-javascript",
|
"name": "lunar-javascript",
|
||||||
"version": "1.0.26",
|
"version": "1.0.27",
|
||||||
"description": "lunar is a calendar library for Solar and Chinese Lunar.",
|
"description": "lunar is a calendar library for Solar and Chinese Lunar.",
|
||||||
"main": "index.js",
|
"main": "index.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
Reference in New Issue
Block a user