xiaoe_mp_npm 1.1.21 → 1.1.22-test02

package/src/common/utils/currency.js

@@ -1,52 +1,52 @@
-// 强制保留2位小数，如：2，会在2后面补上00.即2.00
-export function toDecimal2(x) {
-    var f = parseFloat(x);
-    if (isNaN(f)) {
-      return false;
-    }
-    var f = Math.round(x * 100) / 100;
-    var s = f.toString();
-    var rs = s.indexOf('.');
-    if (rs < 0) {
-      rs = s.length;
-      s += '.';
-    }
-    while (s.length <= rs + 2) {
-      s += '0';
-    }
-    return s;
-  }
-
-  /**
-   * @desc 分转化为元 - 正则解决精度
-   * @param { Number } fen
-   * @return { String }
-   */
-  export function fenToYuan(fen) {
-    var num = fen;
-    num = fen * 0.01;
-    num += '';
-    var reg = num.indexOf('.') > -1 ? /(\d{1,3})(?=(?:\d{3})+\.)/g : /(\d{1,3})(?=(?:\d{3})+$)/g;
-    num = num.replace(reg, '$1');
-    num = toDecimal2(num)
-    return num
-  }
-
-  /**
-   * @desc 元转分 - 解决精度问题
-   * @param { Number } yuan 要转换的钱 单位元
-   * @param { Number } digit 转换倍数
-   * @return { Number }
-   */
-  export function yuanToFen(yuan, digit = 100) {
-    var m = 0,
-      s1 = yuan.toString(),
-      s2 = digit.toString();
-    try {
-      m += s1.split(".")[1].length
-    } catch (e) { }
-    try {
-      m += s2.split(".")[1].length
-    } catch (e) { }
-    return Number(s1.replace(".", "")) * Number(s2.replace(".", "")) / Math.pow(10, m)
-  }
+// 强制保留2位小数，如：2，会在2后面补上00.即2.00
+export function toDecimal2(x) {
+    var f = parseFloat(x);
+    if (isNaN(f)) {
+      return false;
+    }
+    var f = Math.round(x * 100) / 100;
+    var s = f.toString();
+    var rs = s.indexOf('.');
+    if (rs < 0) {
+      rs = s.length;
+      s += '.';
+    }
+    while (s.length <= rs + 2) {
+      s += '0';
+    }
+    return s;
+  }
+
+  /**
+   * @desc 分转化为元 - 正则解决精度
+   * @param { Number } fen
+   * @return { String }
+   */
+  export function fenToYuan(fen) {
+    var num = fen;
+    num = fen * 0.01;
+    num += '';
+    var reg = num.indexOf('.') > -1 ? /(\d{1,3})(?=(?:\d{3})+\.)/g : /(\d{1,3})(?=(?:\d{3})+$)/g;
+    num = num.replace(reg, '$1');
+    num = toDecimal2(num)
+    return num
+  }
+
+  /**
+   * @desc 元转分 - 解决精度问题
+   * @param { Number } yuan 要转换的钱 单位元
+   * @param { Number } digit 转换倍数
+   * @return { Number }
+   */
+  export function yuanToFen(yuan, digit = 100) {
+    var m = 0,
+      s1 = yuan.toString(),
+      s2 = digit.toString();
+    try {
+      m += s1.split(".")[1].length
+    } catch (e) { }
+    try {
+      m += s2.split(".")[1].length
+    } catch (e) { }
+    return Number(s1.replace(".", "")) * Number(s2.replace(".", "")) / Math.pow(10, m)
+  }

package/src/common/utils/getInfoCollectionData.js

