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

package/dist/jumpEventReport/web.wxapp.ts

@@ -1 +1 @@
-import global from '../common';
  objectToUrlEncode,
  isH5AndJingGouMini,
  public jingGouMiniState: boolean;
  private isH5OpenToWxapp: boolean;
  constructor(opt) {
    super(opt);
    this.jingGouMiniState = false;
    this.getConfig(opt);
    console.log('window.shopGlobalSwitch:', JSON.stringify(window.shopGlobalSwitch));
    this.isH5OpenToWxapp = window.shopGlobalSwitch?.openMobileShopToWxApp == 'true';
    this.init();
  }
  getConfig(opt) {
    return Object.assign(this, {}, defaultConfig, super.getConfig(opt), opt);
  }
  
  
  async init() {
    if (window.isJingGouMiniViewState) {
      this.jingGouMiniState = true;
    } else {
      console.log('初始化进行小程序环境检查, 当前是否是京购小程序里的H5', isH5AndJingGouMini);
      if (isH5AndJingGouMini && this.isH5OpenToWxapp) {
        console.log('进入了 isH5AndJingGouMini && this.isH5OpenToWxapp 的if');
        this.jingGouMiniState = true;
        window.isJingGouMiniViewState = true;
        console.log('进入了 iwx?.miniProgram then 但是没有继续跳转的逻辑 ');
        global.info.isJingGouMiniViewState = true;
      } else {
        console.log('进入了 isH5AndJingGouMini && this.isH5OpenToWxapp 的esle');
      }
    }
  }
  
  jdJumpToMiniPage(pageUrl, logEventInfo, type = 'navigateTo') {
    this.jdNavigateToNative(
      pageUrl,
      logEventInfo,
      () => {
        console.log('JD.wxappext.goto');
        wx?.miniProgram[type] &&
          wx?.miniProgram[type]({
            url: pageUrl,
          });
      },
      () => {
        console.log('JD.wxappext.goto2');
        wx?.miniProgram[type] &&
          wx?.miniProgram[type]({
            url: pageUrl,
          });
      },
    );
  }
  
  jdJumpToTabAllProduct(shopId, venderId, logEventInfo = {}) {
    console.log('web.wxapp.ts - jdJumpToTabAllProduct');
    if (typeof shopId === 'undefined') shopId = global.info.queryInfo.shopId;
    if (typeof venderId === 'undefined') venderId = global.info.queryInfo.venderId;
    if (this.jingGouMiniState) {
      const param = {
        shopId,
        venderId,
        tabActive: SECTION_HOME_TAB_NAME_TYPE[SECTION_HOME_TAB_TYPE.HOME_PRODUCT],
      };
      const url = `${this.jumpMiniPath.shopx}?${objectToUrlEncode(param)}`;
      this.jdJumpToMiniPage(url, logEventInfo);
    } else {
      super.jdJumpToTabAllProduct(shopId, venderId, logEventInfo);
    }
  }
  
  jdJumpToTopTabBase(type, shopInfo = {}) {
    const getInfo = Object.assign(
      {},
      {
        shopId: global.info.queryInfo.shopId,
        venderId: global.info.queryInfo.venderId,
      },
      shopInfo,
    );
    if (this.jingGouMiniState) {
      const { shopId, venderId, ...otherInfo } = getInfo;
      const param = {
        shopId,
        venderId,
        tabActive: type,
      };
      const url = `${this.jumpMiniPath.shopx}?${objectToUrlEncode(param)}`;
      this.jdJumpToMiniPage(url, otherInfo);
    } else {
      super.jdJumpToTopTabBase(type, shopInfo);
    }
  }
  
  jdJumpToWeb(url, logEventInfo) {
    console.log('web.wxapp.ts - jdJumpToWeb', url);
    console.log('jingGouMiniState', this.jingGouMiniState);
    if (this.jingGouMiniState) {
      const encodeUrl = `${this.jumpMiniPath.h5}?encode_url=${encodeURIComponent(url)}`;
      this.jdJumpToMiniPage(encodeUrl, logEventInfo);
    } else {
      super.jdJumpToWeb(url, logEventInfo);
    }
  }
  
  jdJumpToWebInner(url, logEventInfo) {
    super.jdJumpToWeb(url, logEventInfo);
  }
  
  jdJumpToProduct(skuIds, logEventInfo) {
    if (this.jingGouMiniState) {
      const detailUrl = `${this.jumpMiniPath.detail}?sku=${skuIds}`;
      this.jdJumpToMiniPage(detailUrl, logEventInfo);
    } else {
      super.jdJumpToProduct(skuIds, logEventInfo);
    }
  }
  
  jdJumpSkuInfoToProduct(skuInfo: any = {}, logEventInfo) {
    const getSkuId = skuInfo?.skuId;
    this.jdJumpToProduct(getSkuId, logEventInfo);
  }
  
  jdJumpToShopHome(params) {
    console.log('[降级H5] jdJumpToShopHome web.wxapp', params);
    console.log(
      'global.info.queryInfo.shopId',
      global.info.queryInfo.shopId,
      global.info.queryInfo.venderId,
    );
    const getInfo = Object.assign(
      {},
      {
        shopId: global.info.queryInfo.shopId,
        venderId: global.info.queryInfo.venderId,
      },
      params,
    );
    const { type = 'navigateTo', ...otherShopInfo } = getInfo;
    if (this.jingGouMiniState) {
      let shopUrl = `${this.jumpMiniPath.shopx}${window.location.search}`;
      if (
        /(\/shop\/(samCenter|samCard))|(\/sale\/home)|(\/favorite)/.test(window.location.pathname)
      ) {
        shopUrl = `${this.jumpMiniPath.shopx}?${objectToUrlEncode(
          this.getShopIdsInfo(otherShopInfo),
        )}`;
      }
      this.jdJumpToMiniPage(shopUrl, otherShopInfo, type);
    } else {
      super.jdJumpToShopHome(otherShopInfo);
    }
  }
  
  jdJumpToShopCategory(params) {
    console.log('[降级H5] jdJumpToShopCategory web.wxapp');
    const { type = 'navigateTo', ...otherShopInfo } = params;
    console.log('获取分类跳转参数', params);
    if (this.jingGouMiniState) {
      this.jdJumpToTopTabBase('classify', otherShopInfo);
    } else {
      super.jdJumpToShopCategory(otherShopInfo);
    }
  }
  
  jdJumpToLive(liveInfo, logEventInfo = {}) {
    if (liveInfo?.liveId) {
      if (this.jingGouMiniState && liveInfo?.openWxappToLiveRoom) {
        this.jdJumpToMiniPage(`${this.jumpMiniPath.jdLive}?liveId=${liveInfo.liveId}&origin=473`, {
          logEventInfo,
        });
      } else {
        this.jdJumpToWeb(
          `${this.jumpWebUrl.mLive}/${liveInfo.liveId}?${
            this.jingGouMiniState ? 'origin=0&appid=jdgw' : 'origin=30'
          }`,
          logEventInfo,
        );
      }
    }
  }
  
  jdJumpToShopLight(shopInfo) {
    if (this.jingGouMiniState) {
      this.jdJumpToMiniPage(
        `${this.jumpMiniPath.shopLight}?${objectToUrlEncode(
          this.getShopIdOrVenderIdParams(shopInfo),
        )}`,
        {
          ...shopInfo,
        },
      );
    } else {
      this.jdNavigateToNative(
        `${this.jumpWebUrl.shopLight}?${objectToUrlEncode(
          this.getShopIdOrVenderIdParams(shopInfo),
        )}`,
        {
          ...shopInfo,
        },
      );
    }
  }
  jdJumpToCouponSearchProductList(couponId, logEventInfo = {}) {
    if (this.jingGouMiniState) {
      const detailUrl = `${this.jumpMiniPath.searchCoupon}?batch=${couponId}`;
      this.jdJumpToMiniPage(detailUrl, logEventInfo);
    } else {
      super.jdJumpToCouponSearchProductList(couponId, logEventInfo);
    }
  }
