@conecli/cone-render 0.10.1-shop-beta.21 → 0.10.1-shop-beta.23

package/dist/components/base/LazyLoadImage/index.dynamic.module.scss

@@ -21,6 +21,7 @@
   //}
   background:  url('https://img10.360buyimg.com/cms/jfs/t1/328840/6/11913/995/68afbf0bF9ec30819/def24889cbb231ec.png') center center / 75px 30px no-repeat;
   &.d-lazy-sku-image {
+    background-color: #F6F6F6;
     background-image: url('https://img14.360buyimg.com/imagetools/jfs/t1/222907/25/7012/5824/61c4797cEbcd17c7f/6c76fc71e4fdb5a5.png');
     background-size: 100% 100%;
     background-position: 0 0;

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

@@ -1 +1 @@
-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',
+import { NETWORK_DATA_TYPE } from '../../../common/const';
  [NETWORK_DATA_TYPE.NO_NET_WORK]: global?.languageJsonData?.loseNetwork || '网络连接已断开',
  [NETWORK_DATA_TYPE.DATA_ERROR]:
    global?.languageJsonData?.highTraffic || '活动太火爆，访问人数较多',
  [NETWORK_DATA_TYPE.NO_DATA]: global?.languageJsonData?.highTraffic || '活动太火爆，访问人数较多', 
  [NETWORK_DATA_TYPE.RISK]: global?.languageJsonData?.highTraffic || '活动太火爆，访问人数较多',
  [NETWORK_DATA_TYPE.NO_NET_WORK]: global?.languageJsonData?.checkNetwork || '请检查您的网络设置',
  [NETWORK_DATA_TYPE.DATA_ERROR]:
    global?.languageJsonData?.pageLoadFailed || '排队进场中，请稍后再试',
  [NETWORK_DATA_TYPE.NO_DATA]: global?.languageJsonData?.pageLoadFailed || '排队进场中，请稍后再试',
  [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

@@ -11,7 +11,7 @@
   }
   .d-error-content {
     text-align: center;
-    &.d-new-style-content{
+    &.d-new-style-content {
       .d-data-error,
       .d-no-data,
       .d-no-data-tip-1,
@@ -19,7 +19,7 @@
         width: 240px;
         height: 240px;
         background: url('https://img11.360buyimg.com/imagetools/jfs/t1/256437/5/21857/22576/67b438adFed8a2665/7df7277fec7e3e8e.png')
-        0 0 /240px 240px no-repeat;
+          0 0 /240px 240px no-repeat;
       }
       .d-data-error-tip {
         padding-bottom: 24px;
@@ -86,19 +86,19 @@
   }
 
   .d-data-error {
-    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-risk {
     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');
+    background-image: url('https://img11.360buyimg.com/imagetools/jfs/t1/256437/5/21857/22576/67b438adFed8a2665/7df7277fec7e3e8e.png');
   }
   .d-no-data-tip-1 {
-    background-image: url('https://img14.360buyimg.com/imagetools/jfs/t1/152550/40/8432/21643/5fc9cae0E5391a506/523da679188ff687.png');
+    background-image: url('https://img11.360buyimg.com/imagetools/jfs/t1/256437/5/21857/22576/67b438adFed8a2665/7df7277fec7e3e8e.png');
   }
   .d-no-data-tip-2 {
-    background-image: url('https://img11.360buyimg.com/imagetools/jfs/t1/142705/35/17776/5911/5fd1e62dE4fbc2300/3ee1d4160db1dac6.png');
+    background-image: url('https://img11.360buyimg.com/imagetools/jfs/t1/256437/5/21857/22576/67b438adFed8a2665/7df7277fec7e3e8e.png');
   }
   .d-no-network-err-tip {
     background-image: url('https://img14.360buyimg.com/imagetools/jfs/t1/146556/1/17745/7493/5fd1e62dE86e86669/96f5c91befa8e991.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 = 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;
+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
    : message != ''
    ? ''
    : 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/Double/index.module.scss

@@ -117,6 +117,24 @@
 .priceDescXS {
   font-size: 20px;
 }
+.priceUnit {
+  font-family: PingFang SC;
+}
+.priceUnitXL {
+  font-size: 26px;
+}
+.priceUnitL {
+  font-size: 24px;
+}
+.priceUnitM {
+  font-size: 22px;
+}
+.priceUnitS {
+  font-size: 20px;
+}
+.priceUnitXS {
+  font-size: 18px;
+}
 
 .missPriceDesc {
 }