blackteay/vant-weapp
1
0
Fork 0
mirror of https://gitee.com/vant-contrib/vant-weapp.git synced 2025-04-05 19:41:45 +08:00
Code Issues Projects Releases Wiki Activity

fix(button): fix custom-style error (#3903)

Browse Source
This commit is contained in:
rex 2020-12-23 22:51:50 +08:00 committed by GitHub
parent 7e8f5bbb1c
commit 7c3e2ac706
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/button/index.wxml
View File

@ -8,7 +8,7 @@
hover-class="van-button--active hover-class" hover-class="van-button--active hover-class"
lang="{{ lang }}" lang="{{ lang }}"
form-type="{{ formType }}" form-type="{{ formType }}"
style="{{ computed.rootStyle({ plain, color }) }} {{ customStyle }}" style="{{ computed.rootStyle({ plain, color, customStyle }) }}"
open-type="{{ disabled ? '' : openType }}" open-type="{{ disabled ? '' : openType }}"
business-id="{{ businessId }}" business-id="{{ businessId }}"
session-from="{{ sessionFrom }}" session-from="{{ sessionFrom }}"

4
packages/button/index.wxs
View File

@ -3,7 +3,7 @@ var style = require('../wxs/style.wxs');
function rootStyle(data) { function rootStyle(data) {
if (!data.color) { if (!data.color) {
return ''; return data.customStyle;
} }
var properties = { var properties = {
@ -18,7 +18,7 @@ function rootStyle(data) {
properties['border-color'] = data.color; properties['border-color'] = data.color;
} }
return style(properties); return style([properties, data.customStyle]);
} }
function loadingColor(data) { function loadingColor(data) {