Merge branch 'hotfix/fix-jump-to-miniapp' into 'release/6.9.0'
修改一个安卓的bug See merge request !1735
Showing
1 changed file
with
2 additions
and
2 deletions
@@ -739,7 +739,7 @@ function likedActivityInit() { | @@ -739,7 +739,7 @@ function likedActivityInit() { | ||
739 | } | 739 | } |
740 | 740 | ||
741 | function miniProgramHandleInit() { | 741 | function miniProgramHandleInit() { |
742 | - if (window.__wxjs_environment === 'miniprogram') { | 742 | + if (window.__wxjs_environment === 'miniprogram' || navigator.userAgent.match(/miniProgram/i)) { |
743 | require('./miniprogram'); | 743 | require('./miniprogram'); |
744 | } | 744 | } |
745 | } | 745 | } |
@@ -990,7 +990,7 @@ $(function() { | @@ -990,7 +990,7 @@ $(function() { | ||
990 | getShopProductLinks(); | 990 | getShopProductLinks(); |
991 | 991 | ||
992 | // 小程序相关处理 | 992 | // 小程序相关处理 |
993 | - if (navigator.userAgent.match(/MicroMessenger/i) && navigator.userAgent.match(/miniProgram/i)) { | 993 | + if (navigator.userAgent.match(/miniProgram/i)) { |
994 | miniProgramHandleInit(); | 994 | miniProgramHandleInit(); |
995 | } else if (!window.WeixinJSBridge || !window.WeixinJSBridge.invoke) { | 995 | } else if (!window.WeixinJSBridge || !window.WeixinJSBridge.invoke) { |
996 | document.addEventListener('WeixinJSBridgeReady', miniProgramHandleInit, false); | 996 | document.addEventListener('WeixinJSBridgeReady', miniProgramHandleInit, false); |
-
Please register or login to post a comment