修改~今天不行~情况下默认日期的问题

dai-siki · Mar 13, 2017 · f9a2800 · f9a2800
1 parent 1895787
commit f9a2800
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 13 deletions.
diff --git a/datepicker-2.vue b/datepicker-2.vue
@@ -167,12 +167,17 @@
 			},
 			// 当前日期
 			curr(){
-				let {value} = this,
-						dateObj, year, month, day;
+				let {value, noToday} = this,
+					dateObj,
+					year="0000",
+					month="00",
+					day="00";
 				if (value) {
 					dateObj = new Date(value);
-				} else {
+				} else if(!noToday) {
 					dateObj = new Date();
+				}else{
+					return {year, month, day};
 				}
 				year = dateObj.getFullYear();
 				month = dateObj.getMonth();

diff --git a/datepicker.vue b/datepicker.vue
@@ -167,12 +167,17 @@
 			},
 			// 当前日期
 			curr(){
-				let {value} = this,
-						dateObj, year, month, day;
+				let {value, noToday} = this,
+					dateObj,
+					year="0000",
+					month="00",
+					day="00";
 				if (value) {
 					dateObj = new Date(value);
-				} else {
+				} else if(!noToday) {
 					dateObj = new Date();
+				}else{
+					return {year, month, day};
 				}
 				year = dateObj.getFullYear();
 				month = dateObj.getMonth();

diff --git a/example/demo-src.js b/example/demo-src.js
diff --git a/example2/demo-src.js b/example2/demo-src.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-datepicker-simple",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "description": "一款非常简单的基于vue的日期选择插件",
   "main": "datepicker.vue",
   "scripts": {