@conecli/cone-render 0.10.1-shop3.9 → 0.10.1-shop3.91

package/dist/open/api/environment.ts

@@ -1 +1 @@
-import taroJdBaseInfo from '../../common'
  isIosDevice,
  isAndroidDevice,
  isH5,
  isJdApp,
  isJdMin,
  isWxApp,
  isWxMin,
  isMin,
  isWxMinAndWxapp,
  getNetworkType,
  isIos: isIosDevice,
  isAndroid: isAndroidDevice,
  isH5,
  isJdApp,
  isJdMin,
  isWxApp,
  isWxMin,
  isMin,
  isWxJgMin: isWxMinAndWxapp,
  
  pageType: pageType,
  return sysInfo.netWorkType 
+import taroJdBaseInfo from '../../common'
  isIosDevice,
  isAndroidDevice,
  isHarmonyDevice,
  isH5,
  isJdApp,
  isJdMin,
  isWxApp,
  isWxMin,
  isMin,
  isWxMinAndWxapp,
  getNetworkType,
  isIos: isIosDevice,
  isAndroid: isAndroidDevice,
  isHarmony: isHarmonyDevice,
  isH5,
  isJdApp,
  isJdMin,
  isWxApp,
  isWxMin,
  isMin,
  isWxJgMin: isWxMinAndWxapp,
  
  pageType: pageType,
  return sysInfo.netWorkType 

package/dist/open/api/shopMember.ts

