diff --git a/example/pages/action-sheet/index.js b/example/pages/action-sheet/index.js index fd2099b7..cc8c4285 100644 --- a/example/pages/action-sheet/index.js +++ b/example/pages/action-sheet/index.js @@ -11,21 +11,21 @@ Page({ action1: [ { name: '选项' }, { name: '选项' }, - { name: '选项', subname: '副文本' } + { name: '选项', subname: '描述信息' }, ], action2: [ - { name: '选项', color: '#07c160' }, + { name: '着色选项', color: '#ee0a24' }, { loading: true }, - { name: '禁用选项', disabled: true } + { name: '禁用选项', disabled: true }, ], action6: [ { name: '获取用户信息', color: '#07c160', openType: 'getUserInfo' }, - ] + ], }, toggle(type) { this.setData({ - [type]: !this.data[type] + [type]: !this.data[type], }); }, @@ -53,5 +53,5 @@ Page({ }, onGetUserInfo(e) { console.log(e.detail); - } + }, }); diff --git a/example/pages/action-sheet/index.wxml b/example/pages/action-sheet/index.wxml index 4dd21bfb..5dd757a5 100644 --- a/example/pages/action-sheet/index.wxml +++ b/example/pages/action-sheet/index.wxml @@ -52,7 +52,7 @@ - + 弹出菜单 - + {{ title }} - + {{ description }} @@ -29,7 +29,7 @@ wx:key="index" open-type="{{ item.openType }}" style="{{ item.color ? 'color: ' + item.color : '' }}" - class="{{ utils.bem('action-sheet__item', { disabled: item.disabled || item.loading }) }} van-hairline--top {{ item.className || '' }}" + class="{{ utils.bem('action-sheet__item', { disabled: item.disabled || item.loading }) }} {{ item.className || '' }}" hover-class="van-action-sheet__item--hover" data-index="{{ index }}" bind:tap="onSelect" diff --git a/packages/common/style/var.less b/packages/common/style/var.less index 9545c912..8a3d537a 100644 --- a/packages/common/style/var.less +++ b/packages/common/style/var.less @@ -67,9 +67,9 @@ //ActionSheet @action-sheet-max-height: 90%; -@action-sheet-header-height: 44px; +@action-sheet-header-height: 48px; @action-sheet-header-font-size: @font-size-lg; -@action-sheet-description-color: @gray-7; +@action-sheet-description-color: @gray-6; @action-sheet-description-font-size: @font-size-md; @action-sheet-description-line-height: 20px; @action-sheet-item-height: 50px; @@ -77,11 +77,11 @@ @action-sheet-item-font-size: @font-size-lg; @action-sheet-item-text-color: @text-color; @action-sheet-item-disabled-text-color: @gray-5; -@action-sheet-subname-color: @gray-7; +@action-sheet-subname-color: @gray-6; @action-sheet-subname-font-size: @font-size-sm; -@action-sheet-close-icon-size: 18px; -@action-sheet-close-icon-color: @gray-6; -@action-sheet-close-icon-padding: 0 @padding-sm; +@action-sheet-close-icon-size: 22px; +@action-sheet-close-icon-color: @gray-5; +@action-sheet-close-icon-padding: 0 @padding-md; @action-sheet-cancel-text-color: @gray-7; @action-sheet-cancel-padding-top: @padding-xs; @action-sheet-cancel-padding-color: @background-color;