+import global from '../common';
  objectToUrlEncode,
  isH5AndJingGouMini,
  public jingGouMiniState: boolean;
  private isH5OpenToWxapp: boolean;
  constructor(opt) {
    super(opt);
    this.jingGouMiniState = false;
    this.getConfig(opt);
    console.log('window.shopGlobalSwitch:', JSON.stringify(window.shopGlobalSwitch));
    this.isH5OpenToWxapp = window.shopGlobalSwitch?.openMobileShopToWxApp == 'true';
    this.init();
  }
  getConfig(opt) {
    return Object.assign(this, {}, defaultConfig, super.getConfig(opt), opt);
  }
  
  
  async init() {
    if (window.isJingGouMiniViewState) {
      this.jingGouMiniState = true;
    } else {
      console.log('初始化进行小程序环境检查, 当前是否是京购小程序里的H5', isH5AndJingGouMini);
      if (isH5AndJingGouMini && this.isH5OpenToWxapp) {
        console.log('进入了 isH5AndJingGouMini && this.isH5OpenToWxapp 的if');
        this.jingGouMiniState = true;
        window.isJingGouMiniViewState = true;
        console.log('进入了 iwx?.miniProgram then 但是没有继续跳转的逻辑 ');
        global.info.isJingGouMiniViewState = true;
      } else {
        console.log('进入了 isH5AndJingGouMini && this.isH5OpenToWxapp 的esle');
      }
    }
  }
  
  jdJumpToMiniPage(pageUrl, logEventInfo, type = 'navigateTo') {
    this.jdNavigateToNative(
      pageUrl,
      logEventInfo,
      () => {
        console.log('JD.wxappext.goto');
        wx?.miniProgram[type] &&
          wx?.miniProgram[type]({
            url: pageUrl,
          });
      },
      () => {
        console.log('JD.wxappext.goto2');
        wx?.miniProgram[type] &&
          wx?.miniProgram[type]({
            url: pageUrl,
          });
      },
    );
  }
  
  jdJumpToTabAllProduct(shopId, venderId, logEventInfo = {}) {
    console.log('web.wxapp.ts - jdJumpToTabAllProduct');
    if (typeof shopId === 'undefined') shopId = global.info.queryInfo.shopId;
    if (typeof venderId === 'undefined') venderId = global.info.queryInfo.venderId;
    if (this.jingGouMiniState) {
      const param = {
        shopId,
        venderId,
        tabActive: SECTION_HOME_TAB_NAME_TYPE[SECTION_HOME_TAB_TYPE.HOME_PRODUCT],
      };
      const url = `${this.jumpMiniPath.shopx}?${objectToUrlEncode(param)}`;
      this.jdJumpToMiniPage(url, logEventInfo);
    } else {
      super.jdJumpToTabAllProduct(shopId, venderId, logEventInfo);
    }
  }
  
  jdJumpToTopTabBase(type, shopInfo = {}) {
    const getInfo = Object.assign(
      {},
      {
        shopId: global.info.queryInfo.shopId,
        venderId: global.info.queryInfo.venderId,
      },
      shopInfo,
    );
    if (this.jingGouMiniState) {
      const { shopId, venderId, ...otherInfo } = getInfo;
      const param = {
        shopId,
        venderId,
        tabActive: type,
      };
      const url = `${this.jumpMiniPath.shopx}?${objectToUrlEncode(param)}`;
      this.jdJumpToMiniPage(url, otherInfo);
    } else {
      super.jdJumpToTopTabBase(type, shopInfo);
    }
  }
  
  jdJumpToWeb(url, logEventInfo) {
    console.log('web.wxapp.ts - jdJumpToWeb', url);
    console.log('jingGouMiniState', this.jingGouMiniState);
    if (this.jingGouMiniState) {
      const encodeUrl = `${this.jumpMiniPath.h5}?encode_url=${encodeURIComponent(url)}`;
      this.jdJumpToMiniPage(encodeUrl, logEventInfo);
    } else {
      super.jdJumpToWeb(url, logEventInfo);
    }
  }
  
  jdJumpToWebInner(url, logEventInfo) {
    super.jdJumpToWeb(url, logEventInfo);
  }
  
  jdJumpToProduct(skuIds, logEventInfo) {
    if (this.jingGouMiniState) {
      const detailUrl = `${this.jumpMiniPath.detail}?sku=${skuIds}`;
      this.jdJumpToMiniPage(detailUrl, logEventInfo);
    } else {
      super.jdJumpToProduct(skuIds, logEventInfo);
    }
  }
  
  jdJumpSkuInfoToProduct(skuInfo: any = {}, logEventInfo) {
    const getSkuId = skuInfo?.skuId;
    this.jdJumpToProduct(getSkuId, logEventInfo);
  }
  
  jdJumpToShopHome(shopInfo) {
    console.log('[降级H5] jdJumpToShopHome web.wxapp', shopInfo);
    console.log(
      'global.info.queryInfo.shopId',
      global.info.queryInfo.shopId,
      global.info.queryInfo.venderId,
    );
    const currentShopInfo = {
      shopId: global.info.queryInfo.shopId,
      venderId: global.info.queryInfo.venderId,
    };
    const restParams =
      (shopInfo?.shopId && shopInfo.shopId !== currentShopInfo.shopId) ||
      (shopInfo?.venderId && shopInfo.venderId !== currentShopInfo.venderId)
        ? {}
        : currentShopInfo;
    const getInfo = Object.assign({}, restParams, shopInfo);
    const { type = 'navigateTo', ...otherShopInfo } = getInfo;
    if (this.jingGouMiniState) {
      let shopUrl = `${this.jumpMiniPath.shopx}${window.location.search}`;
      if (
        /(\/shop\/(samCenter|samCard))|(\/sale\/home)|(\/favorite)/.test(window.location.pathname)
      ) {
        shopUrl = `${this.jumpMiniPath.shopx}?${objectToUrlEncode(
          this.getShopIdsInfo(otherShopInfo),
        )}`;
      }
      this.jdJumpToMiniPage(shopUrl, otherShopInfo, type);
    } else {
      super.jdJumpToShopHome(otherShopInfo);
    }
  }
  
  jdJumpToShopCategory(params) {
    console.log('[降级H5] jdJumpToShopCategory web.wxapp');
    const { type = 'navigateTo', ...otherShopInfo } = params;
    console.log('获取分类跳转参数', params);
    if (this.jingGouMiniState) {
      this.jdJumpToTopTabBase('classify', otherShopInfo);
    } else {
      super.jdJumpToShopCategory(otherShopInfo);
    }
  }
  
  jdJumpToLive(liveInfo, logEventInfo = {}) {
    if (liveInfo?.liveId) {
      if (this.jingGouMiniState && liveInfo?.openWxappToLiveRoom) {
        this.jdJumpToMiniPage(`${this.jumpMiniPath.jdLive}?liveId=${liveInfo.liveId}&origin=473`, {
          logEventInfo,
        });
      } else {
        this.jdJumpToWeb(
          `${this.jumpWebUrl.mLive}/${liveInfo.liveId}?${
            this.jingGouMiniState ? 'origin=0&appid=jdgw' : 'origin=30'
          }`,
          logEventInfo,
        );
      }
    }
  }
  
  jdJumpToShopLight(shopInfo) {
    if (this.jingGouMiniState) {
      this.jdJumpToMiniPage(
        `${this.jumpMiniPath.shopLight}?${objectToUrlEncode(
          this.getShopIdOrVenderIdParams(shopInfo),
        )}`,
        {
          ...shopInfo,
        },
      );
    } else {
      this.jdNavigateToNative(
        `${this.jumpWebUrl.shopLight}?${objectToUrlEncode(
          this.getShopIdOrVenderIdParams(shopInfo),
        )}`,
        {
          ...shopInfo,
        },
      );
    }
  }
  jdJumpToCouponSearchProductList(couponId, logEventInfo = {}) {
    if (this.jingGouMiniState) {
      const detailUrl = `${this.jumpMiniPath.searchCoupon}?batch=${couponId}`;
      this.jdJumpToMiniPage(detailUrl, logEventInfo);
    } else {
      super.jdJumpToCouponSearchProductList(couponId, logEventInfo);
    }
  }

