xiaoe_mp_npm 1.1.21 → 1.1.22-test02

package/miniprogram_dist/common/libs/playerRequestUrl.js

@@ -1,40 +1,40 @@
-/*
- * @Descripttion: 
- * @version: 
- * @Author: zongxinliu
- * @Date: 2021-10-27 15:21:05
- * @LastEditors: conlinchen
- * @LastEditTime: 2021-11-02 16:11:46
- */
-let ENV_NAME = '';
-
-try {
-    const res = wx.getAccountInfoSync()
-    const _appId = res.miniProgram.appId
-    switch (_appId) {
-      case 'wx0c3417205d9852a9':  // 主干环境
-        ENV_NAME = 'inside';
-        break;
-      case 'wxb58a41ffda339bf5':  // 测试环境
-        ENV_NAME = 'test';
-        break;
-      case 'wx13a74d0d3ab0942e':  // 正式环境
-        ENV_NAME = '';
-        break;
-      default:
-        console.log("default", '');
-        break;
-    }
-} catch (error) {
-    console.log("error", error);
-}
-
-const appId = 'appxrwbvfhb8064'
-
-// h5 直播间基础域名
-const BASE_URL = `https://${appId}.h5${ENV_NAME ? `.${ENV_NAME}` : ''}.xiaoeknow.com/`
-
-export { 
-  BASE_URL,
-  ENV_NAME
+/*
+ * @Descripttion: 
+ * @version: 
+ * @Author: zongxinliu
+ * @Date: 2021-10-27 15:21:05
+ * @LastEditors: conlinchen
+ * @LastEditTime: 2021-11-02 16:11:46
+ */
+let ENV_NAME = '';
+
+try {
+    const res = wx.getAccountInfoSync()
+    const _appId = res.miniProgram.appId
+    switch (_appId) {
+      case 'wx0c3417205d9852a9':  // 主干环境
+        ENV_NAME = 'inside';
+        break;
+      case 'wxb58a41ffda339bf5':  // 测试环境
+        ENV_NAME = 'test';
+        break;
+      case 'wx13a74d0d3ab0942e':  // 正式环境
+        ENV_NAME = '';
+        break;
+      default:
+        console.log("default", '');
+        break;
+    }
+} catch (error) {
+    console.log("error", error);
+}
+
+const appId = 'appxrwbvfhb8064'
+
+// h5 直播间基础域名
+const BASE_URL = `https://${appId}.h5${ENV_NAME ? `.${ENV_NAME}` : ''}.xiaoeknow.com/`
+
+export { 
+  BASE_URL,
+  ENV_NAME
 }

package/miniprogram_dist/common/transaction/parameter/channel-info.js

@@ -1,36 +1,36 @@
-const ChannelType = {
-  DETAIL: 0, //商详页
-  ALIVE: 1, //直播带货
-  AD: 2, //广告渠道
-  COMMUNITY: 3, //圈子
-  DOU_YIN: 4, //抖音
-  XIAOE_SHOP: 5, //小鹅通小店
-};
-
-export function resolveChannelInfo(
-  aliveId,
-  adType,
-  communityIdWindow,
-  communityApplyId,
-  channelId
-) {
-  let channelType = ChannelType.DETAIL;
-  let channelBusId;
-
-  if (aliveId) {
-    channelType = ChannelType.ALIVE;
-    channelBusId = aliveId;
-  } else if (adType) {
-    channelType = ChannelType.AD;
-  } else if (communityIdWindow && communityApplyId) {
-    channelType = ChannelType.COMMUNITY;
-    channelBusId = communityIdWindow;
-  } else if (channelId) {
-    channelBusId = channelId;
-  }
-
-  return {
-    channelType,
-    channelBusId,
-  };
-}
+const ChannelType = {
+  DETAIL: 0, //商详页
+  ALIVE: 1, //直播带货
+  AD: 2, //广告渠道
+  COMMUNITY: 3, //圈子
+  DOU_YIN: 4, //抖音
+  XIAOE_SHOP: 5, //小鹅通小店
+};
+
+export function resolveChannelInfo(
+  aliveId,
+  adType,
+  communityIdWindow,
+  communityApplyId,
+  channelId
+) {
+  let channelType = ChannelType.DETAIL;
+  let channelBusId;
+
+  if (aliveId) {
+    channelType = ChannelType.ALIVE;
+    channelBusId = aliveId;
+  } else if (adType) {
+    channelType = ChannelType.AD;
+  } else if (communityIdWindow && communityApplyId) {
+    channelType = ChannelType.COMMUNITY;
+    channelBusId = communityIdWindow;
+  } else if (channelId) {
+    channelBusId = channelId;
+  }
+
+  return {
+    channelType,
+    channelBusId,
+  };
+}

package/miniprogram_dist/common/transaction/parameter/delivery-info.js

@@ -1,26 +1,26 @@
-/**
- * 交付对象信息
- * @param {string} ship_way 配送方式
- * @param {string} address_id 地址
- * @param {string} picker_id 字体人id
- * @param {string} place_id 自提点ID，
- * @returns {Object}
- */
-export class DeliveryInfo {
-  constructor(shipWay, addressId, pickerId, placeId, place_type) {
-    this.shipWay = shipWay;
-    this.addressId = addressId;
-    this.pickerId = pickerId;
-    this.placeId = placeId;
-    this.place_type = place_type || 0;
-  }
-  transformApiParams() {
-    return {
-      ship_way: this.shipWay,
-      address_id: this.addressId,
-      picker_id: this.pickerId,
-      place_id: this.placeId,
-      place_type: this.place_type,
-    };
-  }
-}
+/**
+ * 交付对象信息
+ * @param {string} ship_way 配送方式
+ * @param {string} address_id 地址
+ * @param {string} picker_id 字体人id
+ * @param {string} place_id 自提点ID，
+ * @returns {Object}
+ */
+export class DeliveryInfo {
+  constructor(shipWay, addressId, pickerId, placeId, place_type) {
+    this.shipWay = shipWay;
+    this.addressId = addressId;
+    this.pickerId = pickerId;
+    this.placeId = placeId;
+    this.place_type = place_type || 0;
+  }
+  transformApiParams() {
+    return {
+      ship_way: this.shipWay,
+      address_id: this.addressId,
+      picker_id: this.pickerId,
+      place_id: this.placeId,
+      place_type: this.place_type,
+    };
+  }
+}

package/miniprogram_dist/common/transaction/parameter/misc-parameter.js

@@ -1,21 +1,21 @@
-export class MiscParameter {
-  constructor(isSendFriend, shareType, shareUserId, commonAuthCode) {
-    this.isSendFriend = isSendFriend;
-    this.shareType = shareType;
-    this.commonAuthCode = commonAuthCode;
-    this.shareUserId = shareUserId;
-  }
-  //下单特殊场景 特殊字段 和路由参数有关
-  transformApiParams() {
-    const params = {};
-    params.is_gift = this.isSendFriend;
-    if (this.commonAuthCode) {
-      params.common_auth_code = this.commonAuthCode;
-    }
-    if (this.shareType) {
-      params.share_type = Number(this.shareType);
-      params.share_user_id = this.shareUserId;
-    }
-    return params;
-  }
-}
+export class MiscParameter {
+  constructor(isSendFriend, shareType, shareUserId, commonAuthCode) {
+    this.isSendFriend = isSendFriend;
+    this.shareType = shareType;
+    this.commonAuthCode = commonAuthCode;
+    this.shareUserId = shareUserId;
+  }
+  //下单特殊场景 特殊字段 和路由参数有关
+  transformApiParams() {
+    const params = {};
+    params.is_gift = this.isSendFriend;
+    if (this.commonAuthCode) {
+      params.common_auth_code = this.commonAuthCode;
+    }
+    if (this.shareType) {
+      params.share_type = Number(this.shareType);
+      params.share_user_id = this.shareUserId;
+    }
+    return params;
+  }
+}

package/miniprogram_dist/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/miniprogram_dist/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/miniprogram_dist/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/miniprogram_dist/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'});