@conecli/cone-render 0.9.1-shop2.3 → 0.9.1-shop2.30

package/dist/open/api/track.ts

@@ -1 +1 @@
-import { JumpEventReport, JumpEventReportPromise } from '../../jumpEventReport'
  initOpenTriggerExposure: (type: string) => void
  logPageIdInfo: Object
  logPnameInfo: Object
  getFloorPointIndexClassName: (obj: object, index?: number, tip?: string) => string
  initOpenTriggerExposure: () => {},
    initOpenTriggerExposure,
    logPageIdInfo,
    logPnameInfo
    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
  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)

package/dist/open/api/util.ts

@@ -1 +1 @@
-import {
  dateFormat,
  showSuccessToast,
  showFailToast,
  showNormalToast,
  isJdApp,
  isH5AndJdShopView,
  isH5,
  isH5AndJdShopViewH5Scroll
  openTaroEventDialog,
  closeTaroEventDialog,
  dateFormat,
  showSuccessToast,
  showFailToast,
  showNormalToast,
  openDialog: openTaroEventDialog,
  closeDialog: closeTaroEventDialog,
  isJdApp,
  isH5AndJdShopView,
  isH5,
  isH5AndJdShopViewH5Scroll
+import {
  dateFormat,
  showSuccessToast,
  showFailToast,
  showNormalToast,
  isJdApp,
  isH5AndJdShopView,
  isH5,
  isH5AndJdShopViewH5Scroll,
  stopNativeScrollEvent,
  pxTransformFromData,
  remoteCustomReport
  openTaroEventDialog,
  closeTaroEventDialog,
  dateFormat,
  showSuccessToast,
  showFailToast,
  showNormalToast,
  openDialog: openTaroEventDialog,
  closeDialog: closeTaroEventDialog,
  isJdApp,
  isH5AndJdShopView,
  isH5,
  isH5AndJdShopViewH5Scroll,
  stopNativeScrollEvent,
  pxTransformFromData,
  remoteCustomReport,

package/dist/open/components/index.ts

@@ -1 +1 @@
-import CountDown from "../../components/base/CountDown";
  Exposure,
  ItemViewExposureSmart,
+import CountDown from "../../components/base/CountDown";
  Exposure,
  ItemViewExposureSmart,
  MobileCommonHeader,
  NetworkDataError,

package/dist/sass/app.h5.scss

@@ -148,6 +148,11 @@ img {
 	//transform: perspective(1px) translate3d(0, 0, 0);
 	//-webkit-backface-visibility: hidden; 
 	//-webkit-transform-style: preserve-3d; 
+  // 图片加载过慢，在可视化区域等可能导致线出现裂图，然后加载正常url，这里如果是没有src就隐藏
+  &[src=""],
+  &:not([src]){
+    opacity:0;
+  }
 }
 
 .clearFlow {
@@ -228,6 +233,11 @@ video {
 	}
 }
 
+// tarojs会在运行时动态给页面写入这个样式，但是动态写入可能导致在写入之前，有些依赖于 taro-view-core 块行为的逻辑出现异常，比如获取一个view的宽度，block情况下应该是有宽度的，但可能会出现获取到的宽度值是0。所以改成样式表里就直接定义好
+taro-view-core {
+    display: block;
+}
+
 taro-view-core,
 taro-image-core,
 taro-text-core,
@@ -295,19 +305,55 @@ taro-radio-core {
 		.weui-check + .weui-icon-checked {
 			vertical-align: middle;
 			&:before {
+        content: "";
+        width: 32px;
+        height: 32px;
+        margin-left: 0;
 				margin-top: -4px;
-				font-size: 36px;
+        border: 2px solid #909090;
+        //color: #909090;
+        //background: url("https://img12.360buyimg.com/imagetools/jfs/t1/206105/34/32968/504/64d35614F8cedb83b/d5953c21e17d17ae.png") no-repeat 0 0 / cover;
+        border-radius: 50%;
+        box-sizing: border-box;
 				vertical-align: middle;
 			}
 		}
 		.weui-check:checked + .weui-icon-checked {
 			&:before {
-				color: #e93b3d;
+        content: "";
+        border: none;
+        background: url("https://img12.360buyimg.com/imagetools/jfs/t1/190964/36/36148/636/64d35614Fd3f012fd/28a6f01faddaedbb.png") no-repeat 0 0 / cover;
 			}
 		}
 	}
 }
-
+taro-checkbox-core{
+  .taro-checkbox_checked {
+    border: 2px solid #909090;
+    //background: url("https://img12.360buyimg.com/imagetools/jfs/t1/206105/34/32968/504/64d35614F8cedb83b/d5953c21e17d17ae.png") no-repeat 0 0 / cover;
+    border-radius: 50%;
+    box-sizing: border-box;
+    &:checked {
+      border: none;
+      background: url("https://img12.360buyimg.com/imagetools/jfs/t1/190964/36/36148/636/64d35614Fd3f012fd/28a6f01faddaedbb.png") no-repeat 0 0 / cover;
+      &:before {
+        content: none;
+      }
+    }
+  }
+}
+.weui-picker{
+  font-size: 30px;
+  .weui-picker__hd{
+    font-size: 32px;
+  }
+  .weui-picker__action{
+    color: #FA2C19;
+    &:first-child{
+      color: #1A1A1A;
+    }
+  }
+}
 
 .taro__toast {
 	transition: none !important;

package/dist/sass/base.scss

@@ -31,6 +31,39 @@
 	src: url('https://wq.360buyimg.com/data/ppms/others/JDZhengHei_01_Bold.ttf')
 		format('truetype');
 }
+@font-face {
+  font-family: 'JDZhengHeiV2-Bold';
+  src: url('https://jscss.360buyimg.com/static-common/font/JDZhengHeiV20_Bold.otf')
+  format('truetype');
+  font-weight: normal;
+  font-style: normal;
+}
+
+@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')
+  format('truetype');
+  font-weight: normal;
+  font-style: normal;
+}
+
+@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 ')
+  format('truetype');
+  font-weight: normal;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: 'JDZhengHeiV2-Heavy';
+  src: url('https://jscss.360buyimg.com/static-common/font/JDZhengHeiV20_Heavy.otf')
+  format('truetype');
+  font-weight: normal;
+  font-style: normal;
+}
 
 .font-jdzht {
 	font-family: 'JDZhengHT-Regular';
@@ -47,7 +80,19 @@
 .font-jdzht-light {
 	font-family: 'JDZhengHT-Light';
 }
+.font-jdzht-v2 {
+  font-family: 'JDZhengHeiV2-Regular';
+}
+.font-jdzht-v2-bold {
+  font-family: 'JDZhengHeiV2-Bold';
+}
+.font-jdzht-v2-heavy {
+  font-family: 'JDZhengHeiV2-Heavy';
+}
 
+.font-jdzht-v2-light {
+  font-family: 'JDZhengHeiV2-Light';
+}
 
 .border-box {
 	box-sizing: border-box;
@@ -340,3 +385,15 @@
 		border: none;
 	}
 }