package/dist/language/en_US.json

@@ -52,6 +52,7 @@
   "sendCodeFail": "Send failed, please try again later.",
   "successMsg": "Success",
   "noProduct": "No products~",
+  "shopYearDescText": "Achieve annual 5-Star honors, with ratings exceeding 99% of stores",
   "newWareCalendar": "上新日历",
   "joinYouToMember": "Invite you to join brand member",
   "recommendOrder": "Recommended",
@@ -166,6 +167,7 @@
   "joinMemberRightNow": "立即加入品牌会员",
   "follow": "Follow",
   "followed": "Following",
+  "shopPopularity": "Popularity",
   "joinMemberSuccess": "Join successfully",
   "mobileNumberErrorFill": "Wrong phone number",
   "joinNow": "Join now",

package/dist/language/zh_CN.json

@@ -52,6 +52,7 @@
   "sendCodeFail": "发送失败, 请稍后再试",
   "successMsg": "成功",
   "noProduct": "哎呀，店铺内没有商品呢~",
+  "shopYearDescText": "获得年度五星荣誉, 评级超过99%的店铺",
   "newWareCalendar": "上新日历",
   "joinYouToMember": "授权加入店铺会员",
   "recommendOrder": "推荐排序",
@@ -166,6 +167,7 @@
   "joinMemberRightNow": "立即加入品牌会员",
   "follow": "关注",
   "followed": "已关注",
+  "shopPopularity": "店铺人气",
   "joinMemberSuccess": "入会成功",
   "mobileNumberErrorFill": "未填写正确的手机号",
   "joinNow": "入会立享",

package/dist/language/zh_HK.json

@@ -52,6 +52,7 @@
   "sendCodeFail": "發送失敗, 請稍後再試",
   "successMsg": "成功",
   "noProduct": "哎呀，店鋪內沒有商品呢~",
+  "shopYearDescText": "獲得年度五星榮譽, 評級超過99%的店鋪",
   "newWareCalendar": "上新日曆",
   "joinYouToMember": "授權加入店鋪會員",
   "recommendOrder": "推薦排序",
@@ -166,6 +167,7 @@
   "joinMemberRightNow": "立即加入品牌會員",
   "follow": "關注",
   "followed": "已關注",
+  "shopPopularity": "店鋪人氣",
   "joinMemberSuccess": "入會成功",
   "mobileNumberErrorFill": "未填寫正確的手機號",
   "joinNow": "入會立享",