diff --git a/pages.json b/pages.json index 5882874a..8b3632cc 100644 --- a/pages.json +++ b/pages.json @@ -3,7 +3,7 @@ // "current": 0, //当前激活的模式(list 的索引项) // "list": [{ // "name": "test", //模式名称 - // "path": "pages/componentsB/dropdown/dropdown", //启动页面,必选 + // "path": "pages/componentsA/test/test", //启动页面,必选 // "query": "" //启动参数,在页面的onLoad函数里面得到 // }] // }, diff --git a/pages/componentsA/test/test.nvue b/pages/componentsA/test/test.nvue deleted file mode 100644 index 33247b0a..00000000 --- a/pages/componentsA/test/test.nvue +++ /dev/null @@ -1,3 +0,0 @@ - \ No newline at end of file diff --git a/pages/componentsA/test/test.vue b/pages/componentsA/test/test.vue new file mode 100644 index 00000000..0a389cdb --- /dev/null +++ b/pages/componentsA/test/test.vue @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/uni_modules/uview-ui/components/u--input/u--input.vue b/uni_modules/uview-ui/components/u--input/u--input.vue index b4090cff..99459f23 100644 --- a/uni_modules/uview-ui/components/u--input/u--input.vue +++ b/uni_modules/uview-ui/components/u--input/u--input.vue @@ -40,7 +40,8 @@ @blur="$emit('blur')" @keyboardheightchange="$emit('keyboardheightchange')" @change="e => $emit('change', e)" - @input="e => $emit('input', e)" + @input="e => $emit('input', e)" + @confirm="e => $emit('confirm', e)" @clear="$emit('clear')" @click="$emit('click')" > diff --git a/uni_modules/uview-ui/components/u-action-sheet/u-action-sheet.vue b/uni_modules/uview-ui/components/u-action-sheet/u-action-sheet.vue index a74db3d5..a8c6ea74 100644 --- a/uni_modules/uview-ui/components/u-action-sheet/u-action-sheet.vue +++ b/uni_modules/uview-ui/components/u-action-sheet/u-action-sheet.vue @@ -186,7 +186,7 @@ } - + diff --git a/uni_modules/uview-ui/components/u-checkbox-group/u-checkbox-group.vue b/uni_modules/uview-ui/components/u-checkbox-group/u-checkbox-group.vue index dc6c9de9..af15eafc 100644 --- a/uni_modules/uview-ui/components/u-checkbox-group/u-checkbox-group.vue +++ b/uni_modules/uview-ui/components/u-checkbox-group/u-checkbox-group.vue @@ -87,7 +87,7 @@ } - diff --git a/uni_modules/uview-ui/components/u-column-notice/u-column-notice.vue b/uni_modules/uview-ui/components/u-column-notice/u-column-notice.vue index 41576b8d..136f48ab 100644 --- a/uni_modules/uview-ui/components/u-column-notice/u-column-notice.vue +++ b/uni_modules/uview-ui/components/u-column-notice/u-column-notice.vue @@ -117,7 +117,7 @@ }; - diff --git a/uni_modules/uview-ui/components/u-divider/u-divider.vue b/uni_modules/uview-ui/components/u-divider/u-divider.vue index d7d02517..4f922552 100644 --- a/uni_modules/uview-ui/components/u-divider/u-divider.vue +++ b/uni_modules/uview-ui/components/u-divider/u-divider.vue @@ -88,7 +88,7 @@ } - diff --git a/uni_modules/uview-ui/components/u-gap/u-gap.vue b/uni_modules/uview-ui/components/u-gap/u-gap.vue index f50e441b..e4429f0e 100644 --- a/uni_modules/uview-ui/components/u-gap/u-gap.vue +++ b/uni_modules/uview-ui/components/u-gap/u-gap.vue @@ -33,6 +33,6 @@ }; - diff --git a/uni_modules/uview-ui/components/u-grid-item/u-grid-item.vue b/uni_modules/uview-ui/components/u-grid-item/u-grid-item.vue index af078315..14e8053d 100644 --- a/uni_modules/uview-ui/components/u-grid-item/u-grid-item.vue +++ b/uni_modules/uview-ui/components/u-grid-item/u-grid-item.vue @@ -148,7 +148,7 @@ }; - diff --git a/uni_modules/uview-ui/components/u-index-list/u-index-list.vue b/uni_modules/uview-ui/components/u-index-list/u-index-list.vue index 396025fe..bdc5aa9c 100644 --- a/uni_modules/uview-ui/components/u-index-list/u-index-list.vue +++ b/uni_modules/uview-ui/components/u-index-list/u-index-list.vue @@ -380,7 +380,7 @@ } - diff --git a/uni_modules/uview-ui/components/u-picker/u-picker.vue b/uni_modules/uview-ui/components/u-picker/u-picker.vue index 838d35bc..4bffe9e3 100644 --- a/uni_modules/uview-ui/components/u-picker/u-picker.vue +++ b/uni_modules/uview-ui/components/u-picker/u-picker.vue @@ -232,7 +232,7 @@ export default { } - diff --git a/uni_modules/uview-ui/components/u-status-bar/u-status-bar.vue b/uni_modules/uview-ui/components/u-status-bar/u-status-bar.vue index bc3f7f63..33c30da6 100644 --- a/uni_modules/uview-ui/components/u-status-bar/u-status-bar.vue +++ b/uni_modules/uview-ui/components/u-status-bar/u-status-bar.vue @@ -22,7 +22,6 @@ mixins: [uni.$u.mpMixin, uni.$u.mixin, props], data() { return { - isNvue: false } }, computed: { @@ -37,7 +36,7 @@ } - + diff --git a/uni_modules/uview-ui/components/u-swipe-action/u-swipe-action.vue b/uni_modules/uview-ui/components/u-swipe-action/u-swipe-action.vue index d4b3d8a4..ad8f019e 100644 --- a/uni_modules/uview-ui/components/u-swipe-action/u-swipe-action.vue +++ b/uni_modules/uview-ui/components/u-swipe-action/u-swipe-action.vue @@ -62,6 +62,6 @@ } - diff --git a/uni_modules/uview-ui/components/u-swiper-indicator/u-swiper-indicator.vue b/uni_modules/uview-ui/components/u-swiper-indicator/u-swiper-indicator.vue index 184a8af5..a432301b 100644 --- a/uni_modules/uview-ui/components/u-swiper-indicator/u-swiper-indicator.vue +++ b/uni_modules/uview-ui/components/u-swiper-indicator/u-swiper-indicator.vue @@ -73,7 +73,7 @@ } - diff --git a/uni_modules/uview-ui/components/u-tabs/u-tabs.vue b/uni_modules/uview-ui/components/u-tabs/u-tabs.vue index d7e78a45..d426f956 100644 --- a/uni_modules/uview-ui/components/u-tabs/u-tabs.vue +++ b/uni_modules/uview-ui/components/u-tabs/u-tabs.vue @@ -258,7 +258,7 @@ } - diff --git a/uni_modules/uview-ui/components/u-text/u-text.vue b/uni_modules/uview-ui/components/u-text/u-text.vue index 474c6d08..b9b373dd 100644 --- a/uni_modules/uview-ui/components/u-text/u-text.vue +++ b/uni_modules/uview-ui/components/u-text/u-text.vue @@ -159,7 +159,7 @@ } - diff --git a/uni_modules/uview-ui/components/u-transition/transition.js b/uni_modules/uview-ui/components/u-transition/transition.js index bac8d020..6abe3bfc 100644 --- a/uni_modules/uview-ui/components/u-transition/transition.js +++ b/uni_modules/uview-ui/components/u-transition/transition.js @@ -23,12 +23,12 @@ const getStyle = (name) => animationMap[name] export default { methods: { // 组件被点击发出事件 - clickHandler() { + clickHandler() { this.$emit('click') }, // #ifndef APP-NVUE // vue版本的组件进场处理 - vueEnter() { + vueEnter() { // 动画进入时的类名 const classNames = getClassNames(this.mode) // 定义状态和发出动画进入前事件 @@ -37,7 +37,10 @@ export default { this.inited = true this.display = true this.classes = classNames.enter - this.$nextTick(() => { + this.$nextTick(async () => { + // #ifdef H5 + await uni.$u.sleep(20) + // #endif // 组件动画进入后触发的事件 this.$emit('afterEnter') // 标识动画尚未结束 diff --git a/uni_modules/uview-ui/components/u-transition/u-transition.vue b/uni_modules/uview-ui/components/u-transition/u-transition.vue index 86e80ac1..22831dcd 100644 --- a/uni_modules/uview-ui/components/u-transition/u-transition.vue +++ b/uni_modules/uview-ui/components/u-transition/u-transition.vue @@ -3,9 +3,10 @@ v-if="inited" class="u-transition" ref="u-transition" - @tap.stop.prevent="clickHandler" + @tap="clickHandler" :class="classes" :style="[mergeStyle]" + @touchmove="noop" > @@ -79,7 +80,7 @@ export default { } -