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

fix(alipay):支付宝小程序在showModal属性showCancel且没有cancelText真机调试按钮显示undefined #7590

Merged
merged 4 commits into from
Sep 24, 2020
Merged

fix(alipay):支付宝小程序在showModal属性showCancel且没有cancelText真机调试按钮显示undefined #7590

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a28d95c
bugfix
fred8617 Sep 11, 2020
de1193a
Merge branch 'next' into next
fred8617 Sep 18, 2020
d943c3e
Merge branch 'next' into next
fred8617 Sep 22, 2020
322cdf6
Merge branch 'next' into next
Chen-jj Sep 24, 2020
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
2 changes: 1 addition & 1 deletion packages/taro/apis/alipay.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ function pxTransform (size) {
function generateSpecialApis (api, options) {
let apiAlias = api
if (api === 'showModal') {
options.cancelButtonText = options.cancelText
options.cancelButtonText = options.cancelText || '取消'
options.confirmButtonText = options.confirmText || '确定'
apiAlias = 'confirm'
if (options.showCancel === false) {
Expand Down