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

package/package.json

@@ -1,22 +1,22 @@
 {
   "name": "@conecli/cone-render",
-  "version": "0.10.1-shop-beta.22",
+  "version": "0.10.1-shop-beta.24",
   "private": false,
   "files": [
     "dist/"
   ],
   "exports": {
-    "./api": "./dist/open/api/index",
-    "./components": "./dist/open/components/index",
-    "./modules": "./dist/open/modules/index",
-    "./_api": "./dist/api/index",
+    "./api": "./dist/open/api/index.ts",
+    "./components": "./dist/open/components/index.ts",
+    "./modules": "./dist/open/modules/index.ts",
+    "./_api": "./dist/api",
     "./_config/": "./dist/config/",
     "./_common/": "./dist/common/",
     "./_components/": "./dist/components/",
-    "./_interface": "./dist/interface/index",
-    "./_jumpEventReport": "./dist/jumpEventReport/index",
+    "./_interface": "./dist/interface",
+    "./_jumpEventReport": "./dist/jumpEventReport",
     "./_jumpEventReport/": "./dist/jumpEventReport/",
-    "./_utils": "./dist/utils/index",
+    "./_utils": "./dist/utils",
     "./_utils/": "./dist/utils/",
     "./sass/": "./dist/sass/"
   },
@@ -49,7 +49,8 @@
     "compressWatch": "gulp compressWatch --gulpfile ./publish/gulpfile.js",
     "compress": "gulp compress --gulpfile ./publish/gulpfile.js",
     "build": "npm run compress",
-    "check": "gulp check --gulpfile ./publish/gulpfile.js"
+    "check": "gulp check --gulpfile ./publish/gulpfile.js",
+    "build:openShopBridge": "node publish/build-openShopBridge.js"
   },
   "browserslist": {
     "development": [
@@ -102,11 +103,6 @@
     "@tarojs/plugin-framework-react": "4.1.2",
     "@tarojs/react": "4.1.2",
     "@tarojs/service": "4.1.2",
-    "@jdtaro/ui": "4.0.2-beta.6",
-    "@jdtaro/ui-themes": "4.0.2-beta.6",
-    "@jdtaro/inject-jd-platform-styles": "4.0.2-beta.6",
-    "@jdtaro/inject-ui-styles": "4.0.2-beta.6",
-    "@jdtaro/dynamic-types": "^0.0.1",
     "react-dom": "^18.2.0",
     "react": "^18.2.0",
     "art-template": "^4.13.2",
@@ -155,12 +151,14 @@
     "html-webpack-plugin": "^5.5.0",
     "mini-css-extract-plugin": "^2.6.1",
     "shelljs": "^0.8.5",
+    "terser": "^5.44.1",
     "terser-webpack-plugin": "^5.3.6"
   },
   "resolutions": {
     "@babel/runtime": "7.24.4",
     "@tarojs/cli": "4.1.2",
     "@tarojs/helper": "4.1.2",
-    "minimatch": "9.0.5"
+    "minimatch": "9.0.5",
+    "cacheable": "1.10.4"
   }
 }

package/dist/common/index.dynamic.ts

