苏子刚 6 年 前
コミット
c758b67da1

+ 3 - 3
src/packages/picker/picker-slot.vue

@@ -5,14 +5,14 @@
             :class="{'nut-picker-roller-item-hidden': isHidden(index + 1)}"
             v-for="(item,index) in listData"
             :style="setRollerStyle(index + 1)"
-            :key="index">
-                {{item}}
+            :key="item.label ? item.label : index">
+                {{item.value ? item.value : item}}
         </div>
     </div>
     <div class="nut-picker-content">
         <div class="nut-picker-list-panel" ref="list">
             <div class="nut-picker-item" v-for="(item,index) in listData"
-                :key="index">{{item}}
+                :key="item.label ? item.label : index">{{item.value ? item.value : item}}
             </div>
         </div>
     </div>

+ 12 - 3
src/packages/scroller/vertical-scroll.vue

@@ -56,12 +56,20 @@ export default {
             type: Number,
             default: 100
         },
+        propstime: {
+            type:Number,
+            default:3000
+        }
     },
     watch: {
         'isLoading': function(status) {
             if (!status && this.realMove === 0) {
-                clearTimeout(this.timer);
-                this.setTransform(this.realMove, 'end', 0);
+               clearTimeout(this.outTimer);
+               this.outTimer = setTimeout(()=>{
+                    clearTimeout(this.timer);
+                    this.setTransform(this.realMove, 'end', 0); 
+                },this.propstime)
+                
             }
         },
         'isUnMore': function() {
@@ -83,7 +91,8 @@ export default {
             realMove: 0,
             isShowLoadMore: false,
             listMinHeightStyle: 'auto',
-            isFirstPull: true
+            isFirstPull: true,
+            outTimer:null
         }
     },