From d32ecca397d5cdc9a421bf88ff1badde3fa2f03c Mon Sep 17 00:00:00 2001 From: liyuetong Date: Mon, 8 Nov 2021 10:39:32 +0800 Subject: [PATCH] =?UTF-8?q?ios=E6=8C=89=E7=85=A7=E5=8E=9F=E4=BE=86?= =?UTF-8?q?=E7=9A=84=E6=96=B9=E5=BC=8F=E8=8E=B7=E5=8F=96token=EF=BC=8C?= =?UTF-8?q?=E5=AE=89=E5=8D=93=E7=9A=84=E6=8C=89=E7=85=A7=E9=80=9A=E8=BF=87?= =?UTF-8?q?window=E6=8B=BFAndroid=EF=BC=8C=E7=84=B6=E5=90=8E=E8=B0=83getTo?= =?UTF-8?q?ken?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/business-common.js | 3 ++- src/assets/js/utils/request.js | 8 +++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/assets/js/business-common.js b/src/assets/js/business-common.js index 6dd58aaac..8473406e2 100644 --- a/src/assets/js/business-common.js +++ b/src/assets/js/business-common.js @@ -217,7 +217,8 @@ export default { // eslint-disable-next-line no-useless-escape isAndroid: ua.match(/(Android);?[\s\/]+([\d.]+)?/), isIphone: ua.indexOf('iPhone') != -1, - isWeixin: ua.match(/MicroMessenger/i) + isWeixin: ua.match(/MicroMessenger/i), + mobile: !!ua.match(/AppleWebKit.*Mobile.*/) } }, /** diff --git a/src/assets/js/utils/request.js b/src/assets/js/utils/request.js index 87a991c3a..5019f1efa 100644 --- a/src/assets/js/utils/request.js +++ b/src/assets/js/utils/request.js @@ -167,13 +167,15 @@ service.interceptors.request.use( // 设备类型 const target = BusinessCommon.device() // 安卓or苹果(非浏览器) - if (!target.isWeixin && !target.isChrome) { + if (!target.isWeixin && target.mobile) { // eslint-disable-next-line no-undef let u = navigator.userAgent; let isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //判断是否是 android终端 if(isAndroid){ - console.log(window.Android.getToken(),'Android获取token') - CacheUtils.setLocItem('token', JSON.parse(window.Android.getToken())) + // setTimeout(() => { + console.log(window.Android.getToken(),'Android获取token') + CacheUtils.setLocItem('token', window.Android.getToken()) + // }, 1000) }else{ const res = await EWebBridge.webCallAppInJs('getToken') CacheUtils.setLocItem('token', JSON.parse(res).token)