@conecli/cone-render 0.10.1-shop-beta.18 → 0.10.1-shop-beta.20

package/dist/components/base/NetworkDataError/const.ts

@@ -1 +1 @@
-import { NETWORK_DATA_TYPE } from '../../../common/const';
  [NETWORK_DATA_TYPE.NO_NET_WORK]: '网络连接已断开',
  [NETWORK_DATA_TYPE.DATA_ERROR]: '数据加载失败',
  [NETWORK_DATA_TYPE.NO_DATA]: '你访问的内容飞到太空了', 
  [NETWORK_DATA_TYPE.RISK]: '活动太火爆',
  [NETWORK_DATA_TYPE.NO_NET_WORK]: '请检查您的网络设置',
  [NETWORK_DATA_TYPE.DATA_ERROR]: '请稍后重试',
  [NETWORK_DATA_TYPE.NO_DATA]: '', 
  [NETWORK_DATA_TYPE.RISK]: '页面加载失败，请稍后再试',
  NETWORK_DATA_TYPE.NO_NET_WORK,
  NETWORK_DATA_TYPE.DATA_ERROR,
  NETWORK_DATA_TYPE.NO_DATA,
  NETWORK_DATA_TYPE.RISK,
  PART: 'part', 
  FULL: 'full', 
  No_Data_Default_Tip: 'no-data-default-tip',
  No_Data_Tip_1: 'no-data-tip-1',
  No_Data_Tip_2: 'no-data-tip-2',
  No_Network_Err_Tip: 'no-network',
  No_Data_Bmall: 'no-data-bmall',
  noData: 'no-data-empty', 
  netWorkErr: 'network-err', 
  searchEmpty: 'search-empty',
  shopClose: 'shop-close',
  OLD: 'old',
  NEW: 'new',
+import { NETWORK_DATA_TYPE } from '../../../common/const';
  [NETWORK_DATA_TYPE.NO_NET_WORK]: global?.languageJsonData?.loseNetwork || '网络连接已断开',
  [NETWORK_DATA_TYPE.DATA_ERROR]: global?.languageJsonData?.loadDataFailed || '数据加载失败',
  [NETWORK_DATA_TYPE.NO_DATA]:
    global?.languageJsonData?.contentUnavailable || '你访问的内容飞到太空了', 
  [NETWORK_DATA_TYPE.RISK]: global?.languageJsonData?.highTraffic || '活动太火爆，访问人数较多',
  [NETWORK_DATA_TYPE.NO_NET_WORK]: global?.languageJsonData?.checkNetwork || '请检查您的网络设置',
  [NETWORK_DATA_TYPE.DATA_ERROR]: global?.languageJsonData?.pleaseTryAgainLater || '请稍后重试',
  [NETWORK_DATA_TYPE.NO_DATA]: '', 
  [NETWORK_DATA_TYPE.RISK]: global?.languageJsonData?.pageLoadFailed || '排队进场中，请稍后再试',
  NETWORK_DATA_TYPE.NO_NET_WORK,
  NETWORK_DATA_TYPE.DATA_ERROR,
  NETWORK_DATA_TYPE.NO_DATA,
  NETWORK_DATA_TYPE.RISK,
  PART: 'part', 
  FULL: 'full', 
  No_Data_Default_Tip: 'no-data-default-tip',
  No_Data_Tip_1: 'no-data-tip-1',
  No_Data_Tip_2: 'no-data-tip-2',
  No_Network_Err_Tip: 'no-network',
  No_Data_Bmall: 'no-data-bmall',
  noData: 'no-data-empty', 
  netWorkErr: 'network-err', 
  searchEmpty: 'search-empty',
  shopClose: 'shop-close',
  OLD: 'old',
  NEW: 'new',

package/dist/components/base/NetworkDataError/index.module.scss

@@ -64,7 +64,7 @@
     font-size: 28px;
     font-weight: bold;
     line-height: 28px;