@@ -1 +0,0 @@
-import Taro from '@tarojs/taro';
  BUSINESS_TYPE,
  SHOP_MENU_ID_TYPE,
  SHOP_MENU_ID_NAME,
  SECTION_HOME_TAB_NAME_TYPE,
  SECTION_HOME_TAB_TYPE,
  WX_BUSINESS_TYPE,
  WXAPP_BIZ_SHOP_LIGHT_KEY,
  TaroEventType,
  abTestLabels: {}, 
  nonSellableSkuids: {}, 
  loginState: false, 
  cookiesStr: '', 
  userInfo: '',
  isImmersive: false, 
  pageInfo: {
    wxBusinessType: WX_BUSINESS_TYPE.SHOP,
    address: '', 
    addressCommaStr: '', 
    un_area: '', 
    userLbsAddress: '', 
    vapptype: '1', 
    pageType: 'home', 
    dataType: BUSINESS_TYPE.ONLINE, 
    floorExposureInfo: {}, 
    floorVideInfo: {}, 
    productVideInfo: {}, 
    tabsLoadAllDataInfo: {
      [SECTION_HOME_TAB_NAME_TYPE[SECTION_HOME_TAB_TYPE.HOME_WELL_CHOSEN]]: false,
      [SHOP_MENU_ID_NAME[SHOP_MENU_ID_TYPE.CLASSIFY]]: true, 
    }, 
    updateShopInfosAllState: false, 
    isVipShop: false, 
    isJdShowNativeImmersivePlayer: false, 
    ...shopConfig,
    pageScrollTop: 0, 
    pageIdxHeightInfo: {
      list: [],
    }, 
    shopNavBarHeight: 0, 
  },
  defaultQueryLogInfo: {
    sourceType: 'JDshop',
    sourceValue: '',
    moduleId: 'none', 
    entrance: 'none',
  },
  originQueryInfo: {},
  sysInfo: {
    windowWidth: 0,
    windowHeight: 0,
    netWorkType: '4g',
    jdBottomBarHeight: 0,
    jdNativeHeaderHeight: 0,
  },
  queryInfo: {},
  shopInfo: {},
  openAppData: {}, 
  public info: CommonInterFace.BaseConfigInfo;
  public config: {
    [key: string]: any;
  }; 
  public lazyContainer: CommonInterFace.lazyContainer;
  public rootEleNode: HTMLElement | null;
  public checkStatusAndLoginPromise: object | null;
  public loadJsSdkList: Array<any>;
  public loadJsSdkListCachePromise: any;
  public lbsAddressCachePromise: Promise<any> | null;
  public languageJsonData: any | null;
  constructor(opt) {
    this.info = this._getConfig(opt);
    this.config = {};
    this.lazyContainer = {
      [SECTION_HOME_TAB_NAME_TYPE[SECTION_HOME_TAB_TYPE.HOME_WELL_CHOSEN]]: {
        appLazyContainerList: [], 
        appLazyFinishContainerList: [], 
      },
      [SECTION_HOME_TAB_NAME_TYPE[SECTION_HOME_TAB_TYPE.HOME_PROMOTION]]: {
        appLazyContainerList: [], 
        appLazyFinishContainerList: [], 
      },
    };
    this.loadJsSdkList = [];
    this.loadJsSdkListCachePromise = {};
    this.rootEleNode = null;
    this.lbsAddressCachePromise = null;
    this.languageJsonData = langeJsonDataForCn;
    this.getSystemInfo();
    this.checkLoginStatus();
  }
  _getConfig(opt) {
    return Object.assign({}, DefaultConfig, opt);
  }
  
  taskTimeoutPromise(callBack, timeout = 2000) {
    return new Promise((resolve) => {
      setTimeout(() => {
        const getCallBackRes = typeof callBack === 'function' && callBack();
        return resolve(getCallBackRes || false);
      }, timeout);
    });
  }
  
  updateBusinessDomainAndApi(domain, api) {
    console.log('=================>', 'updateBusinessDomainAndApi');
  }
  
  getTabBarHeight(systemInfo) {
    const { statusBarHeight, isAndroid, isIOS } = systemInfo;
    let result = 50;
    if (statusBarHeight > 20) {
      if (isIOS) {
        result = 84;
      } else if (isAndroid) {
        result = 53;
      }
    }
    return result;
  }
  
  getSystemInfo() {
    const info: UtilsInterFace.taroGetSystemInfoSyncRes = getSystemInfos() || {};
    const actualNavBarHeight = (info?.navBarHeight || 0) + (info?.navBarExtendHeight || 0);
    const headerHeight = actualNavBarHeight + (info?.statusBarHeight || 0);
    const fullScreenHeight = info?.screenHeight;
    const tabBarHeight = this.getTabBarHeight(info);
    const safeContentHeight = info?.safeArea?.height;
    this.info.sysInfo = {
      ...this.info.sysInfo,
      ...info,
      actualNavBarHeight,
      headerHeight,
      fullScreenHeight,
      tabBarHeight,
      safeContentHeight,
    };
    if (this.info.sysInfo['hostVersionName']) {
      this.info.sysInfo['hostAppVersion'] = Number(
        this.info.sysInfo['hostVersionName'].replace(/\./g, ''),
      );
    }
    this.getAddressCachePromise();
    this.getLbsAddressCachePromise();
    this.info.sysInfo['wifiVideoAutoPlay'] = false;
    this.getNetWorkType();
    console.log('获取系统信息', this.info.sysInfo);
  }
  async updateMPaasConfig() {}
  
  getNetWorkType() {
    Taro.getNetworkType().then((getRes) => {
      getRes && getRes.networkType && (this.info.sysInfo['netWorkType'] = getRes.networkType);
    });
  }
  getAPPUseStraightCorner() {
    return Promise.resolve(false);
  }
  
  checkStatusAndLogin(options = {}) {
    this.checkStatusAndLoginPromise = new Promise(async (resolve, reject) => {
      try {
        const getLoginState = await this.checkLoginStatus(options);
        if (getLoginState) {
          const { pin } = await this.getLoginCookie(options);
          this.info.userInfo = {
            pin,
            encodePin: encodeURIComponent(pin),
            ptkey: '',
          };
          resolve(true);
        } else {
          reject(false);
        }
      } catch (e) {
        reject(false);
      }
    });
    return this.checkStatusAndLoginPromise;
  }
  
  checkJdStatusAndLogin(
    options = {
      loginColor: {
        biz: WXAPP_BIZ_SHOP_LIGHT_KEY,
        dpin: 0,
      },
    },
  ) {
    return this.checkStatusAndLogin(options);
  }
  
  toLogin(options = {}): Promise<any> {
    return Taro.JDLogin.login(options)
  }
  
  doLogin(options) {
    return this.toLogin(options);
  }
  
  doLoginForJdPin(options = {}) {
    return this.doLogin({
      loginColor: {
        biz: WXAPP_BIZ_SHOP_LIGHT_KEY,
        dpin: 0,
      },
      ...options,
    });
  }
  
  getLoginCookie(options = {}) {
    return new Promise((resolve) => {
      Taro.JDLogin.getUserPin(options).then(res => {
        resolve({
          pin: res?.data || ""
        })
      })
    })
  }
  
  
  checkLoginStatus(options = {}) {
    return new Promise((resolve) => {
      Taro.JDLogin.isLogin(options).then(res => {
        const getIsLoginState = res?.data || false
        getIsLoginState && (this.info.loginState = getIsLoginState)
        resolve(getIsLoginState)
      })
    })
  }
  
  getAddressCachePromise() {
    return new Promise((resolve) => {
      if (this?.info?.sysInfo?.lat && this?.info?.sysInfo?.lng && this?.info?.sysInfo?.area) {
        resolve({
          lat: this.info.sysInfo.lat,
          lng: this.info.sysInfo.lng,
          area: this?.info?.sysInfo?.area,
        });
      } else {
        Taro.JDAddress.getCacheAddress({
          businessId: '219f70bbbf7e4ede7968bedaa1beafb4',
          sceneId: 'basicShoppingProcess',
        })
          .then((res) => {
            const { errno, data } = res;
            console.log('taro动态化获取松果getCacheAddress经纬度及四级地址原始数返回结果', errno, data, res);
            if (errno === 0 && data) {
              const { latitude, longitude, provinceId, cityId, countyId, townId } =
              data || {};
              let area = '';
              this.info.sysInfo['lat'] = `${latitude || ''}`;
              this.info.sysInfo['lng'] = `${longitude || ''}`;
              const getProvinceIdNum = provinceId ? Number(provinceId) : 0;
              if (getProvinceIdNum && getProvinceIdNum > 0) {
                area = `${provinceId}_${cityId || 0}_${countyId || 0}_${townId || 0}`;
                this.info.pageInfo['address'] = area;
                this.info.pageInfo['addressCommaStr'] = area.replace(/_/g, ',');
                this.info.sysInfo['area'] = area;
                Taro.eventCenter.trigger(TaroEventType.USER_AREA_UPDATE, {
                  area: this.info.pageInfo.address,
                });
              }
              resolve({
                lat: this.info.sysInfo['lat'],
                lng: this.info.sysInfo['lng'],
                area: area,
              });
            } else {
              if (typeof res === 'object') {
                draBusinessCustomReport({
                  type: 'taro_JDAddress_getCacheAddress_info_err',
                  errMsg: '松果app内通过Taro动态化获取获取用户地址及经纬度信息异常',
                  originReqDataStr: JSON.stringify(res),
                });
              }
              resolve({ lat: '', lng: '', area: '' });
            }
          })
          .catch((error) => {
            console.error('Taro.JDAddress.getCacheAddress error:', error);
            draBusinessCustomReport({
              type: 'taro_JDAddress_getCacheAddress_info_err',
              errMsg: '松果app内通过Taro动态化获取获取用户地址及经纬度信息catch异常',
            });
            resolve({ lat: '', lng: '', area: '' });
          });
      }
    });
  }
  
  getLbsAddressCachePromise(): Promise<{
    ok: boolean;
    msg?: string;
    realTimeArea: string;
    data?: any;
  }> {
    if (!this.lbsAddressCachePromise) {
      this.lbsAddressCachePromise = new Promise((resolve) => {
        Taro.JDLocation.getCacheLocation({
          businessId: '219f70bbbf7e4ede7968bedaa1beafb4',
          sceneId: 'basicShoppingProcess',
        })
          .then((res) => {
            const { errno, data } = res;
            console.log('taro动态化获取松果appGetJdLbsCacheAddressRes，返回结果', errno, data, res);
            if (errno === 0 && data) {
              const { lat, lng, provinceId, cityId, districtId, townId } =
              data || {};
              let realTimeArea = '';
              this.info.sysInfo['srclat'] = `${lat || ''}`;
              this.info.sysInfo['srclng'] = `${lng || ''}`;
              const getProvinceIdNum = provinceId ? Number(provinceId) : 0;
              if (getProvinceIdNum && getProvinceIdNum > 0) {
                realTimeArea = `${getProvinceIdNum}_${cityId || 0}_${districtId || 0}_${townId || 0}`;
                this.info.pageInfo['userLbsAddress'] = realTimeArea;
                this.info.sysInfo['realTimeArea'] = realTimeArea;
                Taro.eventCenter.trigger(TaroEventType.USER_AREA_UPDATE, {
                  realTimeArea: this.info.pageInfo.userLbsAddress,
                });
              } else {
                this.lbsAddressCachePromise = null;
              }
              const getValidRealTimeArea = realTimeArea !== '';
              resolve({
                lat: this.info.sysInfo['srclat'],
                lng: this.info.sysInfo['srclng'],
                realTimeArea: realTimeArea,
                ok: getValidRealTimeArea,
                msg: getValidRealTimeArea
                  ? '成功'
                  : '根据Taro.JDLocation.getCacheLocation底层获取lbs地址信息异常，详情见data',
                data: getValidRealTimeArea ? null : res,
              });
            } else {
              if (typeof res === 'object') {
                draBusinessCustomReport({
                  type: 'taro_JDLocation_getCacheLocation_info_err',
                  errMsg: '根据Taro.JDLocation.getCacheLocation底层获取lbs地址信息异常异常',
                  originReqDataStr: JSON.stringify(res),
                });
              }
              this.lbsAddressCachePromise = null;
              resolve({ realTimeArea: '', ok: false });
            }
          })
          .catch((error) => {
            console.error('Taro.JDLocation.getCacheLocation error:', error);
            draBusinessCustomReport({
              type: 'taro_JDLocation_getCacheLocation_info_err',
              errMsg: '根据Taro.JDLocation.getCacheLocation底层获取lbs地址信息catch异常',
            });
            this.lbsAddressCachePromise = null;
            resolve({ realTimeArea: '', ok: false });
          });
      });
    }
    return this.lbsAddressCachePromise;
  }
  
  updatePageAndLogInfo(updateQuery = {}) {
    const createUpdateQueryInfo: {
      query: {
        shopId?: string | number;
        venderId?: string | number;
      };
      updateShopInfoState: boolean;
    } = Object.assign(
      {},
      {
        query: {},
        updateShopInfoState: false,
      },
      updateQuery,
    );
    console.log(
      '获取当前下发的店铺查询参数',
      updateQuery,
      '获取之前保存的shopInfo店铺查询参数',
      this.info?.shopInfo,
    );
    const { query, updateShopInfoState } = createUpdateQueryInfo;
    const { shopId, venderId } = query;
    if (updateShopInfoState) {
      this.info.queryInfo = {
        ...this.info.queryInfo,
        ...query,
      };
      if (shopId && venderId) {
        this.info.shopInfo = {
          shopId: `${shopId}`,
          venderId: `${venderId}`,
        };
      }
    } else {
      this.info.queryInfo = {
        ...query,
      };
      this.info.originQueryInfo = {
        ...query,
      };
      if (
        this.info.shopInfo?.shopId &&
        this.info.shopInfo?.venderId &&
        (this.info.shopInfo.shopId == shopId || this.info.shopInfo.venderId == venderId)
      ) {
        this.info.queryInfo.shopId = this.info.shopInfo.shopId;
        this.info.queryInfo.venderId = this.info.shopInfo.venderId;
        console.log(
          '当前存储的店铺shopId和venderId与下发的店铺信息shopId或者venderId为同一个，补充shopId或者venderId查询参数',
          this.info.queryInfo,
        );
      }
    }
    this.info.queryInfo['shopId'] &&
      (this.info.queryInfo['shopId'] = `${this.info.queryInfo['shopId']}`);
    this.info.queryInfo['venderId'] &&
      (this.info.queryInfo['venderId'] = `${this.info.queryInfo['venderId']}`);
    console.log(
      'dynamic===获取店铺下发查询参数\n',
      query,
      '\n获取店铺最后查询参数\n',
      this.info.queryInfo,
      '\n是否为更新店铺状态\n',
      updateShopInfoState,
    );
  }
  
  getDynamicConfig(key: string) {
    console.warn('调用微信小程序的 getDynamicConfig（），注意，此方法还未实现！');
    return null;
  }
  renderNextTickLoadSdk() {
    console.warn('暂未实现 index.weapp.ts');
  }
  loadOtherSdk() {
    console.warn('暂未实现 index.weapp.ts');
  }
  loadItemSdkPromise() {
    console.warn('暂未实现 index.weapp.ts');
  }

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

