Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

更新支持百度智能小程序使用原生button #856

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

更新支持百度智能小程序使用原生button #856

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/components/button/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ export default class AtButton extends AtComponent {
isWEB: Taro.getEnv() === Taro.ENV_TYPE.WEB,
isWEAPP: Taro.getEnv() === Taro.ENV_TYPE.WEAPP,
isALIPAY: Taro.getEnv() === Taro.ENV_TYPE.ALIPAY,
isSWAN: Taro.getEnv() === Taro.ENV_TYPE.SWAN,
}
}

Expand Down Expand Up @@ -93,6 +94,7 @@ export default class AtButton extends AtComponent {
isWEAPP,
isALIPAY,
isWEB,
isSWAN,
} = this.state
const rootClassName = ['at-button']
const classObject = {
Expand Down Expand Up @@ -141,7 +143,7 @@ export default class AtButton extends AtComponent {
>
{isWEB && !disabled && webButton}
{isWEAPP && !disabled && <Form reportSubmit onSubmit={this.onSumit.bind(this)} onReset={this.onReset.bind(this)}>{button}</Form>}
{isALIPAY && !disabled && button}
{(isALIPAY || isSWAN) && !disabled && button}
{component}
<View className='at-button__text'>{this.props.children}</View>
</View>
Expand Down