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

src/packages/shortpassword/shortpassword.scss

@@ -114,17 +114,17 @@ ul {
                 width: 322px;
                 display: inline-block;
                 ul {
-                    padding-top: 11.5px;
+                    padding-top: 11px;
                 }
                 li {
                     float: left;
-                    margin-left: 7.5px;
+                    margin-left: 7px;
                 }
                 input {
                     height: 45px;
                     width: 45px;
                     border: 0;
-                    background-color: #fff;
+                    background:none;
                     text-align: center;
                     font-size: 16px;
                 }
@@ -149,6 +149,7 @@ ul {
         width: 90%;
         height: 225px;
         border-radius: 6px;
+       
     }
     .nut-forget {
         text-align: right;
@@ -185,8 +186,17 @@ ul {
 }
 
 //适配
-@media screen and (min-width: 376px) {
-    .nut-fake-cursor {
-        top: 50px;
+@media screen and (max-width: 320px) {
+    .nut-short-pwd .nut-layer .nut-input-w .nut-fake-list{
+        width:320px;
+    }
+    .nut-short-pwd .nut-layer-center   .nut-input-w .nut-fake-list{
+        width:280px;
+    }
+    .nut-short-pwd .nut-layer .nut-input-w .nut-fake-list li{
+        margin-left:4px;
+        input{
+            width:42px;
+        }
     }
 }

src/packages/shortpassword/shortpassword.vue

@@ -19,7 +19,7 @@
                             
                         </ul>
                     </div>
-                    <img src="../../assets/img/cursor.gif" class="nut-fake-cursor" :style="fakeCursorStyle"/>
+                    <!-- <img src="../../assets/img/cursor.gif" class="nut-fake-cursor" :style="fakeCursorStyle"/> -->
                     <div class="nut-forget" v-if="link !=''">
                         <a :href="link">{{nutTranslate('lang.shortpassword.tip2')}}</a>
                     </div>
@@ -54,10 +54,10 @@ export default {
 		return{
 			shortpwdValue:'',
 			regExp:/^[0-9]*$/,
-			fakeCursorStyle:{
-				display:'none',
-				left:'0px'
-			},
+			// fakeCursorStyle:{
+			// 	display:'none',
+			// 	left:'0px'
+			// },
 			fakeInputItems:[
 				{
 					id:1,
@@ -117,15 +117,15 @@ export default {
 				if(val.length < 6){
 					let num = this.$refs.nutFakeList.offsetLeft + 26;
 					var left = val.length*54 + num;
-					this.fakeCursorStyle = {
-						'left':left+'px',
-						'display':'block'
-					}
+					// this.fakeCursorStyle = {
+					// 	'left':left+'px',
+					// 	'display':'block'
+					// }
 					
 				}else{
-					this.fakeCursorStyle = {
-						'display':'none'
-					}
+					// this.fakeCursorStyle = {
+					// 	'display':'none'
+					// }
 					this.$refs.realInput.blur();
 					
 					this.timer = setTimeout(()=>{