From bac93a64ef695b278b12b0ed6fa8617d390b0390 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=23=E4=BA=91=E6=B7=A1=E7=84=B6?= <cloudcome@163.com>
Date: Fri, 28 Oct 2016 17:34:00 +0800
Subject: [PATCH] =?UTF-8?q?~=20=E5=88=A4=E6=96=AD=E6=98=AF=E5=91=A8?=
 =?UTF-8?q?=E6=9C=9F=E5=86=85=E7=9A=84=E7=AC=AC=E5=87=A0=E5=91=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json       |  2 +-
 src/index.js       | 30 +++++++++++++++++++++---------
 test/test.index.js |  2 ++
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index 32e02ae..5cad176 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "blear.utils.date",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "date utils",
   "scripts": {
     "live": "browser-sync start --config bs-config.js",
diff --git a/src/index.js b/src/index.js
index 64c12bf..4ba1279 100644
--- a/src/index.js
+++ b/src/index.js
@@ -79,7 +79,7 @@ var parse = exports.parse = function (date) {
     if (typeis.Date(date)) {
         return wrapDate(date);
     }
-    
+
     if (typeis.Array(date)) {
         switch (date.length) {
             case 0:
@@ -316,7 +316,7 @@ exports.format = function (format, date) {
  * date.isLeapYear(2014);
  * // => false
  */
-exports.isLeapYear = function (year) {
+var isLeapYear = exports.isLeapYear = function (year) {
     return (year % 4 === 0 && (year % 100 !== 0 || year % 400 === 0));
 };
 
@@ -335,7 +335,19 @@ exports.isLeapYear = function (year) {
 exports.getDaysInMonth = function (year, month) {
     month = new Date(year, month).getMonth();
 
-    return month === 1 ? (exports.isLeapYear(year) ? 29 : 28) : monthDates[month];
+    return month === 1 ? (isLeapYear(year) ? 29 : 28) : monthDates[month];
+};
+
+
+// 计算开始日期
+var calStartDate = function (d) {
+    return new Date(d.getFullYear(), d.getMonth(), d.getDate(), 0, 0, 0, 0);
+};
+
+// 计算结束日期
+var calEndDate = function (d) {
+    var tmpDate = new Date(d.getFullYear(), d.getMonth(), d.getDate() + 1, 0, 0, 0, 0);
+    return new Date(tmpDate.getTime() - 1);
 };
 
 
@@ -347,8 +359,8 @@ exports.getDaysInMonth = function (year, month) {
  * @returns {Number}
  */
 exports.getDaysInYear = function (year, month, date) {
-    var t1 = new Date(year, 0, 1);
-    var t2 = new Date(year, month, date);
+    var t1 = calStartDate(new Date(year, 0, 1));
+    var t2 = calEndDate(new Date(year, month, date));
     // 超前 1 毫秒，保证同一天的两个时间不同
     var dt = t2.getTime() - t1.getTime() + 1;
 
@@ -370,15 +382,15 @@ var getWeeksInRange = function (type, year, month, date, weekStartDay) {
     var t1;
     switch (type) {
         case 1:
-            t1 = new Date(year, 0, 1);
+            t1 = calStartDate(new Date(year, 0, 1));
             break;
 
         case 2:
-            t1 = new Date(year, month, 1);
+            t1 = calStartDate(new Date(year, month, 1));
             break;
     }
 
-    var t2 = new Date(year, month, date);
+    var t2 = calEndDate(new Date(year, month, date));
     // 第一周的填充
     var firstWeekPadding = t1.getDay() - weekStartDay;
     var dt = t2.getTime() - t1.getTime() + firstWeekPadding * DAY_TIME;
@@ -410,7 +422,7 @@ exports.getWeeksInYear = function (year, month, date, weekStartDay) {
  * @param {Number} month 月
  * @param {Number} date 日
  * @param {Number} [weekStartDay=0] 一周的开始是星期几，默认为周日
- * @returns {number}
+ * @returns {number} 第一周值为 1
  *
  * @example
  * // 判断2014年10月24日是当月的第几周
diff --git a/test/test.index.js b/test/test.index.js
index f3bc09a..7ae6f24 100644
--- a/test/test.index.js
+++ b/test/test.index.js
@@ -65,6 +65,8 @@ describe('index.js', function () {
         expect(date.getWeeksInMonth(2016, 3, 11)).toEqual(3);
         expect(date.getWeeksInMonth(2016, 0, 1, 3)).toEqual(1);
         expect(date.getWeeksInMonth(2016, 3, 11, 3)).toEqual(2);
+        expect(date.getWeeksInMonth(2016, 9, 30, 1)).toEqual(5);
+        expect(date.getWeeksInMonth(2016, 9, 31, 1)).toEqual(6);
     });
 
     it('.from', function () {