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

src/package/coupon/src/coupon.vue

@@ -135,11 +135,10 @@ $unBeanColor: #c2c2c2;
             height: 0.6rem;
             em{
                 display: inline-block;
-                height: 0.3rem;
                 width: 0.72rem;
+                padding: 0.01rem 0;
                 border-radius: 3px;
                 margin-right: 0.06rem;
-                line-height: 0.3rem;
                 font-style: normal;
                 text-align: center;
                 font-size: 0.2rem;

src/package/datepicker/src/datepicker.vue

@@ -289,7 +289,7 @@ export default {
             let dx = this.endX - this.startX;
 
 
-			if (dx < -20 && Math.abs(dx) > 20 ) {
+			if (dx > 20 &&  Math.abs(dx) > 20) {
 				if( Math.abs(this.translateX) == '66.6') {
 					this.transitionDuration = 0;
 					this.translateX = 0;
@@ -300,7 +300,7 @@ export default {
 				    _this.translateX = index < 3 ? -33.3 * index : -33.3;
 				}, 0);
 
-			} else if (dx > 20 &&  Math.abs(dx) > 20) {
+			} else if (dx < -20 && Math.abs(dx) > 20) {
 				if( Math.abs(this.translateX) == '0') {
 					this.transitionDuration = 0;
 					this.translateX = -66.6;