[bugfix] Actionsheet: border display error (#686)

This commit is contained in:
neverland 2018-03-13 22:45:20 +08:00 committed by GitHub
parent d8d1aa6e82
commit 31be42bc8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 21 additions and 8 deletions

View File

@ -27,14 +27,16 @@ export default {
button2: '弹出带取消按钮的 Actionsheet', button2: '弹出带取消按钮的 Actionsheet',
button3: '弹出带标题的 Actionsheet', button3: '弹出带标题的 Actionsheet',
title2: '带取消按钮的 Actionsheet', title2: '带取消按钮的 Actionsheet',
title3: '带标题的 Actionsheet' title3: '带标题的 Actionsheet',
description: '描述信息'
}, },
'en-US': { 'en-US': {
button1: 'Show Actionsheet', button1: 'Show Actionsheet',
button2: 'Show Actionsheet with cancel button', button2: 'Show Actionsheet with cancel button',
button3: 'Show Actionsheet with title', button3: 'Show Actionsheet with title',
title2: 'Actionsheet with cancel button', title2: 'Actionsheet with cancel button',
title3: 'Actionsheet with title' title3: 'Actionsheet with title',
description: 'Description'
} }
}, },
@ -50,7 +52,7 @@ export default {
actions() { actions() {
return [ return [
{ name: this.$t('option'), callback: this.onClick }, { name: this.$t('option'), callback: this.onClick },
{ name: this.$t('option') }, { name: this.$t('option'), subname: this.$t('description') },
{ name: this.$t('option'), loading: true } { name: this.$t('option'), loading: true }
]; ];
} }

View File

@ -22,9 +22,18 @@ export default {
return { return {
show: false, show: false,
actions: [ actions: [
{ name: 'Option1', callback: this.onClick }, {
{ name: 'Option2' }, name: 'Option',
{ name: 'Option3', loading: true } callback: this.onClick
},
{
name: 'Option',
description: 'Description'
},
{
name: 'Option',
loading: true
}
] ]
}; };
}, },

View File

@ -27,7 +27,8 @@ export default {
callback: this.onClick callback: this.onClick
}, },
{ {
name: '信用卡支付' name: '选项',
subname: '描述信息'
}, },
{ {
name: '选项', name: '选项',

View File

@ -5,7 +5,7 @@
<div v-text="title" /> <div v-text="title" />
<icon name="close" @click.stop="$emit('input', false)" /> <icon name="close" @click.stop="$emit('input', false)" />
</div> </div>
<ul v-if="!title" class="van-actionsheet__list"> <ul v-if="!title" class="van-actionsheet__list van-hairline--bottom">
<li <li
v-for="(item, index) in actions" v-for="(item, index) in actions"
:key="index" :key="index"

View File

@ -28,6 +28,7 @@
&__subname { &__subname {
font-size: 12px; font-size: 12px;
color: $gray-darker; color: $gray-darker;
margin-left: 5px;
} }
&__loading { &__loading {