-    color: #8c8c8c;
+    color: #1a1a1a;
   }
   .d-error-sub-tip {
     margin-top: 16px;
@@ -89,7 +89,7 @@
     background-image: url('https://m.360buyimg.com/imagetools/jfs/t1/106708/34/36128/37234/64896f52Fed1530e0/7b403e068aae316c.png');
   }
   .d-risk {
-    background-image: url('https://m.360buyimg.com/imagetools/jfs/t1/106708/34/36128/37234/64896f52Fed1530e0/7b403e068aae316c.png');
+    background-image: url('https://img11.360buyimg.com/imagetools/jfs/t1/256437/5/21857/22576/67b438adFed8a2665/7df7277fec7e3e8e.png');
   }
   .d-no-data {
     background-image: url('https://img11.360buyimg.com/imagetools/jfs/t1/190994/19/325/42717/6088fed0Ec4b502d5/0e8de7593fb0d06c.png');

package/dist/components/base/NetworkDataError/index.tsx

@@ -1 +1 @@
-import { Button, View } from '@tarojs/components';
  NetWorkErrorList,
  NetWorkErrorTip,
  NetWorkErrorSubTip,
  NetWorkShowType,
  NetWork_Image_Type,
  NetWorkStyleType,
  const {
    className = '',
    message = '',
    subMessage = '',
    btnLabel = '重新加载',
    backgroundColorWhite = false, 
    netWorkDataType = NETWORK_DATA_TYPE.NORMAL,
    netWorkShowType = NetWorkShowType.FULL,
    netWorkImageType = NetWork_Image_Type.No_Data_Default_Tip,
    netWorkStyleType = NetWorkStyleType.OLD,
    refreshCallBackFn = null,
    viewMaxHeight = '',
    noPosition = false, 
  } = props;
  const refershInitData = useCallback(() => {
    refreshCallBackFn && refreshCallBackFn(true);
  }, []);
  const useErrorTip = message != '' ? message : NetWorkErrorTip[netWorkDataType];
  const useErrorSubTip = subMessage ? subMessage : NetWorkErrorSubTip[netWorkDataType];
  const latestRes = latestFromNativeMsgStorage[TaroEventType.PAGE_SCROLL] || {};
  const maxHeight = latestRes.displayHeight || 546; 
  return NetWorkErrorList.includes(netWorkDataType as NETWORK_DATA_TYPE) ? (
    <View
      style={{
        maxHeight: viewMaxHeight !== '' ? viewMaxHeight : isMemberPage ? '100vh' : maxHeight,
      }}
      className={classNames(
        netWorkErrorStyle['d-shop-network'],
        {
          [netWorkErrorStyle['d-shop-network-white']]: backgroundColorWhite,
        },
        {
          [netWorkErrorStyle['d-shop-network-part']]: netWorkShowType === NetWorkShowType.PART,
        },
        {
          [netWorkErrorStyle['d-network-jd-shop-view']]: isH5AndJdShopView,
        },
        {
          [netWorkErrorStyle['d-shop-network-no-position']]: noPosition,
        },
        'flexible-center-box',
        className,
      )}
    >
      <View
        className={classNames(
          netWorkErrorStyle['d-error-content'],
          netWorkErrorStyle[`d-${netWorkStyleType}-style-content`],
          'd-error-content',
        )}
      >
        <View
          className={classNames(
            netWorkErrorStyle['d-error-type'],
            netWorkErrorStyle[`d-${netWorkDataType}`],
            netWorkErrorStyle[`d-${netWorkImageType}`],
            'd-error-type',
          )}
        />
        <View
          className={classNames(
            netWorkErrorStyle['d-error-tip'],
            netWorkErrorStyle[`d-${netWorkDataType}-tip`],
            'd-error-tip',
          )}
        >
          {useErrorTip}
        </View>
        {useErrorSubTip ? (
          <View
            className={classNames(
              netWorkErrorStyle['d-error-sub-tip'],
              netWorkErrorStyle[`d-${netWorkDataType}-sub-tip`],
              'd-error-sub-tip',
            )}
          >
            {useErrorSubTip}
          </View>
        ) : null}
        <View className={'flexible-horizontal-center-box'}>
          {refreshCallBackFn && (
            <Button
              onClick={refershInitData}
              className={classNames(
                netWorkErrorStyle['d-opt-btn'],
                'd-button-no-border',
                'd-opt-btn',
              )}
              plain
              size="mini"
            >
              {btnLabel}
            </Button>
          )}
        </View>
      </View>
    </View>
  ) : null;
+import { Button, View } from '@tarojs/components';
  NetWorkErrorList,
  NetWorkErrorTip,
  NetWorkErrorSubTip,
  NetWorkShowType,
  NetWork_Image_Type,
  NetWorkStyleType,
  const {
    className = '',
    message = '',
    subMessage = '',
    btnLabel = global?.languageJsonData?.reload || '重新加载',
    backgroundColorWhite = false, 
    netWorkDataType = NETWORK_DATA_TYPE.NORMAL,
    netWorkShowType = NetWorkShowType.FULL,
    netWorkImageType = NetWork_Image_Type.No_Data_Default_Tip,
    netWorkStyleType = NetWorkStyleType.OLD,
    refreshCallBackFn = null,
    viewMaxHeight = '',
    noPosition = false, 
  } = props;
  const refershInitData = useCallback(() => {
    refreshCallBackFn && refreshCallBackFn(true);
  }, []);
  const useErrorTip = message != '' ? message : NetWorkErrorTip[netWorkDataType];
  const useErrorSubTip = subMessage ? subMessage : NetWorkErrorSubTip[netWorkDataType];
  const latestRes = latestFromNativeMsgStorage[TaroEventType.PAGE_SCROLL] || {};
  const maxHeight = latestRes.displayHeight || 546; 
  return NetWorkErrorList.includes(netWorkDataType as NETWORK_DATA_TYPE) ? (
    <View
      style={{
        maxHeight: viewMaxHeight !== '' ? viewMaxHeight : isMemberPage ? '100vh' : maxHeight,
      }}
      className={classNames(
        netWorkErrorStyle['d-shop-network'],
        {
          [netWorkErrorStyle['d-shop-network-white']]: backgroundColorWhite,
        },
        {
          [netWorkErrorStyle['d-shop-network-part']]: netWorkShowType === NetWorkShowType.PART,
        },
        {
          [netWorkErrorStyle['d-network-jd-shop-view']]: isH5AndJdShopView,
        },
        {
          [netWorkErrorStyle['d-shop-network-no-position']]: noPosition,
        },
        'flexible-center-box',
        className,
      )}
    >
      <View
        className={classNames(
          netWorkErrorStyle['d-error-content'],
          netWorkErrorStyle[`d-${netWorkStyleType}-style-content`],
          'd-error-content',
        )}
      >
        <View
          className={classNames(
            netWorkErrorStyle['d-error-type'],
            netWorkErrorStyle[`d-${netWorkDataType}`],
            netWorkErrorStyle[`d-${netWorkImageType}`],
            'd-error-type',
          )}
        />
        <View
          className={classNames(
            netWorkErrorStyle['d-error-tip'],
            netWorkErrorStyle[`d-${netWorkDataType}-tip`],
            'd-error-tip',
          )}
        >
          {useErrorTip}
        </View>
        {useErrorSubTip ? (
          <View
            className={classNames(
              netWorkErrorStyle['d-error-sub-tip'],
              netWorkErrorStyle[`d-${netWorkDataType}-sub-tip`],
              'd-error-sub-tip',
            )}
          >
            {useErrorSubTip}
          </View>
        ) : null}
        <View className={'flexible-horizontal-center-box'}>
          {refreshCallBackFn && (
            <Button
              onClick={refershInitData}
              className={classNames(
                netWorkErrorStyle['d-opt-btn'],
                'd-button-no-border',
                'd-opt-btn',
              )}
              plain
              size="mini"
            >
              {btnLabel}
            </Button>
          )}
        </View>
      </View>
    </View>
  ) : null;

package/dist/components/base/Price/Base/index.dynamic.tsx

@@ -1 +1 @@
-import React from 'react';
  let value = `${initValue}`;
  if (!cnPriceTextList.includes(value)) {
    if (value && !/^[0123456789-]*$/.test(value.substring(0, 1))) {
      symbol = value.substring(0, 1); 
      value = value.substring(1); 
    }
    if (/^\d+(\.\d+)?[eE][+-]?\d+$/.test(value)) {
      sgmCustomReport({
        code: getSgmCustomCode(`${SgmCustomCode.PRICE_RENDER}_basePrice`),
        msg: {
          price: value,
          originalPrice: initValue,
          msg: '当前价格为科学计数数据，上报关注该价格',
        },
      });
    }
    if (!decToIntegerState) {
      value = parseFloat(value).toFixed(decLength);
    } else {
      if (value.indexOf('.') !== -1) {
        value = parseFloat(value).toFixed(decLength);
        value = `${value}`.replace(/0+$/, '');
      }
    }
    if (value === 'NaN') {
      sgmCustomReport({
        code: getSgmCustomCode(`${SgmCustomCode.PRICE_RENDER}_basePrice`),
        msg: {
          price: value,
          originalPrice: initValue,
          msg: '价格转换异常，兜底展示暂无报价',
        },
      });
      value = '暂无报价';
    }
  }
  const [intVal, decimalVal] = `${value}`.split('.');
  return {
    currencySymbol: !cnPriceTextList.includes(intVal) ? symbol : '',
    intVal,
    decimalVal,
  };
  const {
    prefixCls = 'd-mini-price',
    symPos = 'sub',
    symbol = '¥',
    decPos = 'sub',
    status = '', 
    className,
    style = {},
    symClassName,
    intClassName,
    decClassName,
    noPriceClassName,
    value,
    decLength = 2,
    decToIntegerState = false, 
    isPlusPrice = false, 
    isSamsPrice,
    isMemberPrice,
    isSfpPrice,
    memberPriceIcon,
    isShowPriceLabel = false, 
    priceLabelText = '到手价', 
    useFontV2 = false,  
    useFontV2Bold = false, 
  } = props;
  const cls = classNames(
    className ? `${className}` : '',
    prefixCls,
    'd-imag-rendering-crisp-edges',
    {
      del: status === 'del',
    },
    {
      'd-price-label': isShowPriceLabel,
    },
  );
  const symCls = classNames(symClassName ? `${symClassName}` : '', {
    'sym-sub': symPos === 'sub',
    'sym-sup': symPos === 'sup',
    'd-font-v2': useFontV2,
    'd-font-v2-bold': useFontV2Bold,
  });
  const intCls = classNames(intClassName ? `${intClassName}` : '',{
    'd-font-v2': useFontV2,
    'd-font-v2-bold': useFontV2Bold,
  });
  const decCls = classNames(decClassName ? `${decClassName}` : '', {
    'dec-sub': decPos === 'sub',
    'dec-sup': decPos === 'sup',
    'd-font-v2': useFontV2,
    'd-font-v2-bold': useFontV2Bold,
  });
  const noPriceCls = classNames(noPriceClassName ? `${noPriceClassName}` : '');
  const { currencySymbol, intVal, decimalVal } = dealPrice(
    value,
    decLength,
    symbol,
    decToIntegerState,
  );
  return (
    <View className={cls} style={style}>
      {intVal === '-1' ? (
        <Text className={`${prefixCls}-txt int-txt off-shelf ${noPriceCls}`}>{`暂无报价`}</Text>
      ) : (
        <>
          <Text className={classNames(`${prefixCls}-sym`,`${symCls}`,"init-font-color",{
            "init-font-android-color": isAndroidDevice
          })}>{currencySymbol}</Text>
          <Text className={classNames(`${prefixCls}-txt`,`int-txt`,`${intCls}`,`init-font-color`,{
            "init-font-android-color": isAndroidDevice
          })}>{intVal}</Text>
          {!!decimalVal && (
            <Text className={classNames(`${prefixCls}-txt`,`dec-txt`,`${decCls}`,`init-font-color`,{
              "init-font-android-color": isAndroidDevice
            })}>.{decimalVal}</Text>
          )}
          {isShowPriceLabel && <Text className={classNames('d-price-label-text','init-font-color',{
            "init-font-android-color": isAndroidDevice
          })}>{priceLabelText}</Text>}
        </>
      )}
    </View>
  );
+import React from 'react';
  let value = `${initValue}`;
  if (!cnPriceTextList.includes(value)) {
    if (value && !/^[0123456789-]*$/.test(value.substring(0, 1))) {
      symbol = value.substring(0, 1); 
      value = value.substring(1); 
    }
    if (/^\d+(\.\d+)?[eE][+-]?\d+$/.test(value)) {
      sgmCustomReport({
        code: getSgmCustomCode(`${SgmCustomCode.PRICE_RENDER}_basePrice`),
        msg: {
          price: value,
          originalPrice: initValue,
          msg: '当前价格为科学计数数据，上报关注该价格',
        },
      });
    }
    if (!decToIntegerState) {
      value = parseFloat(value).toFixed(decLength);
    } else {
      if (value.indexOf('.') !== -1) {
        value = parseFloat(value).toFixed(decLength);
        value = `${value}`.replace(/0+$/, '');
      }
    }
    if (value === 'NaN') {
      sgmCustomReport({
        code: getSgmCustomCode(`${SgmCustomCode.PRICE_RENDER}_basePrice`),
        msg: {
          price: value,
          originalPrice: initValue,
          msg: '价格转换异常，兜底展示暂无报价',
        },
      });
      value = '暂无报价';
    }
  }
  const [intVal, decimalVal] = `${value}`.split('.');
  return {
    currencySymbol: !cnPriceTextList.includes(intVal) ? symbol : '',
    intVal,
    decimalVal,
  };
  const {
    prefixCls = 'd-mini-price',
    symPos = 'sub',
    symbol = '¥',
    decPos = 'sub',
    status = '', 
    className,
    style = {},
    symClassName,
    intClassName,
    decClassName,
    noPriceClassName,
    value,
    decLength = 2,
    decToIntegerState = false, 
    isShowPriceLabel = false, 
    priceLabelText = '到手价', 
    priceTextColor = '', 
    useFontV2 = false, 
    useFontV2Bold = false, 
  } = props;
  const cls = classNames(
    className ? `${className}` : '',
    prefixCls,
    'd-imag-rendering-crisp-edges',
    {
      del: status === 'del',
    },
    {
      'd-price-label': isShowPriceLabel,
    },
  );
  const symCls = classNames(symClassName ? `${symClassName}` : '', {
    'sym-sub': symPos === 'sub',
    'sym-sup': symPos === 'sup',
    'd-font-v2': useFontV2,
    'd-font-v2-bold': useFontV2Bold,
  });
  const intCls = classNames(intClassName ? `${intClassName}` : '', {
    'd-font-v2': useFontV2,
    'd-font-v2-bold': useFontV2Bold,
  });
  const decCls = classNames(decClassName ? `${decClassName}` : '', {
    'dec-sub': decPos === 'sub',
    'dec-sup': decPos === 'sup',
    'd-font-v2': useFontV2,
    'd-font-v2-bold': useFontV2Bold,
  });
  const noPriceCls = classNames(noPriceClassName ? `${noPriceClassName}` : '');
  const { currencySymbol, intVal, decimalVal } = dealPrice(
    value,
    decLength,
    symbol,
    decToIntegerState,
  );
  return (
    <View className={cls} style={style}>
      {intVal === '-1' ? (
        <Text className={`${prefixCls}-txt int-txt off-shelf ${noPriceCls}`}>{`暂无报价`}</Text>
      ) : (
        <>
          <Text
            className={classNames(`${prefixCls}-sym`, `${symCls}`, 'init-font-color', {
              'init-font-android-color': isAndroidDevice,
            })}
          >
            {currencySymbol}
          </Text>
          <Text
            className={classNames(`${prefixCls}-txt`, `int-txt`, `${intCls}`, `init-font-color`, {
              'init-font-android-color': isAndroidDevice,
            })}
          >
            {intVal}
          </Text>
          {!!decimalVal && (
            <Text
              className={classNames(`${prefixCls}-txt`, `dec-txt`, `${decCls}`, `init-font-color`, {
                'init-font-android-color': isAndroidDevice,
              })}
            >
              .{decimalVal}
            </Text>
          )}
          {isShowPriceLabel && (
            <Text
              className={classNames('d-price-label-text', 'init-font-color', {
                'init-font-android-color': isAndroidDevice,
              })}
              style={ priceTextColor !== '' ? {
                color: priceTextColor,
              } : {}}
            >
              {priceLabelText}
            </Text>
          )}
        </>
      )}
    </View>
  );

package/dist/components/base/Price/Base/index.module.scss

@@ -1,6 +1,7 @@
 
 :global {
   .d-mini-price {
+    --after-ele-color: '';
     position: relative;
     color: #f23030;
     display: inline-block;
@@ -67,6 +68,11 @@
         margin-left: 8px;
       }
     }
+    &.d-price-text-clor {
+      &:after {
+        color: var(--after-ele-color) !important;
+      }
+    }
     &.d-plus-price {
       .int-txt,
       .sym-sub,