+.slide-in-left {
+  animation: slide-in-left 1s forwards;
+}
+
+@keyframes slide-in-left {
+  0% {
+    transform: translateX(0);
+  }
+  100% {
+    transform: translateX(-270px);
+  }
+}

package/dist/service/fetchGateway.ts

@@ -1 +1 @@
-import { api } from '../api'
  clientVersion: '11.0.0',
  client: 'wh5',
  area: '1_72_2799_0',
  loginType: '2',
  uuid: UUID,
  functionId: string,
  body = {},
  options = {},
  requestOptions = {},
  const params = Object.assign(
    {},
    {
      t: Date.now(),
      functionId,
      appid: 'shop_m_jd_com',
      body: JSON.stringify(body),
    },
    clientParams,
    options,
  )
  console.warn(
    'fetchGateway url:' + api.apiFunc + ',functionId:' + params.functionId,
  )
  return http.post(api.apiFunc, params, requestOptions)
+import { api } from '../api'
  clientVersion: '11.0.0',
  client: 'wh5',
  area: '1_72_2799_0',
  uuid: UUID,
  functionId: string,
  body = {},
  options = {},
  requestOptions = {},
  const params = Object.assign(
    {},
    {
      t: Date.now(),
      functionId,
      appid: 'shop_m_jd_com',
      body: JSON.stringify(body),
    },
    clientParams,
    options,
  )
  console.warn(
    'fetchGateway url:' + api.apiFunc + ',functionId:' + params.functionId,
  )
  return http.post(api.apiFunc, params, requestOptions)

package/dist/service/http/colorSign.ts

