diff --git a/src/utils/index.js b/src/utils/index.js index 4c650f5..ad030a5 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -2,7 +2,7 @@ * @Description: * @Author: astar * @Date: 2021-02-10 14:50:36 - * @LastEditTime: 2021-03-28 01:02:03 + * @LastEditTime: 2021-03-28 01:04:09 * @LastEditors: astar */ import { getToken } from '@/utils/token' @@ -46,6 +46,6 @@ export const loadScript = (url, cb) => { elem.addEventListener('load', function () { cb(true) }, false); elem.addEventListener('error', function () { cb(false) }, false); elem.src = url; - // elem.crossOrigin = 'anonymous'; + elem.crossorigin = 'anonymous'; window.document.body.appendChild(elem); } \ No newline at end of file diff --git a/src/utils/setRem.js b/src/utils/setRem.js index c95457b..d372e82 100644 --- a/src/utils/setRem.js +++ b/src/utils/setRem.js @@ -2,25 +2,29 @@ * @Description: * @Author: astar * @Date: 2020-09-16 20:07:43 - * @LastEditTime: 2020-09-17 18:32:02 + * @LastEditTime: 2021-03-28 20:13:26 * @LastEditors: astar */ import { os } from '@/utils/browser'; -export default function (doc, win) { - let docEl = win.document.documentElement; - let metaEl = doc.querySelector('meta[name="viewport"]'); - let resizeEvt = 'orientationchange' in window ? 'orientationchange' : 'resize'; +export const getDpr = function () { let dpr = 0; - let scale = 0; // 对iOS设备进行dpr的判断,对于Android系列,始终认为其dpr为1 - let devicePixelRatio = win.devicePixelRatio; + let devicePixelRatio = window.devicePixelRatio; if(os.ios || os.android) { dpr = devicePixelRatio; } else { dpr = 1; } - scale = 1 / dpr; + return dpr; +} + +export default function (doc, win) { + let docEl = win.document.documentElement; + let metaEl = doc.querySelector('meta[name="viewport"]'); + let resizeEvt = 'orientationchange' in window ? 'orientationchange' : 'resize'; + let dpr = getDpr(); + let scale = 1 / dpr; docEl.setAttribute('data-dpr', dpr); if (!metaEl) { metaEl = doc.createElement('meta'); diff --git a/src/views/chat/index.vue b/src/views/chat/index.vue index 0f2d86a..b1bcfa8 100644 --- a/src/views/chat/index.vue +++ b/src/views/chat/index.vue @@ -1,5 +1,5 @@