@@ -1 +1 @@
-import Taro from '@tarojs/taro';
  TaroEventType,
  JUMP_MEMBER_CHANNEL,
  CENTERDISPATCH_JUMPPAGE_VALUE,
  
  CARD_BANNER = 'shopMemberCardVenderCardBanner',
  
  CARD_NAME = 'shopMemberCardVenderCardName',
  
  MEMBERSHIP_LEVEL = 'shopMemberCardMembershipLevel',
  
  MEMBERSHIP_RULE_ENTRANCE = 'shopMemberCardMembershipRuleEntrance',
  
  MEMBERSHIP_POINT = 'shopMemberCardMembershipPoint',
  return new Promise((resolve) => {
    requestServer
      .getCustomerCenterDispatch(params)
      .then((response) => {
        if (response.result && response.code === '0') {
          resolve(response.result);
        } else {
          resolve({
            jumpPage:
              response.code === '1'
                ? CENTERDISPATCH_JUMPPAGE_VALUE.NOT_LOGGED_IN
                : CENTERDISPATCH_JUMPPAGE_VALUE.SYSTEM_ERROR,
          });
        }
      })
      .catch((err) => {
        resolve({ jumpPage: CENTERDISPATCH_JUMPPAGE_VALUE.NETWORK_ERROR });
        console.log('oneKeyJoinMember getcustomerCenterDispatch err', err);
      });
  });
  const currentVenderId = global.info.queryInfo.venderId;
  const currentShopId = global.info.queryInfo.shopId;
  const channel = JUMP_MEMBER_CHANNEL.POP_WEBVIEW;
  const toastOpt = {
    duration: 3000,
    image:
      'https://img13.360buyimg.com/img/jfs/t1/196933/39/19850/1479/61b059aaEe969b8db/acb37a47b9034333.png',
  };
  if (isAppHomeForMarketPage) {
    JumpEventReport.jdJumpToBottomTabBrandMember({
      shopId: currentShopId,
      venderId: currentVenderId,
    });
    return;
  }
  const params = {
    venderId: currentVenderId,
    channel,
    queryVersion: isH5AndJdShopView && jdAppVersionStr !== '' ? jdAppVersionStr : '9.2.0', 
  };
  const centerDispatchResult = await getCenterDispatchResult(params);
  console.log('oneKeyJoinMember getcustomerCenterDispatch 接口返回值', centerDispatchResult);
  const { jumpPage } = centerDispatchResult;
  if (typeof jumpPage !== 'number') {
    console.log('oneKeyJoinMember getcustomerCenterDispatch 接口返回 jumpPage 值类型异常，非数字');
    showFailToast({
      title: '网络繁忙，稍后再试吧～',
      ...toastOpt,
    });
    return;
  }
  const centerDispatchJumpPageValue = Number(jumpPage);
  if (
    centerDispatchJumpPageValue === CENTERDISPATCH_JUMPPAGE_VALUE.NETWORK_ERROR ||
    centerDispatchJumpPageValue === CENTERDISPATCH_JUMPPAGE_VALUE.SYSTEM_ERROR
  ) {
    console.log('oneKeyJoinMember getcustomerCenterDispatch 接口网络异常或接口异常', jumpPage);
    showFailToast({
      title: '网络繁忙，稍后再试吧～',
      ...toastOpt,
    });
    return;
  }
  if (centerDispatchJumpPageValue === CENTERDISPATCH_JUMPPAGE_VALUE.NOT_LOGGED_IN) {
    console.log('oneKeyJoinMember getcustomerCenterDispatch 接口返回未登录，跳登录页');
    global
      .doLogin()
      .then((res) => {
        console.log('登录成功', res);
      })
      .catch((err) => {
        console.log('登录失败', err);
      });
    return;
  }
  const memberRoleJumpPageValueArr = [
    CENTERDISPATCH_JUMPPAGE_VALUE.MEMBER_CENTER,
    CENTERDISPATCH_JUMPPAGE_VALUE.ISV_MEMBER,
    CENTERDISPATCH_JUMPPAGE_VALUE.JSHOP_ISV_PAGE,
  ];
  const isMemberRole = memberRoleJumpPageValueArr.includes(centerDispatchJumpPageValue);
  if (isMemberRole) {
    showFailToast({
      title: '您已是本店会员，无需再次入会',
      ...toastOpt,
    });
    return;
  }
  if (!isH5AndJdShopView) {
    JumpEventReport.jdJumpToNewH5MemberCard();
    return;
  }
  const { isDegrade = true, isLowVersion = true } = centerDispatchResult;
  console.log('一键入会，是否已降级', isDegrade);
  console.log('一键入会，是否低版本', isLowVersion);
  if (isDegrade) {
    console.log('一键入会，已降级');
    showFailToast({
      title: '网络繁忙，稍后再试吧～',
      ...toastOpt,
    });
    return;
  }
  if (isLowVersion) {
    console.log('一键入会，低版本');
    JumpEventReport.jdJumpToMemberTab();
    return;
  }
  return new Promise((resolve) => {
    const getOpenCardUrlParams = {
      venderId: currentVenderId,
      shopId: currentShopId,
      channel: JUMP_MEMBER_CHANNEL.POP_WEBVIEW,
      device: isJdTabletDevice ? 'tablet' : 'all',
    };
    const memberCardurl =
      window?.shopGlobalSwitch?.openNewMemberEntry === 'true'
        ? `${JumpWebUrl.memberCard}?${objectToUrlEncode(getOpenCardUrlParams)}`
        : `${JumpWebUrl.shopH5MemberCardAPP}?${objectToUrlEncode(getOpenCardUrlParams)}`;
    const sourceUrl = encodeURIComponent(window.location.href || '');
    const url =
      sourceUrl && sourceUrl !== '' ? `${memberCardurl}&sourceUrl=${sourceUrl}` : memberCardurl;
    console.log('openPopWebview url', url);
    nativeOpenPopWebView({
      url,
    });
    Taro.eventCenter.off(TaroEventType.JOIN_MEMBER_SUCCESS);
    Taro.eventCenter.on(TaroEventType.JOIN_MEMBER_SUCCESS, (res) => {
      console.log('TaroEventType.JOIN_MEMBER_SUCCESS res', res);
      const { shopId, venderId } = res;
      if (shopId === currentShopId && venderId === currentVenderId) {
        resolve(true);
      } else {
        console.log(
          'TaroEventType.JOIN_MEMBER_SUCCESS shopId venderId 不匹配，currentShopId, currentVenderId',
          currentShopId,
          currentVenderId,
        );
        resolve(false);
      }
    });
  });