@@ -1,126 +0,0 @@
-
-.d-dialog-layout {
-	position: fixed;
-	top: 0;
-	right: 0;
-	left: 0;
-	bottom: 0;
-	background: rgba(0, 0, 0, 0.5);
-	z-index: 222;
-	.d-dialog-wrap {
-    position: relative;
-		width: 100%;
-		height: 100%;
-		opacity: 0.01;
-		transform: scale(0);
-		animation: zoomIn 250ms ease-in-out;
-		animation-fill-mode: forwards;
-    box-sizing: border-box;
-    &.d-dialog-jdapp-wrap{
-      padding-bottom: 80px;
-    }
-	}
-	.d-dialog-content {
-		padding-top: 30px;
-		width: 80%;
-		background-color: #fff;
-		border-radius: 18px;
-		overflow: hidden;
-	}
-	.d-dialog-header {
-		padding: 12px 30px;
-		margin: 0;
-		line-height: 44px;
-		font-size: 32px;
-		color: #333;
-		text-align: center;
-	}
-	.d-dialog-body {
-		padding: 30px;
-		font-size: 32px;
-		color: #333;
-		overflow: auto;
-		text-align: center;
-	}
-	.d-dialog-footer {
-    position: relative;
-    display: flex;
-    flex-direction: row;
-    border-top: 1px solid  #dadada;
-    &.d-dialog-footer-btn-line{
-      &:after {
-        content: '';
-        position: absolute;
-        display: flex;
-        top: 0;
-        left: 50%;
-        width: 1px;
-        height: 100%;
-        background-color: #dadada;
-        z-index: 2;
-      }
-    }
-		.d-dialog-btn {
-			position: relative;
-      margin: 0;
-			display: block;
-			height: 88px;
-			line-height: 88px;
-			font-size: 30px;
-			text-align: center;
-			color: #e93b3d;
-			overflow: hidden;
-			text-overflow: ellipsis;
-			white-space: nowrap;
-			box-sizing: border-box;
-      background-color: #fff;
-      border-radius: 0;
-		}
-		.d-dialog-cancel-btn {
-			color: #000;
-		}
-	}
-}
-@-webkit-keyframes zoomIn {
-	from {
-		opacity: 0;
-		-webkit-transform: scale3d(0.3, 0.3, 0.3);
-		transform: scale3d(0.3, 0.3, 0.3);
-	}
-  80% {
-    opacity: 0.95;
-    -webkit-transform: scale3d(1.05, 1.05, 1.05);
-    transform: scale3d(1.05, 1.05, 1.05);
-  }
-
-	100% {
-		opacity: 1;
-		transform: scale3d(1, 1, 1);
-	}
-}
-@keyframes zoomIn {
-	from {
-		opacity: 0;
-		-webkit-transform: scale3d(0.3, 0.3, 0.3);
-		transform: scale3d(0.3, 0.3, 0.3);
-	}
-  80% {
-    opacity: 0.95;
-    transform: scale3d(1.05, 1.05, 1.05);
-  }
-	100% {
-		opacity: 1;
-		transform: scale3d(1, 1, 1);
-	}
-}
-:global{
-  .d-shop-pad{
-    :local{
-      
-      .d-dialog-content{
-        max-width: 520PX;
-      }
-    }
-  }
-
-}