@@ -1 +1 @@
-import { ServiceInterFace } from '../../interface'
  AppVerifyColorList,
  SHOP_VERIFY_CODE,
  PAGES_VERIFY_CODE,
  B2B_VERITY_CODE,
  PAGES_DOMAIN,
  B2BColorFunctionIdList,
  public fmInfo: {
    eid?: string
    fp?: string
    jsToken?: string
    sdkToken?: string
  } 
  public api: ServiceInterFace.HttpApi
  public paramsSignInstance: any
  public paramsSignPagesInstance: any
  public paramsSignBmallInstance: any
  public isPageDomain: boolean
  constructor() {
    this.api = api
    this.isPageDomain = location?.hostname === PAGES_DOMAIN
    this.paramsSignInstance = undefined
    this.paramsSignPagesInstance = undefined
    this.paramsSignBmallInstance = undefined
    this.fmInfo = {}
    this._initSign()
  }
  
  _getMobileJsToken(): Promise<{
    ok: boolean
    data?: any
    error?: any
  }> {
    return new Promise((resolve, reject) => {
      try {
        if (window?.getJsToken) {
          window.getJsToken(function (res) {
            console.log('JS token 获取结果：', res)
            resolve({
              ok: true,
              data: res,
            })
          }, 600)
        } else {
          reject({
            ok: false,
            error: '没有识别到getJsToken全局方法',
          })
        }
      } catch (e) {
        console.log('获取指纹JS token 异常', e)
        reject({
          ok: false,
          error: e,
        })
      }
    })
  }
  
  async getFmInfo() {
    try {
      const { ok, data } = await this._getMobileJsToken()
      this.fmInfo = ok && data ? data : this.fmInfo
      return this.fmInfo
    } catch (e) {
      console.log('获取指纹信息异常', e)
      return this.fmInfo
    }
  }
  
  _initSign() {
    this.paramsSignInstance = window.PSign
      ? window.PSign
      : window.ParamsSign
      ? this._initParamsSignInstance(SHOP_VERIFY_CODE)
      : null
    this.paramsSignPagesInstance = window.ParamsSign
      ? this._initParamsSignInstance(PAGES_VERIFY_CODE)
      : null
    this.paramsSignBmallInstance = window.ParamsSign
      ? this._initParamsSignInstance(B2B_VERITY_CODE)
      : null
  }
  
  _initParamsSignInstance(appId) {
    return new window.ParamsSign({
      appId: appId, 
      debug: false, 
      preRequest: false,
      onSign: ({ code }) => {
        console.log('签名可用率监控', code)
      },
      onRequestTokenRemotely: ({ code, message }) => {
        console.log('算法接口可用率监控', code, message)
      },
      onRequestToken: ({ code, message }) => {
        console.log('token的可用率监控', code, message)
      },
    })
  }
  
  paramsSign(data) {
    try {
      console.log('获取加签参数', data, this.paramsSignInstance)
      if (!data || typeof data !== 'object' || !this.paramsSignInstance) {
        return Promise.resolve(data)
      } else {
        const param: any = {
          appid: data.appid,
          client: data.client,
          clientVersion: data.clientVersion,
          functionId: data.functionId,
          t: data.t,
          sign: data?.sign,
          jsonp: data?.jsonp,
        }
        data && data.body && (param.body = sha256(data.body).toString())
        console.log(
          '获取加签前的参数处理',
          param,
          '获取下发data',
          data,
          '获取加签实例',
          this.paramsSignInstance,
          this.paramsSignPagesInstance,
        )
        return this.isPageDomain &&
          this.paramsSignPagesInstance &&
          AppVerifyColorList.includes(param.functionId)
          ? this.paramsSignPagesInstance.sign(param)
          : this.paramsSignBmallInstance &&
            B2BColorFunctionIdList.includes(param.functionId)
          ? this.paramsSignBmallInstance.sign(param)
          : this.paramsSignInstance.sign(param)
      }
    } catch (e) {
      console.log('获取加签参数结果异常', e)
      return Promise.resolve(data)
    }
  }