+import Taro from '@tarojs/taro';
  TaroEventType,
  JUMP_MEMBER_CHANNEL,
  CENTERDISPATCH_JUMPPAGE_VALUE,
  
  CARD_BANNER = 'shopMemberCardVenderCardBanner',
  
  CARD_NAME = 'shopMemberCardVenderCardName',
  
  MEMBERSHIP_LEVEL = 'shopMemberCardMembershipLevel',
  
  MEMBERSHIP_RULE_ENTRANCE = 'shopMemberCardMembershipRuleEntrance',
  
  MEMBERSHIP_POINT = 'shopMemberCardMembershipPoint',
  return new Promise((resolve) => {
    requestServer
      .getCustomerCenterDispatch(params)
      .then((response) => {
        if (response.result && response.code === '0') {
          resolve(response.result);
        } else {
          resolve({
            jumpPage:
              response.code === '1'
                ? CENTERDISPATCH_JUMPPAGE_VALUE.NOT_LOGGED_IN
                : CENTERDISPATCH_JUMPPAGE_VALUE.SYSTEM_ERROR,
          });
        }
      })
      .catch((err) => {
        resolve({ jumpPage: CENTERDISPATCH_JUMPPAGE_VALUE.NETWORK_ERROR });
        console.log('oneKeyJoinMember getcustomerCenterDispatch err', err);
      });
  });
  const currentVenderId = global.info.queryInfo.venderId;
  const currentShopId = global.info.queryInfo.shopId;
  const channel = JUMP_MEMBER_CHANNEL.POP_WEBVIEW;
  const forceMemberCardPopup = options?.forceMemberCardPopup;
  const toastOpt = {
    duration: 3000,
    image:
      'https://img13.360buyimg.com/img/jfs/t1/196933/39/19850/1479/61b059aaEe969b8db/acb37a47b9034333.png',
  };
  if (isAppHomeForMarketPage) {
    JumpEventReport.jdJumpToBottomTabBrandMember({
      shopId: currentShopId,
      venderId: currentVenderId,
    });
    return;
  }
  const params = {
    venderId: currentVenderId,
    channel,
    queryVersion: isH5AndJdShopView && jdAppVersionStr !== '' ? jdAppVersionStr : '9.2.0', 
  };
  const centerDispatchResult = await getCenterDispatchResult(params);
  console.log('oneKeyJoinMember getcustomerCenterDispatch 接口返回值', centerDispatchResult);
  const { jumpPage } = centerDispatchResult;
  if (typeof jumpPage !== 'number') {
    console.log('oneKeyJoinMember getcustomerCenterDispatch 接口返回 jumpPage 值类型异常，非数字');
    showFailToast({
      title: '网络繁忙，稍后再试吧～',
      ...toastOpt,
    });
    return;
  }
  const centerDispatchJumpPageValue = Number(jumpPage);
  if (
    centerDispatchJumpPageValue === CENTERDISPATCH_JUMPPAGE_VALUE.NETWORK_ERROR ||
    centerDispatchJumpPageValue === CENTERDISPATCH_JUMPPAGE_VALUE.SYSTEM_ERROR
  ) {
    console.log('oneKeyJoinMember getcustomerCenterDispatch 接口网络异常或接口异常', jumpPage);
    showFailToast({
      title: '网络繁忙，稍后再试吧～',
      ...toastOpt,
    });
    return;
  }
  if (centerDispatchJumpPageValue === CENTERDISPATCH_JUMPPAGE_VALUE.NOT_LOGGED_IN) {
    console.log('oneKeyJoinMember getcustomerCenterDispatch 接口返回未登录，跳登录页');
    global
      .doLogin()
      .then((res) => {
        console.log('登录成功', res);
      })
      .catch((err) => {
        console.log('登录失败', err);
      });
    return;
  }
  const memberRoleJumpPageValueArr = [
    CENTERDISPATCH_JUMPPAGE_VALUE.MEMBER_CENTER,
    CENTERDISPATCH_JUMPPAGE_VALUE.ISV_MEMBER,
    CENTERDISPATCH_JUMPPAGE_VALUE.JSHOP_ISV_PAGE,
  ];
  const isMemberRole = memberRoleJumpPageValueArr.includes(centerDispatchJumpPageValue);
  if (isMemberRole) {
    showFailToast({
      title: '您已是本店会员，无需再次入会',
      ...toastOpt,
    });
    return;
  }
  if (!isH5AndJdShopView && !forceMemberCardPopup) {
    JumpEventReport.jdJumpToNewH5MemberCard();
    return;
  }
  const { isDegrade = true, isLowVersion = true } = centerDispatchResult;
  console.log('一键入会，是否已降级', isDegrade);
  console.log('一键入会，是否低版本', isLowVersion);
  if (isDegrade) {
    console.log('一键入会，已降级');
    showFailToast({
      title: '网络繁忙，稍后再试吧～',
      ...toastOpt,
    });
    return;
  }
  if (isLowVersion && !forceMemberCardPopup) {
    console.log('一键入会，低版本');
    JumpEventReport.jdJumpToMemberTab();
    return;
  }
  return new Promise((resolve) => {
    const getOpenCardUrlParams = {
      venderId: currentVenderId,
      shopId: currentShopId,
      channel: JUMP_MEMBER_CHANNEL.POP_WEBVIEW,
      device: global.info.sysInfo?.isJdTabletDevice ? 'tablet' : 'all',
      memberSceneType: 'view',
      ...options,
    };
    const memberCardurl =
      window?.shopGlobalSwitch?.openNewMemberEntry === 'true'
        ? `${JumpWebUrl.memberCard}?${objectToUrlEncode(getOpenCardUrlParams)}`
        : `${JumpWebUrl.shopH5MemberCardAPP}?${objectToUrlEncode(getOpenCardUrlParams)}`;
    const sourceUrl = encodeURIComponent(window.location.href || '');
    let url =
      sourceUrl && sourceUrl !== '' ? `${memberCardurl}&sourceUrl=${sourceUrl}` : memberCardurl;
    if (!url.includes('http')) {
      url = 'https:' + url;
    }
    console.log('openPopWebview url', url);
    nativeOpenPopWebView({
      url,
    });
    Taro.eventCenter.off(TaroEventType.JOIN_MEMBER_SUCCESS);
    Taro.eventCenter.on(TaroEventType.JOIN_MEMBER_SUCCESS, (res) => {
      console.log('TaroEventType.JOIN_MEMBER_SUCCESS res', res);
      const { shopId, venderId } = res;
      if (shopId === currentShopId && venderId === currentVenderId) {
        resolve(true);
      } else {
        console.log(
          'TaroEventType.JOIN_MEMBER_SUCCESS shopId venderId 不匹配，currentShopId, currentVenderId',
          currentShopId,
          currentVenderId,
        );
        resolve(false);
      }
    });
  });

