@conecli/cone-render 0.8.19-beta.0 → 0.8.19-beta.1

package/dist/jumpEventReport/index.h5.ts

@@ -1 +1 @@
-import { isApp, getUrlQuery } from '../utils/jm-common'
+import { isApp, getUrlQuery } from '../utils/jm-common'

package/dist/jumpEventReport/web.jdb.ts

@@ -0,0 +1 @@
+import { JdJumpJdApp } from './jdJumpJdApp'
  reportClick,
  reportToCart,
  routerInfo: {
    params: {},
  }, 
  nativeEvent: null, 
  jumpConfig: {
    venderId: null,
    shopId: null,
    sourceValue: '',
    sourceType: 'App-H5',
    activityType: 'shopx',
    moduleId: 'none', 
    entrance: 'none',
  },
  logPageParamStr: '',
  public logPageId: string
  public jumpConfig: JumpEventReportInterFace.JumpH5ReportConfig
  constructor(opt = {}) {
    console.log("jdb加载==========")
    super(opt)
    this.getConfig(opt)
  }
  
  jdJumpToProduct(skuParams, logEventInfo) {
    if(typeof skuParams !== 'object') {
      console.error('万商app跳转商品详情参数需要对象，详情请查看文档')
      return
    }
    
    let { skuId, bMallTag, skuUniformBizInfo } = skuParams
    skuId = skuId.toString().trim()
    this.jdNavigateToNative({
      category: 'jump',
      des: 'skudetail',
      param: {
        skuId: skuId,
        bMallTag: bMallTag,
        skuUniformBizInfo
      },
      logEventInfo,
    })
  }
  jdNavigateToNative(
    console.log("otherParams", otherParams)
    const paramsStr = JSON.stringify(otherParams)
    console.log(
      '跳转web jd open协议',
      `${url}?params=${paramsStr}`,
    )
          console.log('catch', e)
  clickEventLog(
  getConfig(opt = {}) {
    return Object.assign(this, {}, defaultConfig, opt)
  }

package/dist/open/api/index.ts

@@ -1 +1 @@
-import * as device from './device'
+import * as device from './device'

package/dist/service/IsvRequestServer.ts

@@ -0,0 +1 @@
+import Taro, { RequestTask } from '@tarojs/taro'
  SHOP_COLOR_APPID,
  JshopxColorFunctionIdList,
  PagesColorFunctionIdList,
  JSHOPX_COLOR_APPID,
  PAGES_COLOR_APPID,
  PAGES_DOMAIN,
  cookiesStr: '', 
  requestHeaderContentType: {
    jsonHeader: {
      'content-type': 'application/json;charset=utf-8',
    },
    formDataHeader: {
      'content-type': 'application/x-www-form-urlencoded',
    },
  },
  requestBaseParam: {
    data: null,
    header: {
      'content-type': 'application/json;charset=utf-8',
    },
  },
  timeOut: 7000,
  apiClientParams: {
    appid: SHOP_COLOR_APPID,
    clientVersion:
      isH5AndJdShopView && jdAppVersionStr !== '' ? jdAppVersionStr : '11.0.0',
    client: isH5AndJdShopView ? (isIosDevice ? 'apple' : 'android') : 'wh5',
    area: '1_72_2799_0', 
    uuid: UUID,
    loginType: "11", 
  },
  public addressFetchInfo: {
    reqState: boolean
    promiseInstance: null | Promise<any>
  }
  public getPromotionConfig: {
    projectId: null | string | number
    pageId: null | string | number
  }
  public resInfo: ServiceInterFace.HttpRequestInfo
  public api: ServiceInterFace.HttpApi
  public isPageDomain: boolean
  constructor(opt) {
    this._init()
    this.addressFetchInfo = {
      reqState: false,
      promiseInstance: null,
    }
    this.getPromotionConfig = {
      projectId: null,
      pageId: null,
    }
    this._userAreaUpdateListen()
    this.resInfo = this._getResConfig(opt)
    this.api = api
    this.isPageDomain = window.location.hostname === PAGES_DOMAIN
  }
  _init(): void {
    httpInterceptors.forEach((item) => {
      Taro.addInterceptor((chain) => item(chain))
    })
  }
  _getResConfig(opt = {}): ServiceInterFace.HttpRequestInfo {
    return Object.assign({}, DefaultConfig, opt)
  }
  
  _userAreaUpdateListen() {
    Taro.eventCenter.on(TaroEventType.USER_AREA_UPDATE, (area) => {
      this.updateApiClientParamsResInfo({
        area,
      })
    })
  }
  updateApiClientParamsResInfo(opt = {}) {
    this.resInfo.apiClientParams = {
      ...this.resInfo.apiClientParams,
      ...opt,
    }
  }
  
  _paramsSign(data) {
    return Promise.resolve(data)
  }
  
  checkFunctionIdToReturnAppId(functionId) {
    return JshopxColorFunctionIdList.includes(functionId)
      ? JSHOPX_COLOR_APPID
      : this.isPageDomain && PagesColorFunctionIdList.includes(functionId)
      ? PAGES_COLOR_APPID
      : SHOP_COLOR_APPID
  }
  
  apiReq(functionId: string, bodyParams = {}, clientParams = {}): Promise<any> {
    if (
      functionId === 'receiveShopCoupon' &&
      ((isH5 && window.isJingGouMiniViewState) || isWxMinAndWxapp)
    ) {
      clientParams = Object.assign(
        {},
        {
          loginType: '1',
          loginWQBiz: WXAPP_BIZ_KEY,
        },
        clientParams,
      )
    }
    const apiClientParams = Object.assign(
      {},
      this.resInfo.apiClientParams,
      clientParams,
    )
    const getReqData = {
      functionId: functionId,
      body: JSON.stringify(bodyParams),
      t: Date.now(),
      ...apiClientParams,
    }
    console.log(`apiReq:${this.api.apiFunc}`)
    return this.request(this.api.apiFunc, getReqData, {}, 'GET')
      .then((res: ServiceInterFace.RequestPromiseRes) => {
        const { statusCode, data } = res
        let changeRes: ServiceInterFace.RequestResponseFormatRes = {
          ok: true,
        }
        if (statusCode === 200 && data) {
          const resCode = Object.prototype.hasOwnProperty.call(res.data, 'code')
            ? Number(res.data.code)
            : -1
          const subCode = Object.prototype.hasOwnProperty.call(
            res.data,
            'subCode',
          )
            ? Number(res.data.subCode)
            : -1
          if (
            data.success === true ||
            data.isSuccess ||
            resCode === 0 ||
            resCode === 200 ||
            subCode === 0
          ) {
            changeRes = {
              result: Object.prototype.hasOwnProperty.call(data, 'result')
                ? data.result
                : Object.prototype.hasOwnProperty.call(data, 'data')
                ? data.data
                : data,
              code: data.code || 200,
              ok: true,
              source: data,
            }
            return changeRes
          } else {
            changeRes = {
              ...data,
              ok: false,
              statusCode: res.statusCode,
            }
            return changeRes
          }
        } else {
          changeRes = {
            ...data,
            ok: false,
            statusCode: res.statusCode,
          }
          return changeRes
        }
      })
      .catch((res) => {
        return {
          ...res,
          ok: false,
        } as ServiceInterFace.RequestResponseFormatRes
      })
  }
  
  request(
    url: string,
    data: string | object,
    otherOptions = {},
    method: keyof ServiceInterFace.Method = 'POST',
  ): RequestTask<any> {
    const header =
      method === 'POST'
        ? this.resInfo.requestHeaderContentType.formDataHeader
        : {}
    return Taro.request({
      ...this.resInfo.requestBaseParam,
      url,
      data,
      method,
      timeout: this.resInfo.timeOut,
      header,
      ...otherOptions,
    })
  }
  
  async receiveCoupon(param = {}, clientParams) {
    console.log(process.env.NODE_ENV)
    if(process.env.NODE_ENV === 'development'){
      return Promise.reject('本地环境不能领券')
    }
    return await this.apiReq(
      'receiveShopCoupon',
      {
        operation: '3',
        ...param,
      },
      clientParams,
    )
  }

package/dist/service/http/const.ts

@@ -0,0 +1 @@
+export const HttpStatus = {
  SUCCESS: 200,
  CREATED: 201,
  ACCEPTED: 202,
  CLIENT_ERROR: 400,
  AUTHENTICATE: 401,
  FORBIDDEN: 403,
  NOT_FOUND: 404,
  SERVER_ERROR: 500,
  BAD_GATEWAY: 502,
  SERVICE_UNAVAILABLE: 503,
  GATEWAY_TIMEOUT: 504
  [HttpStatus.NOT_FOUND]: "请求资源不存在",
  [HttpStatus.BAD_GATEWAY]: "服务端异常，请稍后重试",
  [HttpStatus.FORBIDDEN]: "没有权限访问",
  [HttpStatus.AUTHENTICATE]: "需要鉴权",
  [HttpStatus.SUCCESS]: "成功"
  "getPagePreview"
  "getShopHomeFloorInfo",
  "getShopCategory",
  "getShopNavigationCategory",
  "receiveShopCoupon",
  "getShopHomePromotionWebPage",
  "shopGuessYouLike",
  "addRemind",
  "cancelRemind",
  "getVipDetail",
  "shopDetail",
  "address_queryAddress",
  "shopMemberSprintJoinActivity",
  "shopMemberSprintReceivePrize"

package/dist/service/http/http.jd.ts

@@ -0,0 +1 @@
+import HttpBase from './http'
  constructor() {
    super()
  }
  
  request({url, timeout = 7000, ...otherOptions}): any {
    const requestTask = super.request({url, timeout, ...otherOptions})
    const requestTimeoutPromise =
    new Promise<ServiceInterFace.RequestPromiseRes>((resolve) => {
        setTimeout(() => {
            resolve({
                statusCode: 500,
                resTimeoutState: true,
                errMsg: 'request timeout',
            })
        }, timeout)
    })
    return Promise.race([requestTask, requestTimeoutPromise]).then(
        (res: ServiceInterFace.RequestPromiseRes) => {
            if (res && res.statusCode === 500 && res.resTimeoutState) {
                console.log('request 请求超时 url:' + url)
                requestTask.abort()
            }
            return res
        }
    )
  }

package/dist/service/http/http.ts

@@ -0,0 +1 @@
+import Taro, { RequestTask } from "@tarojs/taro";
  jsonHeader = "application/json;charset=utf-8",
  formDataHeader = "application/x-www-form-urlencoded"
  constructor() {
    this._init()
  }
  _init(): void {
    httpInterceptors.forEach((item) => {
      Taro.addInterceptor((chain) => item(chain))
    })
  }
  
  get(url: string, data: any = null, otherOptions = {}): Taro.RequestTask<any> {
    return this.request({url, data, method:"GET", ...otherOptions})
  }
  
  post(
    url: string,
    data: any = null,
    otherOptions = {}
  ): Taro.RequestTask<any> {
    return this.request({url, data, method:"POST", ...otherOptions})
  }
  
  request({url, method = "POST", timeout = 7000, ...otherOptions}): RequestTask<any> {
    const header = {
          "content-type": method === "POST" ? RequestHeaderContentType.formDataHeader : RequestHeaderContentType.jsonHeader
        }
    return Taro.request({
      url,
      method,
      timeout,
      header,
      credentials: 'include',
      ...otherOptions,
    })
  }

package/dist/service/http/httpInterceptors.jd.ts

@@ -0,0 +1 @@
+import Taro from '@tarojs/taro'

package/dist/service/http/httpInterceptors.ts

@@ -0,0 +1 @@
+import Taro from '@tarojs/taro'

package/dist/service/http/index.ts

@@ -0,0 +1 @@
+import Http from './http'

package/dist/utils/jm-common.js

@@ -1 +1 @@
-var splitOnFirst = function splitOnFirst(string, separator) {
  return Object.prototype.toString.call(obj);
  return typeof obj === 'function';
  return '[object Object]' === getType(obj);
  return '[object Array]' == getType(obj);
  return '[object Undefined]' === getType(obj);
  return '[object Null]' == getType(obj);
  return typeof obj === 'string';
  return typeof obj === 'boolean';
  return '[object Number]' === getType(num);
  ua = ua || navigator.userAgent;
  if (name === 'wx') return (/micromessenger/i.test(ua)
  );
  if (name === 'qq') return (/qq\//i.test(ua)
  );
  if (name === 'weibo') return (/weibo/i.test(ua)
  );
  if (name === 'jd') return (/^jdapp/i.test(ua)
  );
  if (name === 'jdlittle') return (/^jdltapp/i.test(ua)
  );
  if (name === 'mp') return navigator.userAgent.match(/micromessenger/i) && navigator.userAgent.match(/miniprogram/i) || window.__wxjs_environment === 'miniprogram';
  return false;
  ua = ua || navigator.userAgent;
  return (/android/i.test(ua) && !isIOS()
  );
  ua = ua || navigator.userAgent;
  return (/ip(hone|od)|ipad/i.test(ua)
  );
  ua = ua || navigator.userAgent;
  return (/ipad/i.test(ua) || /android/i.test(ua) && !/mobi|mini|fennec/i.test(ua)
  );
  ua = ua || navigator.userAgent;
  return !!ua.match(/ip(hone|od)|android.+mobile|windows (ce|phone)|blackberry|bb10|symbian|webos|firefox.+fennec|opera m(ob|in)i|polaris|iemobile|lgtelecom|nokia|sonyericsson|dolfin|uzard|natebrowser|ktf;|skt;/i);
  ua = ua || navigator.userAgent;
  return !!ua.match(/iphone/i);
  ua = ua || navigator.userAgent;
  return !!ua.match(/ipad/i);
  ua = ua || navigator.userAgent;
  if (name === 'xview') return typeof window.XView !== 'undefined';
  if (name === 'wk') return !!ua.match(/supportjdshwk/i) || window._is_jdsh_wkwebview == 1;
  return false;
  ua = ua || navigator.userAgent;
  var re = /nettype\/([\S]*)/i;
  if (isApp('jd', ua)) re = /network\/([^;]*)/i;
  return re.test(ua) ? RegExp.$1.toLowerCase() : 'unknown';
  ua = ua || navigator.userAgent;
  if (!isApp('jd', ua)) return null;
  return ua.split(';')[4];
  ua = ua || navigator.userAgent;
  if (appName === 'jd') return ua.split(';')[2] || null;
  if (appName === 'wx') return (/micromessenger\/([\S]*)/i.test(ua) ? RegExp.$1 : null
  );
  if (appName === 'qq') return (/qq\/([\S]*)/i.test(ua) ? RegExp.$1 : null
  );
  return null;
  ua = ua || navigator.userAgent;
  var match = ua.match(/android\s([0-9\.]*)/i);
  return match ? match[1] : 'unknown';
  ua = ua || navigator.userAgent;
  var match = ua.match(/OS ((\d+_?){2,3})\s/i);
  return match ? match[1].replace(/_/g, '.') : 'unknown';
+var splitOnFirst = function splitOnFirst(string, separator) {
  return Object.prototype.toString.call(obj);
  return typeof obj === 'function';
  return '[object Object]' === getType(obj);
  return '[object Array]' == getType(obj);
  return '[object Undefined]' === getType(obj);
  return '[object Null]' == getType(obj);
  return typeof obj === 'string';
  return typeof obj === 'boolean';
  return '[object Number]' === getType(num);
  ua = ua || navigator.userAgent;
  if (name === 'wx') return (/micromessenger/i.test(ua)
  );
  if (name === 'qq') return (/qq\//i.test(ua)
  );
  if (name === 'weibo') return (/weibo/i.test(ua)
  );
  if (name === 'jd') return (/^jdapp/i.test(ua)
  );
  if (name === 'jdlittle') return (/^jdltapp/i.test(ua)
  );
  if (name === 'mp') return navigator.userAgent.match(/micromessenger/i) && navigator.userAgent.match(/miniprogram/i) || window.__wxjs_environment === 'miniprogram';
  if (name === 'jdb') return (/JDBmall/i.test(ua)
  );
  return false;
  ua = ua || navigator.userAgent;
  return (/android/i.test(ua) && !isIOS()
  );
  ua = ua || navigator.userAgent;
  return (/ip(hone|od)|ipad/i.test(ua)
  );
  ua = ua || navigator.userAgent;
  return (/ipad/i.test(ua) || /android/i.test(ua) && !/mobi|mini|fennec/i.test(ua)
  );
  ua = ua || navigator.userAgent;
  return !!ua.match(/ip(hone|od)|android.+mobile|windows (ce|phone)|blackberry|bb10|symbian|webos|firefox.+fennec|opera m(ob|in)i|polaris|iemobile|lgtelecom|nokia|sonyericsson|dolfin|uzard|natebrowser|ktf;|skt;/i);
  ua = ua || navigator.userAgent;
  return !!ua.match(/iphone/i);
  ua = ua || navigator.userAgent;
  return !!ua.match(/ipad/i);
  ua = ua || navigator.userAgent;
  if (name === 'xview') return typeof window.XView !== 'undefined';
  if (name === 'wk') return !!ua.match(/supportjdshwk/i) || window._is_jdsh_wkwebview == 1;
  return false;
  ua = ua || navigator.userAgent;
  var re = /nettype\/([\S]*)/i;
  if (isApp('jd', ua)) re = /network\/([^;]*)/i;
  return re.test(ua) ? RegExp.$1.toLowerCase() : 'unknown';
  ua = ua || navigator.userAgent;
  if (!isApp('jd', ua)) return null;
  return ua.split(';')[4];
  ua = ua || navigator.userAgent;
  if (appName === 'jd') return ua.split(';')[2] || null;
  if (appName === 'wx') return (/micromessenger\/([\S]*)/i.test(ua) ? RegExp.$1 : null
  );
  if (appName === 'qq') return (/qq\/([\S]*)/i.test(ua) ? RegExp.$1 : null
  );
  return null;
  ua = ua || navigator.userAgent;
  var match = ua.match(/android\s([0-9\.]*)/i);
  return match ? match[1] : 'unknown';
  ua = ua || navigator.userAgent;
  var match = ua.match(/OS ((\d+_?){2,3})\s/i);
  return match ? match[1].replace(/_/g, '.') : 'unknown';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@conecli/cone-render",
-	"version": "0.8.19-beta.0",
+	"version": "0.8.19-beta.1",
 	"private": false,
 	"files": [
 		"dist/"