xiaoe_mp_npm 1.1.21 → 1.1.22-test02

package/miniprogram_dist/common/utils/image-cdn-slim/utils.js

@@ -1,157 +1,157 @@
-import { NEED_REPLACE, COS_V5 } from './constant'
-
-/**
-  * 图片CDN替换
-  * @param src 字符串，图片URL链接，或者数组['src']
-  * @param ci 数据万象参数
-  *           如果为字符串会直接把参数拼接到cdn后面
-  *           如果是对象参数见_genCI方法
-  * example: replaceCDN('https://wechatapppro-1252524126.picsh.myqcloud.com/appaBx10ofe8494/image/kpcbjfwx0sdvg37z6dy.jpg', '?imageView2/2/w/800')
-  * return: 'https://wechatapppro-1252524126.cdn.xiaoeknow.com/appaBx10ofe8494/image/kpcbjfwx0sdvg37z6dy.jpg??imageView2/2/w/800'
-  * */
-export const replaceCDN = function (src = '', ci) {
-  if (!src.length) return src
-  const isSrcArray = Array.isArray(src);
-  src = isSrcArray ? src : [src];
-  // 生成数据万象链接
-  ci = typeof ci === 'string' ? ci : _genCI(ci);
-  const hasValue = (item, aim) => item.indexOf(aim) > -1;
-  // 获取文件格式
-  const getFileSuffix = (item = '') => item.split('.').pop().toLowerCase();
-  // 获取需要替换为CDN的链接
-  const getReplaceURL = (item = '') => {
-    // cos 源站地址 例如：cos.ap-shanghai.myqcloud.com
-    const cosMatch = item.match(/\.cos\.ap-([^.]*)\.myqcloud.com/);
-    if (cosMatch) {
-      return cosMatch[0]
-    }
-    return NEED_REPLACE.find(url => hasValue(item, url))
-  }
-  // 转换后的格式
-  let formatSuffix = ci.match(/\/format\/([^/|?]+)/);
-  formatSuffix = formatSuffix ? formatSuffix[1].toLowerCase() : null;
-  // 不支持webp时会降级成jpeg
-  if (!isWebp() && formatSuffix === 'webp') {
-    ci = ci.replace('format/webp', '')
-  }
-  // 转换后格式是否为静态图片
-  const isFormatStaticType = ['jpg', 'jpeg', 'png', 'bmp', 'tpg', 'heif'].includes(formatSuffix);
-  // imgView2｜imgMorg2 错误兼容
-  ci = `${ci}|imageMogr2/ignore-error/1`
-  const result = src.map(item => {
-    const fileSuffix = getFileSuffix(item);
-    const replaceUrl = getReplaceURL(item);
-    // 不支持svg格式,且需要有符合条件可替换成url才进行替换
-    if (fileSuffix !== 'svg' && replaceUrl) {
-      let srcCI = ci;
-      // 动态图片不能转成静态图片，不然会静止
-      if (fileSuffix == 'gif' && isFormatStaticType) {
-        srcCI = srcCI.replace(`/format/${formatSuffix}`, '')
-      }
-      item = item.replace(replaceUrl, COS_V5) + srcCI;
-    }
-    return item
-  })
-  return isSrcArray ? result : result[0];
-
-}
-
-
-/**
-  * 富文本html图片CDN替换
-  * @param html html字符串
-  * @param lazyLoad 是否需要懒加载
-  * @param ci 数据万象参数
-  *           如果为字符串会直接把参数拼接到cdn后面
-  *           如果是对象参数见_genCI方法
-  * example: replaceAllImg('html', true, '?imageView2/2/w/800')
-  * return: html
-  * */
-export const replaceAllImg = function (html, lazyLoad = false, ci = '?imageMogr2/thumbnail/800x>/format/webp') {
-  return html.replace(/<img[^>]*>/gi, str => {
-    const srcReg = /src=['"]?([^'"]*)['"]?/i;
-    const dataSrc = lazyLoad ? 'data-src' : 'src'
-    const url = str.match(srcReg);
-    //没有 src 属性的 <img></img> 匹配不到 返回 <img src="@/assets/imgs/photo_error.png" />
-    if (Array.isArray(url) && url.length > 1) {
-      const newSrc = replaceCDN(url[1], ci)
-      return str.replace(url[0], `${dataSrc}="${newSrc}"`);
-    }
-    return `<img ${dataSrc}="https://wechatapppro-1252524126.cdn.xiaoeknow.com/appAKLWLitn7978/image/b_u_5b2225aa46488_oGKN7IvA/ky19qhac05ix.png" />`
-
-  });
-}
-
-/**
-  * 根据参数生成数据万象链接
-  * @param data 参数为 { type, width, height, quality, rquality, lquality, format, extra }
-  * example: replaceCDN('https://wechatapppro-1252524126.picsh.myqcloud.com/appaBx10ofe8494/image/kpcbjfwx0sdvg37z6dy.jpg', '?imageView2/2/w/800')
-  * return: 'https://wechatapppro-1252524126.cdn.xiaoeknow.com/appaBx10ofe8494/image/kpcbjfwx0sdvg37z6dy.jpg??imageView2/2/w/800'
-  * */
-const _genCI = (data = {}) => {
-  const defaultParams = { type: '2', format: 'webp', quality: '80'};
-  if (data.rquality || data.lquality) {
-    delete defaultParams.quality
-  }
-  data = Object.assign(defaultParams, data);
-  const paramMap = {
-    width: 'w',
-    height: 'h',
-    quality: 'q',
-    rquality: 'rq',
-    lquality: 'lq',
-    format: 'format'
-  }
-  const keys = Object.keys(paramMap);
-
-  let path = ''
-  keys.forEach(key => {
-    const dataVal = data[key];
-    if (dataVal) {
-      path += `/${paramMap[key]}/${data[key]}`
-    }
-  })
-
-  if (path) {
-    const extra = data.extra || '';
-    path = `?imageView2/${data.type}${path}${extra}`
-  }
-  return path;
-}
-
-/**
-  * 检测是否支持Webp
-  * @param data 参数为 { type, width, height, quality, rquality, lquality, format, extra }
-  * example: replaceCDN('https://wechatapppro-1252524126.picsh.myqcloud.com/appaBx10ofe8494/image/kpcbjfwx0sdvg37z6dy.jpg', '?imageView2/2/w/800')
-  * return: 'https://wechatapppro-1252524126.cdn.xiaoeknow.com/appaBx10ofe8494/image/kpcbjfwx0sdvg37z6dy.jpg??imageView2/2/w/800'
-  * */
-const isWebp = () => {
-  let support = false;
-
-  try {
-    const _wx$getSystemInfoSync = wx.getSystemInfoSync(),
-      platform = _wx$getSystemInfoSync.platform,
-      system = _wx$getSystemInfoSync.system;
-
-    const versionResult = /[0-9.]*$/.exec(system);
-    const systemVersion = versionResult ? versionResult[0] : '';
-    const iosSystemSupport =
-        platform === 'ios' &&
-        !!systemVersion &&
-        compareVersion(systemVersion, '14.0') >= 0; // ios 14以下的版本不支持 webp
-
-    support =
-        platform === 'devtools' ||
-        platform === 'android' ||
-        iosSystemSupport;
-  } catch (e) {
-    console.log(e);
-  }
-
-  return support;
-}
-
-// 比较前面的版本是否比后面的版本要大
-const compareVersion = (currentVersion, targetVersion) => {
-  return Math.ceil(currentVersion - targetVersion)
+import { NEED_REPLACE, COS_V5 } from './constant'
+
+/**
+  * 图片CDN替换
+  * @param src 字符串，图片URL链接，或者数组['src']
+  * @param ci 数据万象参数
+  *           如果为字符串会直接把参数拼接到cdn后面
+  *           如果是对象参数见_genCI方法
+  * example: replaceCDN('https://wechatapppro-1252524126.picsh.myqcloud.com/appaBx10ofe8494/image/kpcbjfwx0sdvg37z6dy.jpg', '?imageView2/2/w/800')
+  * return: 'https://wechatapppro-1252524126.cdn.xiaoeknow.com/appaBx10ofe8494/image/kpcbjfwx0sdvg37z6dy.jpg??imageView2/2/w/800'
+  * */
+export const replaceCDN = function (src = '', ci) {
+  if (!src.length) return src
+  const isSrcArray = Array.isArray(src);
+  src = isSrcArray ? src : [src];
+  // 生成数据万象链接
+  ci = typeof ci === 'string' ? ci : _genCI(ci);
+  const hasValue = (item, aim) => item.indexOf(aim) > -1;
+  // 获取文件格式
+  const getFileSuffix = (item = '') => item.split('.').pop().toLowerCase();
+  // 获取需要替换为CDN的链接
+  const getReplaceURL = (item = '') => {
+    // cos 源站地址 例如：cos.ap-shanghai.myqcloud.com
+    const cosMatch = item.match(/\.cos\.ap-([^.]*)\.myqcloud.com/);
+    if (cosMatch) {
+      return cosMatch[0]
+    }
+    return NEED_REPLACE.find(url => hasValue(item, url))
+  }
+  // 转换后的格式
+  let formatSuffix = ci.match(/\/format\/([^/|?]+)/);
+  formatSuffix = formatSuffix ? formatSuffix[1].toLowerCase() : null;
+  // 不支持webp时会降级成jpeg
+  if (!isWebp() && formatSuffix === 'webp') {
+    ci = ci.replace('format/webp', '')
+  }
+  // 转换后格式是否为静态图片
+  const isFormatStaticType = ['jpg', 'jpeg', 'png', 'bmp', 'tpg', 'heif'].includes(formatSuffix);
+  // imgView2｜imgMorg2 错误兼容
+  ci = `${ci}|imageMogr2/ignore-error/1`
+  const result = src.map(item => {
+    const fileSuffix = getFileSuffix(item);
+    const replaceUrl = getReplaceURL(item);
+    // 不支持svg格式,且需要有符合条件可替换成url才进行替换
+    if (fileSuffix !== 'svg' && replaceUrl) {
+      let srcCI = ci;
+      // 动态图片不能转成静态图片，不然会静止
+      if (fileSuffix == 'gif' && isFormatStaticType) {
+        srcCI = srcCI.replace(`/format/${formatSuffix}`, '')
+      }
+      item = item.replace(replaceUrl, COS_V5) + srcCI;
+    }
+    return item
+  })
+  return isSrcArray ? result : result[0];
+
+}
+
+
+/**
+  * 富文本html图片CDN替换
+  * @param html html字符串
+  * @param lazyLoad 是否需要懒加载
+  * @param ci 数据万象参数
+  *           如果为字符串会直接把参数拼接到cdn后面
+  *           如果是对象参数见_genCI方法
+  * example: replaceAllImg('html', true, '?imageView2/2/w/800')
+  * return: html
+  * */
+export const replaceAllImg = function (html, lazyLoad = false, ci = '?imageMogr2/thumbnail/800x>/format/webp') {
+  return html.replace(/<img[^>]*>/gi, str => {
+    const srcReg = /src=['"]?([^'"]*)['"]?/i;
+    const dataSrc = lazyLoad ? 'data-src' : 'src'
+    const url = str.match(srcReg);
+    //没有 src 属性的 <img></img> 匹配不到 返回 <img src="@/assets/imgs/photo_error.png" />
+    if (Array.isArray(url) && url.length > 1) {
+      const newSrc = replaceCDN(url[1], ci)
+      return str.replace(url[0], `${dataSrc}="${newSrc}"`);
+    }
+    return `<img ${dataSrc}="https://wechatapppro-1252524126.cdn.xiaoeknow.com/appAKLWLitn7978/image/b_u_5b2225aa46488_oGKN7IvA/ky19qhac05ix.png" />`
+
+  });
+}
+
+/**
+  * 根据参数生成数据万象链接
+  * @param data 参数为 { type, width, height, quality, rquality, lquality, format, extra }
+  * example: replaceCDN('https://wechatapppro-1252524126.picsh.myqcloud.com/appaBx10ofe8494/image/kpcbjfwx0sdvg37z6dy.jpg', '?imageView2/2/w/800')
+  * return: 'https://wechatapppro-1252524126.cdn.xiaoeknow.com/appaBx10ofe8494/image/kpcbjfwx0sdvg37z6dy.jpg??imageView2/2/w/800'
+  * */
+const _genCI = (data = {}) => {
+  const defaultParams = { type: '2', format: 'webp', quality: '80'};
+  if (data.rquality || data.lquality) {
+    delete defaultParams.quality
+  }
+  data = Object.assign(defaultParams, data);
+  const paramMap = {
+    width: 'w',
+    height: 'h',
+    quality: 'q',
+    rquality: 'rq',
+    lquality: 'lq',
+    format: 'format'
+  }
+  const keys = Object.keys(paramMap);
+
+  let path = ''
+  keys.forEach(key => {
+    const dataVal = data[key];
+    if (dataVal) {
+      path += `/${paramMap[key]}/${data[key]}`
+    }
+  })
+
+  if (path) {
+    const extra = data.extra || '';
+    path = `?imageView2/${data.type}${path}${extra}`
+  }
+  return path;
+}
+
+/**
+  * 检测是否支持Webp
+  * @param data 参数为 { type, width, height, quality, rquality, lquality, format, extra }
+  * example: replaceCDN('https://wechatapppro-1252524126.picsh.myqcloud.com/appaBx10ofe8494/image/kpcbjfwx0sdvg37z6dy.jpg', '?imageView2/2/w/800')
+  * return: 'https://wechatapppro-1252524126.cdn.xiaoeknow.com/appaBx10ofe8494/image/kpcbjfwx0sdvg37z6dy.jpg??imageView2/2/w/800'
+  * */
+const isWebp = () => {
+  let support = false;
+
+  try {
+    const _wx$getSystemInfoSync = wx.getSystemInfoSync(),
+      platform = _wx$getSystemInfoSync.platform,
+      system = _wx$getSystemInfoSync.system;
+
+    const versionResult = /[0-9.]*$/.exec(system);
+    const systemVersion = versionResult ? versionResult[0] : '';
+    const iosSystemSupport =
+        platform === 'ios' &&
+        !!systemVersion &&
+        compareVersion(systemVersion, '14.0') >= 0; // ios 14以下的版本不支持 webp
+
+    support =
+        platform === 'devtools' ||
+        platform === 'android' ||
+        iosSystemSupport;
+  } catch (e) {
+    console.log(e);
+  }
+
+  return support;
+}
+
+// 比较前面的版本是否比后面的版本要大
+const compareVersion = (currentVersion, targetVersion) => {
+  return Math.ceil(currentVersion - targetVersion)
 }

package/miniprogram_dist/common/utils/index.js

@@ -1,86 +1,86 @@
-/*
- * @Descripttion:
- * @version:
- * @Author: conlinchen
- * @Date: 2021-10-29 15:59:39
- * @LastEditors: conlinchen
- * @LastEditTime: 2021-11-09 14:17:03
- */
-
- // 防抖
-export const debounce = (func, wait, immediate) => {
-  let timer;
-
-  return function () {
-      //this指向debounce
-      let context = this;
-      //即参数，func,wait
-      let args = arguments;
-      //如果timer不为null, 清除定时器
-      if (timer) clearTimeout(timer);
-      //如果是立即执行
-      if (immediate) {
-          //定义callNow = !timer
-          var callNow = !timer;
-          //定义wait时间后把timer变为null
-          //即在wait时间之后事件才会有效
-          timer = setTimeout(() => {
-              timer = null;
-          }, wait)
-          //如果callNow为true,即原本timer为null
-          //那么执行func函数
-          if (callNow) func.apply(context, args)
-      } else {
-          //如果是不立即执行
-          //那就是每次重新定时
-          timer = setTimeout(function () {
-              func.apply(context, args)
-          }, wait);
-      }
-  }
-}
-
-//是否是个函数
-export const isFunction = ()=>{
-    return toString.call(val) === '[object Function]';
-}
-
-// 判断是否空对象
-export const isEmptyObject = (object) => {
-    return Object.keys(object || {}).length === 0;
-}
-
-// 手机号校验
-export const isPhone = (val) => {
-    return /^1(3|4|5|6|7|8)\d{9}$/.test(val);
-}
-
-// 大屏适配 rpx 转 vmin
-export const rpxToVmin = (rpx) => {
-  const { screenWidth, screenHeight, deviceOrientation, platform } = wx.getSystemInfoSync()
-  const isPadSize = (screenWidth >= 768 && deviceOrientation === 'portrait') || (screenHeight >= 768 && deviceOrientation === 'landscape')
-  const isPcEquipment = platform === 'windows' || platform === 'mac' || platform === 'devtools'
-  const pcHighResolution = screenHeight >= 768
-  let deviceWidth = 750
-  // ipad平板
-  if (isPadSize) deviceWidth = 1536
-  // PC高分辨率或PC放大项目
-  if (isPcEquipment) deviceWidth = pcHighResolution ? 1536 : 1260
-  return `${rpx * 100 / deviceWidth}vmin`
-}
-
-/**
-* 获取店铺配置脱敏状态
-* @param {*} userType
-* @param {*} aliveConf
-* @returns 脱敏状态
-*/
-export const getSensitiveState = (userType, aliveConf) => {
- // 兼容旧版「直播-通用设置-隐私保护」逻辑（is_privacy_protection）
- const sensitiveState =
-   aliveConf && Object.prototype.hasOwnProperty.call(aliveConf, 'privacy_protection_live')
-     ? aliveConf.privacy_protection_live
-     : aliveConf.is_privacy_protection
- const isNeedPrivacy = !userType && sensitiveState
- return isNeedPrivacy ? sensitiveState : 0
-}
+/*
+ * @Descripttion:
+ * @version:
+ * @Author: conlinchen
+ * @Date: 2021-10-29 15:59:39
+ * @LastEditors: conlinchen
+ * @LastEditTime: 2021-11-09 14:17:03
+ */
+
+ // 防抖
+export const debounce = (func, wait, immediate) => {
+  let timer;
+
+  return function () {
+      //this指向debounce
+      let context = this;
+      //即参数，func,wait
+      let args = arguments;
+      //如果timer不为null, 清除定时器
+      if (timer) clearTimeout(timer);
+      //如果是立即执行
+      if (immediate) {
+          //定义callNow = !timer
+          var callNow = !timer;
+          //定义wait时间后把timer变为null
+          //即在wait时间之后事件才会有效
+          timer = setTimeout(() => {
+              timer = null;
+          }, wait)
+          //如果callNow为true,即原本timer为null
+          //那么执行func函数
+          if (callNow) func.apply(context, args)
+      } else {
+          //如果是不立即执行
+          //那就是每次重新定时
+          timer = setTimeout(function () {
+              func.apply(context, args)
+          }, wait);
+      }
+  }
+}
+
+//是否是个函数
+export const isFunction = ()=>{
+    return toString.call(val) === '[object Function]';
+}
+
+// 判断是否空对象
+export const isEmptyObject = (object) => {
+    return Object.keys(object || {}).length === 0;
+}
+
+// 手机号校验
+export const isPhone = (val) => {
+    return /^1(3|4|5|6|7|8)\d{9}$/.test(val);
+}
+
+// 大屏适配 rpx 转 vmin
+export const rpxToVmin = (rpx) => {
+  const { screenWidth, screenHeight, deviceOrientation, platform } = wx.getSystemInfoSync()
+  const isPadSize = (screenWidth >= 768 && deviceOrientation === 'portrait') || (screenHeight >= 768 && deviceOrientation === 'landscape')
+  const isPcEquipment = platform === 'windows' || platform === 'mac' || platform === 'devtools'
+  const pcHighResolution = screenHeight >= 768
+  let deviceWidth = 750
+  // ipad平板
+  if (isPadSize) deviceWidth = 1536
+  // PC高分辨率或PC放大项目
+  if (isPcEquipment) deviceWidth = pcHighResolution ? 1536 : 1260
+  return `${rpx * 100 / deviceWidth}vmin`
+}
+
+/**
+* 获取店铺配置脱敏状态
+* @param {*} userType
+* @param {*} aliveConf
+* @returns 脱敏状态
+*/
+export const getSensitiveState = (userType, aliveConf) => {
+ // 兼容旧版「直播-通用设置-隐私保护」逻辑（is_privacy_protection）
+ const sensitiveState =
+   aliveConf && Object.prototype.hasOwnProperty.call(aliveConf, 'privacy_protection_live')
+     ? aliveConf.privacy_protection_live
+     : aliveConf.is_privacy_protection
+ const isNeedPrivacy = !userType && sensitiveState
+ return isNeedPrivacy ? sensitiveState : 0
+}