Browse Source

Merge branch 'dev' of https://github.com/jdf2e/nutui into dev

Franslee 7 years ago
parent
commit
30f6787ddd
1 changed files with 14 additions and 1 deletions
  1. 14 1
      src/package/datepicker/src/datepicker.vue

+ 14 - 1
src/package/datepicker/src/datepicker.vue

@@ -44,6 +44,7 @@
 			            <div class="nut-datepicker-silde"
 			            	:style="{'width': width}"
 			            	@touchstart="touchStart($event, 1)"
+			            	@touchmove="touchMove($event, 1)"
 			            	@touchend="touchEnd($event, 1)"
 			            >
 							<div class="nut-datepicker-item">
@@ -55,6 +56,7 @@
 						<div class="nut-datepicker-silde"
 							:style="{'width': width}"
 			            	@touchstart="touchStart($event, 2)"
+			            	@touchmove="touchMove($event, 2)"
 			            	@touchend="touchEnd($event, 2)"
 			            >
 							<div class="nut-datepicker-item">
@@ -66,6 +68,7 @@
 						<div class="nut-datepicker-silde"
 						    :style="{'width': width}"
 			            	@touchstart="touchStart($event, 3)"
+			            	@touchmove="touchMove($event, 3)"
 			            	@touchend="touchEnd($event, 3)"
 			            >
 							<div class="nut-datepicker-item">
@@ -262,12 +265,22 @@ export default {
         	this.$emit('confirm', this.currDateParams);
         },
 
-		// 拖动
+
         touchStart(e, index){
 			this.startX = e.targetTouches[0].pageX;
 			this.startY = e.targetTouches[0].pageY;
 		},
 
+		touchMove(e, index){
+			this.endX = e.changedTouches[0].pageX;
+			this.endY = e.changedTouches[0].pageY;
+			let dy = this.endY - this.startY;
+            let dx = this.endX - this.startX;
+            if ((Math.abs(dx) > Math.abs(dy))) {
+		        e.preventDefault();
+		     }
+        },
+
 		touchEnd(e, index){
 			let _this = this;
 			this.endX = e.changedTouches[0].pageX;