+import { ServiceInterFace } from '../../interface'
  AppVerifyColorList,
  SHOP_VERIFY_CODE,
  PAGES_VERIFY_CODE,
  B2B_VERITY_CODE,
  PAGES_DOMAIN,
  B2BColorFunctionIdList,
  public fmInfo: {
    eid?: string
    fp?: string
    jsToken?: string
    sdkToken?: string
  } 
  public api: ServiceInterFace.HttpApi
  public paramsSignInstance: any
  public paramsSignPagesInstance: any
  public paramsSignBmallInstance: any
  public isPageDomain: boolean
  public initParamsSignInstance: any
  public initJsTokenInstance: any
  constructor() {
    this.api = api
    this.isPageDomain = location?.hostname === PAGES_DOMAIN
    this.paramsSignInstance = undefined
    this.paramsSignPagesInstance = undefined
    this.paramsSignBmallInstance = undefined
    this.initParamsSignInstance = undefined
    this.initJsTokenInstance = undefined
    this.fmInfo = {}
  }
  
  _loadSingleJs(jsFileName, successCallback?, failCallback?) {
    const jsInfo = global.loadJsSdkList.find(
      (item) => item?.fileName === jsFileName,
    )
    if (jsInfo) {
      global
        .loadItemSdkPromise(jsInfo)
        .then(() => {
          typeof successCallback === 'function' && successCallback()
        })
        .catch(() => {
          console.info('业务发起接口请求前置加载js异常' + jsInfo?.src)
          typeof failCallback === 'function' && failCallback()
        })
    } else {
      typeof failCallback === 'function' && failCallback()
    }
  }
  
  _getMobileJsToken(): Promise<{
    ok: boolean
    data?: any
    error?: any
  }> {
    return this._handleInitJsToken().then(() => {
      try {
        if (window?.getJsToken) {
          return new Promise((resolve) => {
            window.getJsToken(function (res) {
              console.log('JS token 获取结果', res)
              resolve({
                ok: true,
                data: res,
              })
            }, 600)
          })
        } else {
          console.log('没有识别到getJsToken全局方法')
          return Promise.resolve({
            ok: false,
            error: '没有识别到getJsToken全局方法',
          })
        }
      } catch (e) {
        console.log('获取指纹JS token 异常', e)
        return Promise.resolve({
          ok: false,
          error: e,
        })
      }
    })
  }
  
  async getFmInfo() {
    try {
      const { ok, data } = await this._getMobileJsToken()
      this.fmInfo = ok && data ? data : this.fmInfo
      return this.fmInfo
    } catch (e) {
      console.log('获取指纹信息异常', e)
      return this.fmInfo
    }
  }
  
  _initSign() {
    this.paramsSignInstance = window.PSign
      ? window.PSign
      : window.ParamsSign
      ? this._initParamsSignInstance(SHOP_VERIFY_CODE)
      : null
    this.paramsSignPagesInstance = window.ParamsSign
      ? this._initParamsSignInstance(PAGES_VERIFY_CODE)
      : null
    this.paramsSignBmallInstance = window.ParamsSign
      ? this._initParamsSignInstance(B2B_VERITY_CODE)
      : null
  }
  
  _initParamsSignInstance(appId) {
    return new window.ParamsSign({
      appId: appId, 
      debug: false, 
      preRequest: false,
      onSign: ({ code }) => {
        console.log('签名可用率监控', code)
      },
      onRequestTokenRemotely: ({ code, message }) => {
        console.log('算法接口可用率监控', code, message)
      },
      onRequestToken: ({ code, message }) => {
        console.log('token的可用率监控', code, message)
      },
    })
  }
  
  paramsSign(data) {
    try {
      return this._handleInitSign().then(() => {
        console.log('获取加签参数', data, this.paramsSignInstance)
        if (!data || typeof data !== 'object' || !this.paramsSignInstance) {
          return Promise.resolve(data)
        } else {
          const param: any = {
            appid: data.appid,
            client: data.client,
            clientVersion: data.clientVersion,
            functionId: data.functionId,
            t: data.t,
            sign: data?.sign,
            jsonp: data?.jsonp,
          }
          data && data.body && (param.body = sha256(data.body).toString())
          console.log(
            '获取加签前的参数处理',
            param,
            '获取下发data',
            data,
            '获取加签实例',
            this.paramsSignInstance,
            this.paramsSignPagesInstance,
          )
          return this.isPageDomain &&
            this.paramsSignPagesInstance &&
            AppVerifyColorList.includes(param.functionId)
            ? this.paramsSignPagesInstance.sign(param)
            : this.paramsSignBmallInstance &&
              B2BColorFunctionIdList.includes(param.functionId)
            ? this.paramsSignBmallInstance.sign(param)
            : this.paramsSignInstance.sign(param)
        }
      })
    } catch (e) {
      console.log('获取加签参数结果异常', e)
      return Promise.resolve(data)
    }
  }
  
  _handleInitSign() {
    if (!this.initParamsSignInstance) {
      this.initParamsSignInstance = new Promise((resolve) => {
        if (window?.ParamsSign) {
          this._initSign()
          resolve({
            ok: true,
            msg: '加固js已加载',
          })
        } else if (window?.PAGE_DATA?.asyncLoadSecurityJs) {
          this._loadSingleJs(
            'securityJs',
            () => {
              this._initSign()
              resolve({
                ok: true,
                msg: '异步请求加固js成功加载',
              })
            },
            () => {
              resolve({
                ok: true,
                msg: '加固js加载异常',
              })
            },
          )
        } else {
          resolve({
            ok: true,
            msg: '加固js开关配置为false不加载',
          })
        }
      })
    }
    return this.initParamsSignInstance
  }
  
  _handleInitJsToken() {
    if (!this.initJsTokenInstance) {
      this.initJsTokenInstance = new Promise((resolve) => {
        if (window?.getJsToken) {
          resolve({
            ok: true,
            msg: '指纹js已加载',
          })
        } else if (window?.PAGE_DATA?.asyncLoadMtkJs) {
          this._loadSingleJs(
            'mtkJs',
            () => {
              resolve({
                ok: true,
                msg: '异步请求指纹js成功加载',
              })
            },
            () => {
              resolve({
                ok: true,
                msg: '指纹js加载异常',
              })
            },
          )
        } else {
          resolve({
            ok: true,
            msg: '指纹js开关配置为false不加载',
          })
        }
      })
    }
    return this.initJsTokenInstance
  }