package/dist/open/api/shopMember.weapp.ts

@@ -0,0 +1 @@
+export const oneKeyJoinMember =  async (options = {}) => {
  console.log('oneKeyJoinMember 暂无实现',options)
 return Promise.resolve(false)

package/dist/open/api/track.ts

@@ -1 +1 @@
-import { JumpEventReport, JumpEventReportPromise } from '../../jumpEventReport'
  getCustomClickEventInfo: (obj: object, obj2: object, obj3: object, groupState?: boolean) => object
  getCustomExposureInfo: (obj: object, obj2: object, obj3: object, groupState?: boolean) => object
  initOpenTriggerExposure: (type: string) => void
  logPageIdInfo: Object
  logPnameInfo: Object
  getFloorPointIndexClassName: (obj: object, index?: number, tip?: string) => string
  getIsvClickEventInfo: (obj) => obj,
  getIsvExposureInfo: (obj) => obj,
  getCustomClickEventInfo: (obj) => obj,
  getCustomExposureInfo: (obj) => obj,
  initOpenTriggerExposure: () => {},
  logPageIdInfo: {},
  logPnameInfo: {},
    initOpenTriggerExposure,
    logPageIdInfo,
    logPnameInfo
    getCustomClickEventInfo: ReportContainerData.getCustomClickEventInfo.bind(ReportContainerData),
    getCustomExposureInfo: ReportContainerData.getCustomExposureInfo.bind(ReportContainerData),
    initReportBaseData: ReportContainerData.initReportBaseData.bind(ReportContainerData),
    updateSectionTabDataInfo: ReportContainerData.updateSectionTabDataInfo.bind(ReportContainerData),
    initOpenTriggerExposure: initOpenTriggerExposure.bind(JumpEventReport),
    logPnameInfo: logPnameInfo,
    logPageIdInfo: logPageIdInfo,
    getFloorPointIndexClassName: ReportContainerData.getFloorPointIndexClassName.bind(ReportContainerData)
+import { JumpEventReport, JumpEventReportPromise } from '../../jumpEventReport'
  getCustomClickEventInfo: (obj: object, obj2?: object, obj3?: object, groupState?: boolean) => object
  getCustomExposureInfo: (obj: object, obj2?: object, obj3?: object, groupState?: boolean) => object
  getCustomNewClickEventInfo: (obj: object, obj2?: object, obj3?: object, groupState?: boolean) => object
  getCustomNewExposureInfo: (obj: object, obj2?: object, obj3?: object, groupState?: boolean) => object
  initOpenTriggerExposure: (type: string) => void
  logPageIdInfo: Object
  logPnameInfo: Object
  getFloorPointIndexClassName: (obj: object, index?: number, tip?: string) => string
  getIsvClickEventInfo: (obj) => obj,
  getIsvExposureInfo: (obj) => obj,
  getCustomClickEventInfo: (obj) => obj,
  getCustomExposureInfo: (obj) => obj,
  getCustomNewClickEventInfo: (obj) => obj,
  getCustomNewExposureInfo: (obj) => obj,
  initOpenTriggerExposure: () => {},
  logPageIdInfo: {},
  logPnameInfo: {},
    initOpenTriggerExposure,
    logPageIdInfo,
    logPnameInfo
    getCustomClickEventInfo: ReportContainerData.getCustomClickEventInfo.bind(ReportContainerData),
    getCustomExposureInfo: ReportContainerData.getCustomExposureInfo.bind(ReportContainerData),
    getCustomNewClickEventInfo: ReportContainerData.getCustomNewClickEventInfo.bind(ReportContainerData),
    getCustomNewExposureInfo: ReportContainerData.getCustomNewExposureInfo.bind(ReportContainerData),
    initReportBaseData: ReportContainerData.initReportBaseData.bind(ReportContainerData),
    updateSectionTabDataInfo: ReportContainerData.updateSectionTabDataInfo.bind(ReportContainerData),
    initOpenTriggerExposure: initOpenTriggerExposure.bind(JumpEventReport),
    logPnameInfo: logPnameInfo,
    logPageIdInfo: logPageIdInfo,
    getFloorPointIndexClassName: ReportContainerData.getFloorPointIndexClassName.bind(ReportContainerData)

package/dist/open/api/util.ts

@@ -1 +1 @@
-import {
  dateFormat,
  showSuccessToast,
  showFailToast,
  showNormalToast,
  isJdApp,
  isH5AndJdShopView,
  isH5,
  isH5AndJdShopViewH5Scroll,
  stopNativeScrollEvent,
  pxTransformFromData,
  remoteCustomReport,
  isLanguageForEn,
  lodashThrottle,
  countStringify,
  dateFormat,
  countFormat: countStringify,
  showSuccessToast,
  showFailToast,
  showNormalToast,
  openDialog: openTaroEventDialog,
  closeDialog: closeTaroEventDialog,
  isJdApp,
  isH5AndJdShopView,
  isH5,
  isH5AndJdShopViewH5Scroll,
  stopNativeScrollEvent,
  pxTransformFromData,
  remoteCustomReport,
  isLanguageForEn,
  lodashThrottle,
+import {
  dateFormat,
  showSuccessToast,
  showFailToast,
  showNormalToast,
  isJdApp,
  isH5AndJdShopView,
  isH5,
  isH5AndJdShopViewH5Scroll,
  stopNativeScrollEvent,
  pxTransformFromData,
  remoteCustomReport,
  isLanguageForEn,
  isLanguageForHk,
  languageNowType,
  lodashThrottle,
  countStringify,
  draBusinessCustomLogReport
  dateFormat,
  countFormat: countStringify,
  showSuccessToast,
  showFailToast,
  showNormalToast,
  openDialog: openTaroEventDialog,
  closeDialog: closeTaroEventDialog,
  isJdApp,
  isH5AndJdShopView,
  isH5,
  isH5AndJdShopViewH5Scroll,
  stopNativeScrollEvent,
  pxTransformFromData,
  remoteCustomReport,
  isLanguageForEn,
  isLanguageForHk,
  languageNowType,
  lodashThrottle,
  draBusinessCustomLogReport

package/dist/open/components/index.ts

@@ -1 +1 @@
-import CountDown from "../../components/base/CountDown";
  Exposure,
  ItemViewExposureSmart,
  MobileCommonHeader,
  NetworkDataError,
+import CountDown from '../../components/base/CountDown';
  CountDown,
  CustomScrollView,
  CustomImageLoadRealInfo,
  LazyLayoutLoad,
  LazyLoadImage,
  Dialog,
  Price,
  Exposure,
  ExposureSmart,
  ItemViewExposureSmart,
  InViewRender,
  InOrOutViewObserver,
  CustomVideo,
  MobileCommonHeader,
  NetworkDataError,
  ShopLeGaoTag,

package/dist/open/index.ts

@@ -1 +1 @@
-import taroJdBaseInfo from '../common'
    const result = document.domain.match(/jd\.\w+$/)    
    if(result){
        document.domain = result[0]
    }
+import taroJdBaseInfo from '../common'
    const result = document.domain.match(/jd\.\w+$/)    
    if(result){
        document.domain = result[0]
    }

package/dist/sass/app.h5.scss

@@ -141,8 +141,13 @@ a {
 }
 
 
+.taro_page {
+  img {
+    pointer-events: none;
+  }
+}
+
 img {
-  pointer-events: none;
   
   //transform: perspective(1px) translate3d(0, 0, 0);
   //-webkit-backface-visibility: hidden; 
@@ -266,6 +271,12 @@ taro-text-core {
 }
 
 
+body .taro_page {
+  overflow-x: hidden;
+  overflow-y: auto;
+}
+
+
 .taro-scroll-view {
   &__scroll-x {
     overflow-x: scroll;
@@ -547,3 +558,18 @@ taro-checkbox-core {
     }
   }
 }
+
+.d-shop-lang-for-en {
+  .text-ellipsis-2 {
+    word-break: break-word;
+  }
+  .text-ellipsis-3 {
+    word-break: break-word;
+  }
+  .text-ellipsis-2-no-omit {
+    word-break: break-word;
+  }
+  .text-ellipsis-3-no-omit {
+    word-break: break-word;
+  }
+}

package/dist/sass/base.scss

@@ -29,7 +29,8 @@
 }
 @font-face {
   font-family: 'JDZhengHeiV2-Bold';
-  src: url('https://jscss.360buyimg.com/static-common/font/JDZhengHeiV20_Bold.otf')
+  //src: url('https://jscss.360buyimg.com/static-common/font/JDZhengHeiV20_Bold.otf')
+  src: url('https://jscss.360buyimg.com/static-common/font/JDZhengHeiV23_Bold.ttf')
     format('truetype');
   font-weight: normal;
   font-style: normal;
@@ -38,7 +39,8 @@
 @font-face {
   font-family: 'JDZhengHeiV2-Light';
   //src: url(https://storage.360buyimg.com/jshopstorage/JDZhengHT-Light.ttf) format('truetype');
-  src: url('https://jscss.360buyimg.com/static-common/font/JDZhengHeiV20_Light.otf')
+  //src: url('https://jscss.360buyimg.com/static-common/font/JDZhengHeiV20_Light.otf')
+  src: url('https://jscss.360buyimg.com/static-common/font/JDZhengHeiV23_Light.ttf')
     format('truetype');
   font-weight: normal;
   font-style: normal;
@@ -47,7 +49,8 @@
 @font-face {
   font-family: 'JDZhengHeiV2-Regular';
   //src: url(https://storage.360buyimg.com/jshopstorage/JDZhengHT-Regular.ttf) format('truetype');
-  src: url('https://jscss.360buyimg.com/static-common/font/JDZhengHeiV20_Regular.otf ')
+  //src: url('https://jscss.360buyimg.com/static-common/font/JDZhengHeiV20_Regular.otf ')
+  src: url('https://jscss.360buyimg.com/static-common/font/JDZhengHeiV23_Regular.ttf')
     format('truetype');
   font-weight: normal;
   font-style: normal;
@@ -55,7 +58,8 @@
 
 @font-face {
   font-family: 'JDZhengHeiV2-Heavy';
-  src: url('https://jscss.360buyimg.com/static-common/font/JDZhengHeiV20_Heavy.otf')
+  //src: url('https://jscss.360buyimg.com/static-common/font/JDZhengHeiV20_Heavy.otf')
+  src: url('https://jscss.360buyimg.com/static-common/font/JDZhengHeiV23_Heavy.ttf')
     format('truetype');
   font-weight: normal;
   font-style: normal;