Authored by 陈峰

Merge branch 'hotfix/fix-jump-to-miniapp' into 'release/6.9.0'

修改一个安卓的bug



See merge request !1735
... ... @@ -739,7 +739,7 @@ function likedActivityInit() {
}
function miniProgramHandleInit() {
if (window.__wxjs_environment === 'miniprogram') {
if (window.__wxjs_environment === 'miniprogram' || navigator.userAgent.match(/miniProgram/i)) {
require('./miniprogram');
}
}
... ... @@ -990,7 +990,7 @@ $(function() {
getShopProductLinks();
// 小程序相关处理
if (navigator.userAgent.match(/MicroMessenger/i) && navigator.userAgent.match(/miniProgram/i)) {
if (navigator.userAgent.match(/miniProgram/i)) {
miniProgramHandleInit();
} else if (!window.WeixinJSBridge || !window.WeixinJSBridge.invoke) {
document.addEventListener('WeixinJSBridgeReady', miniProgramHandleInit, false);
... ...