Merge branch 'feature/【GFRS-2145】e起陪访' into dev

This commit is contained in:
mengxiaolong
2021-02-19 14:40:36 +08:00
2 changed files with 4 additions and 6 deletions

View File

@@ -1,6 +1,6 @@
<template> <template>
<div class="thin-bottom mb1" @click="showPopup"> <div class="thin-bottom mb1">
<van-field v-bind="$attrs" right-icon="arrow" :value="value" :required="required" :readonly="readonly" /> <van-field v-bind="$attrs" right-icon="arrow" :value="value" :required="required" :readonly="readonly" @click="showPopup" />
<van-popup id="popup" :value="isShow" :position="position" @click-overlay="closePopup"> <van-popup id="popup" :value="isShow" :position="position" @click-overlay="closePopup">
<slot :closePopup="closePopup"> <slot :closePopup="closePopup">
<van-picker id="picker" show-toolbar :columns="columns" @confirm="onPickerConfirm" @cancel="closePopup" /> <van-picker id="picker" show-toolbar :columns="columns" @confirm="onPickerConfirm" @cancel="closePopup" />
@@ -45,9 +45,7 @@ export default {
this.isShow = true this.isShow = true
}, },
closePopup() { closePopup() {
this.$nextTick(() => {
this.isShow = false this.isShow = false
})
}, },
onPickerConfirm(pickedValue) { onPickerConfirm(pickedValue) {
this.$emit('input', String(pickedValue)) this.$emit('input', String(pickedValue))

View File

@@ -337,7 +337,7 @@ export default {
} }
/deep/ .van-cell:not(:last-child)::after { /deep/ .van-cell:not(:last-child)::after {
border: none; border: none !important;
} }
/deep/ .van-hairline--top-bottom::after, /deep/ .van-hairline--top-bottom::after,