@@ -1,60 +1,60 @@
-import { getInfoForm } from "../api/getInfoForm"
-
-export function getInfoCollectionData(resourceId, resourceType, bizOptions) {
-    const defaultOptions = {
-        resourceId: resourceId,
-        resourceType: resourceType,
-        spuId: '',
-        resourceClass: '',
-        clientType: 0,
-        operationBtn: '保存',
-        isBuyPage: false,
-        isAliveEntry: false,
-        isAliveDraw: false
-    };
-    return new Promise( async(resolve, reject) => {
-        const options = Object.assign(defaultOptions, bizOptions);
-        const fetchParams = {
-            resource_id: resourceId,
-            resource_type: resourceType,
-            spu_id: options.spuId ? options.spuId : undefined,
-            resource_class: options.resourceClass ? options.resourceClass : undefined
-        };
-        await getInfoForm(fetchParams).then(({ data }) => {
-                if (data.code == 0) {
-                    const { form_data, purchase_data, user_data, append_condition } = data.data;
-                    // ----------给全局globalData赋值------------
-                    getApp().globalData.infoCollectionData = data.data;
-                    getApp().globalData.infoCollectionData.properties = options;
-                    console.log('getApp().globalData.infoCollectionData', getApp().globalData.infoCollectionData);
-
-                    const scenes = form_data.scenes ? form_data.scenes[0] : undefined;
-                    const isNeedCollect = append_condition.value && purchase_data.switch && user_data.need_collect;
-
-                    // 是否需要强制采集
-                    let isNeedInfoCollection = false;
-                    if (options.isAliveEntry) {
-                        // 【直播入口】
-                        isNeedInfoCollection = isNeedCollect && (scenes === 'buy_page' || scenes === 'detail_page_force');
-                    } else if (options.isAliveDraw) {
-                        // 【抽奖】抽中的商品如果开启了“购买确认页”或“兑换页”的信息采集，则在领取时会触发强制采集。其他场景不会触发
-                        isNeedInfoCollection = isNeedCollect && (scenes === 'buy_page' || scenes === 'conver_page');
-                    } else if (options.isBuyPage) {
-                        // 【购买确认页】购买确认页场景只需要额外判断scenes是否是buy_page，其他字段都不需要强制采集
-                        isNeedInfoCollection = isNeedCollect && scenes === 'buy_page';
-                    } else {
-                        isNeedInfoCollection = isNeedCollect;
-                    }
-                    resolve({ data: data.data, isNeedInfoCollection: Boolean(isNeedInfoCollection), isExpired: false });
-                } else if (data.code == 1) {
-                    // 信息采集功能包过期，直接告诉业务侧不需要采集
-                    resolve({ data: {}, isNeedInfoCollection: false, isExpired: true });
-                } else {
-                    reject(data);
-                }
-            })
-            .catch((error) => {
-                reject(error);
-            });
-    });
+import { getInfoForm } from "../api/getInfoForm"
+
+export function getInfoCollectionData(resourceId, resourceType, bizOptions) {
+    const defaultOptions = {
+        resourceId: resourceId,
+        resourceType: resourceType,
+        spuId: '',
+        resourceClass: '',
+        clientType: 0,
+        operationBtn: '保存',
+        isBuyPage: false,
+        isAliveEntry: false,
+        isAliveDraw: false
+    };
+    return new Promise( async(resolve, reject) => {
+        const options = Object.assign(defaultOptions, bizOptions);
+        const fetchParams = {
+            resource_id: resourceId,
+            resource_type: resourceType,
+            spu_id: options.spuId ? options.spuId : undefined,
+            resource_class: options.resourceClass ? options.resourceClass : undefined
+        };
+        await getInfoForm(fetchParams).then(({ data }) => {
+                if (data.code == 0) {
+                    const { form_data, purchase_data, user_data, append_condition } = data.data;
+                    // ----------给全局globalData赋值------------
+                    getApp().globalData.infoCollectionData = data.data;
+                    getApp().globalData.infoCollectionData.properties = options;
+                    console.log('getApp().globalData.infoCollectionData', getApp().globalData.infoCollectionData);
+
+                    const scenes = form_data.scenes ? form_data.scenes[0] : undefined;
+                    const isNeedCollect = append_condition.value && purchase_data.switch && user_data.need_collect;
+
+                    // 是否需要强制采集
+                    let isNeedInfoCollection = false;
+                    if (options.isAliveEntry) {
+                        // 【直播入口】
+                        isNeedInfoCollection = isNeedCollect && (scenes === 'buy_page' || scenes === 'detail_page_force');
+                    } else if (options.isAliveDraw) {
+                        // 【抽奖】抽中的商品如果开启了“购买确认页”或“兑换页”的信息采集，则在领取时会触发强制采集。其他场景不会触发
+                        isNeedInfoCollection = isNeedCollect && (scenes === 'buy_page' || scenes === 'conver_page');
+                    } else if (options.isBuyPage) {
+                        // 【购买确认页】购买确认页场景只需要额外判断scenes是否是buy_page，其他字段都不需要强制采集
+                        isNeedInfoCollection = isNeedCollect && scenes === 'buy_page';
+                    } else {
+                        isNeedInfoCollection = isNeedCollect;
+                    }
+                    resolve({ data: data.data, isNeedInfoCollection: Boolean(isNeedInfoCollection), isExpired: false });
+                } else if (data.code == 1) {
+                    // 信息采集功能包过期，直接告诉业务侧不需要采集
+                    resolve({ data: {}, isNeedInfoCollection: false, isExpired: true });
+                } else {
+                    reject(data);
+                }
+            })
+            .catch((error) => {
+                reject(error);
+            });
+    });
 }

package/src/common/utils/image-cdn-slim/constant.js

@@ -1,8 +1,8 @@
-export const NEED_REPLACE = [
-  '.picsh.myqcloud.com',
-  '.file.myqcloud.com',
-  '.cossh.myqcloud.com',
-  '.cdn.xiaoeknow.com'
-]
-
-export const COS_V5 = '.cdn.xiaoeknow.com'
+export const NEED_REPLACE = [
+  '.picsh.myqcloud.com',
+  '.file.myqcloud.com',
+  '.cossh.myqcloud.com',
+  '.cdn.xiaoeknow.com'
+]
+
+export const COS_V5 = '.cdn.xiaoeknow.com'

package/src/common/utils/image-cdn-slim/index.js

@@ -1,7 +1,7 @@
-import { replaceCDN, replaceAllImg } from './utils'
-
-// 处理图片链接
-export const getImageCdnSlimUrl = (url, config = '/2/w/1025/a/100') => url ? replaceCDN(url, `?imageView2${config}`, true) : url;
-
-// 处理富文本
-export const getImageCdnSlimRichTextContent = richText => replaceAllImg(richText, false, {quality: '80'});
+import { replaceCDN, replaceAllImg } from './utils'
+
+// 处理图片链接
+export const getImageCdnSlimUrl = (url, config = '/2/w/1025/a/100') => url ? replaceCDN(url, `?imageView2${config}`, true) : url;
+
+// 处理富文本
+export const getImageCdnSlimRichTextContent = richText => replaceAllImg(richText, false, {quality: '80'});

package/src/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)
 }