diff --git a/tool_uniapp.js b/tool_uniapp.js index fde889b..1cd49d3 100644 --- a/tool_uniapp.js +++ b/tool_uniapp.js @@ -681,10 +681,10 @@ module.exports = { return 'firefox' } else if (ua.match(/MicroMessenger/i) == 'micromessenger' && ua.match(/miniprogram/i) == 'miniprogram') { // 微信小程序 - return 'wechat_mp' - } else if (/micromessenger/.test(ua)) { + return 'weixin_mp' + } else if (/micromessenger/i.test(ua)) { // 微信公众号或微信浏览器 - return 'wechat' + return 'weixin' } else if (ua.match(/alipay/i) == 'alipay' && ua.match(/miniprogram/i) == 'miniprogram') { return 'alipay_mp' } else if (ua.match(/alipay/i) == 'alipay') { @@ -755,7 +755,7 @@ module.exports = { option.cancelText = this.localizeText(option.cancelText || { zhCN: '取消', enUS: 'Cancel', deDE: 'Abbrechen', jaJP: 'キャンセル' }) option.confirmText = this.localizeText( option.confirmText || - (option.showCanel === true || option.showCancel === undefined + (option.showCancel === true || option.showCancel === undefined ? { zhCN: '确认', enUS: 'Confirm', deDE: 'Bestätigen', jaJP: '確認' } : { zhCN: '好的', enUS: 'OK', deDE: 'Ja', jaJP: 'OK' }) )