@conecli/cone-render 0.9.1-shop2.7 → 0.9.1-shop2.8

package/dist/common/index.ts

@@ -1 +1 @@
-import Taro from '@tarojs/taro'
    floorVideInfo: {}, 
    productVideInfo: {}, 
    isVipShop: false, 
    isJdShowNativeImmersivePlayer: false, 
    pageIdxHeightInfo: {
      list: []
    },
    jdBottomBarHeight: 0,
    jdNativeHeaderHeight: 0,
  openAppData: {} 
  public config: {
    [key: string]: any
  } 
  public lazyContainer: CommonInterFace.lazyContainer
    this.config = {}
  
  doLoginForJdPin(options = {}) {
    return this.doLogin(options)
  }
  
  getLoginCookie(updateKey = 'wxapp') {
    return new Promise((resolve) => {
      console.log("开始获取更新wxapp中的cookie信息", updateKey)
      if(this.config.wqCookie && this.config.wqCookieStr && this.config.getWqCookieKey === updateKey){
        console.log("已有存储wxapp中的cookie信息，直接返回",this.config)
        resolve({
          wqCookie: this.config.wqCookie,
          wqCookieStr: this.config.wqCookieStr,
        })
      }else {
        if (isPublishToWxapp) {
          const getWxappCookieObj = getTaroStorageKeyValue('cookies') || null
          if (getWxappCookieObj) {
            const getCookieObj = getWxappCookieObj['_data']
            const { wqCookie, wqCookieStr } = getWxAppCookieStr(getCookieObj)
            const { pin = '', visitkey = '-1', wq_unionid = '', wxapp_openid = '' } = wqCookie
            this.info.loginState = true
            this.info.userInfo.wqCookie = wqCookieStr
            this.info.userInfo.wqVisitkey = visitkey
            console.log('获取用户完整cookie信息', getCookieObj)
            const getUserAddress = this.wxAppUserInfoInstance.getAddress()
            console.log('获取微信用户地址信息', getUserAddress)
            if (getUserAddress) {
              this.info.pageInfo.address = getUserAddress?.areaId
              this.info.pageInfo.addressCommaStr = this.info.pageInfo
                .address
                ? this.info.pageInfo.address.replace(/_/g, ',')
                : ''
              this.info.pageInfo.un_area = this.info.pageInfo.address
              Taro.eventCenter.trigger(
                TaroEventType.USER_AREA_UPDATE,
                this.info.pageInfo.address,
              )
            }
            if(this.miniAppLogInstance){
              this.miniAppLogInstance.set({
                account: pin,
                unionid: wq_unionid,
                openid: wxapp_openid,
              })
            }
            this.config.wqCookie = wqCookie
            this.config.wqCookieStr = wqCookieStr
            this.config.getWqCookieKey = updateKey
            console.log("解析wxapp中的cookie信息成功，返回后存储",this.config)
            resolve({
              wqCookie,
              wqCookieStr,
            })
          }else {
            console.log("解析wxapp中的cookie信息异常，返回异常结果",this.config)
            resolve({
              wqCookie: false,
              wqCookieStr: false,
            })
          }
        }else {
          resolve({
            wqCookie: false,
            wqCookieStr: false,
          })
        }
      }
    })
  }
    return this.getLoginCookie()
  
  getAddressCachePromise = () => {
    return Promise.reject("该方法只在APP内适用")
  }
+import Taro from '@tarojs/taro'
    floorVideInfo: {}, 
    productVideInfo: {}, 
    isVipShop: false, 
    isJdShowNativeImmersivePlayer: false, 
    pageIdxHeightInfo: {
      list: []
    },
    jdBottomBarHeight: 0,
    jdNativeHeaderHeight: 0,
  openAppData: {} 
  public config: {
    [key: string]: any
  } 
  public lazyContainer: CommonInterFace.lazyContainer
  public renderedIsvComponents: CommonInterFace.renderedIsvComponents
    this.config = {}
    this.renderedIsvComponents = {}
  removeJdAndroidRquestEventForTouchStart(){}
  
  doLoginForJdPin(options = {}) {
    return this.doLogin(options)
  }
  
  getLoginCookie(updateKey = 'wxapp') {
    return new Promise((resolve) => {
      console.log("开始获取更新wxapp中的cookie信息", updateKey)
      if(this.config.wqCookie && this.config.wqCookieStr && this.config.getWqCookieKey === updateKey){
        console.log("已有存储wxapp中的cookie信息，直接返回",this.config)
        resolve({
          wqCookie: this.config.wqCookie,
          wqCookieStr: this.config.wqCookieStr,
        })
      }else {
        if (isPublishToWxapp) {
          const getWxappCookieObj = getTaroStorageKeyValue('cookies') || null
          if (getWxappCookieObj) {
            const getCookieObj = getWxappCookieObj['_data']
            const { wqCookie, wqCookieStr } = getWxAppCookieStr(getCookieObj)
            const { pin = '', visitkey = '-1', wq_unionid = '', wxapp_openid = '' } = wqCookie
            this.info.loginState = true
            this.info.userInfo.wqCookie = wqCookieStr
            this.info.userInfo.wqVisitkey = visitkey
            console.log('获取用户完整cookie信息', getCookieObj)
            const getUserAddress = this.wxAppUserInfoInstance.getAddress()
            console.log('获取微信用户地址信息', getUserAddress)
            if (getUserAddress) {
              this.info.pageInfo.address = getUserAddress?.areaId
              this.info.pageInfo.addressCommaStr = this.info.pageInfo
                .address
                ? this.info.pageInfo.address.replace(/_/g, ',')
                : ''
              this.info.pageInfo.un_area = this.info.pageInfo.address
              Taro.eventCenter.trigger(
                TaroEventType.USER_AREA_UPDATE,
                this.info.pageInfo.address,
              )
            }
            if(this.miniAppLogInstance){
              this.miniAppLogInstance.set({
                account: pin,
                unionid: wq_unionid,
                openid: wxapp_openid,
              })
            }
            this.config.wqCookie = wqCookie
            this.config.wqCookieStr = wqCookieStr
            this.config.getWqCookieKey = updateKey
            console.log("解析wxapp中的cookie信息成功，返回后存储",this.config)
            resolve({
              wqCookie,
              wqCookieStr,
            })
          }else {
            console.log("解析wxapp中的cookie信息异常，返回异常结果",this.config)
            resolve({
              wqCookie: false,
              wqCookieStr: false,
            })
          }
        }else {
          resolve({
            wqCookie: false,
            wqCookieStr: false,
          })
        }
      }
    })
  }
    return this.getLoginCookie()
  
  getAddressCachePromise = () => {
    return Promise.reject("该方法只在APP内适用")
  }

package/dist/common/token/token.ts

@@ -1 +1 @@
-import global from '../../common'
  return window?.page_data?.pageChannel || ''
  return new Promise((resolve) => {
    const channel = getPageChannel()
    if (
      channel === PageChannel.TYPE_ISVDEV ||
      channel === PageChannel.TYPE_ISV_PACK_SAMPLE
    ) {
      getIsvToken().then((token) => {
        console.log('isLogin token：' + token)
        if (token) {
          resolve(true)
        } else {
          resolve(false)
        }
      })
    } else {
      global.checkLoginStatus().then(res => {
        resolve(res)
      }).catch(() => {
        resolve(false)
      })
    }
  })
  let token = ''
  const result: any = await getIsvTokenInner()
  if (!result.success) {
    const channel = getPageChannel()
    if (channel === PageChannel.TYPE_ISV_PACK_SAMPLE) {
      console.log('getIsvToken打包校验中获取token失败')
      if (window['isvTokenFailCallback']) {
        window['isvTokenFailCallback'](result.error)
        console.log('浏览器中调用isvTokenFailCallback结束')
      }
    }
  } else {
    token = result.data
  }
  return token
  return new Promise((resolve) => {
    fetchGateway(
      'isvObfuscator',
      {
        url: window.location.href,
        id: 'shopisv',
      },
      {},
    )
      .then((data: any) => {
        console.log('fetchGateway isvObfuscator data:' + JSON.stringify(data))
        if (
          data?.statusCode == 200 &&
          data?.data?.errcode === 0 &&
          data?.data?.token
        ) {
          resolve({
            success: true,
            data: data?.data?.token,
          })
        } else {
          resolve({
            success: false,
            error: data,
          })
        }
      })
      .catch((error: { message: any }) => {
        console.log('fetchGateway isvObfuscator error:' + error.message)
        resolve({
          success: false,
          error,
        })
      })
  })
  const defaultParams = {
    appid: '100',
    returnurl: window.location.href,
  }
  const params = Object.assign({}, defaultParams, options)
  params.returnurl = encodeURIComponent(params.returnurl)
  const loginUrl = `${domain.mobileLogin}/user/login.action?${serialize(
    params,
  )}`
  console.log('loginUrl:', loginUrl)
  window.location.href = loginUrl
+import global from '../../common'
  return window?.page_data?.pageChannel || ''
  return new Promise((resolve) => {
    const channel = getPageChannel()
    if (
      channel === PageChannel.TYPE_ISVDEV ||
      channel === PageChannel.TYPE_ISV_PACK_SAMPLE
    ) {
      getIsvToken().then((token) => {
        console.log('isLogin token：' + token)
        if (token) {
          resolve(true)
        } else {
          resolve(false)
        }
      })
    } else {
      global.checkLoginStatus().then(res => {
        resolve(res)
      }).catch(() => {
        resolve(false)
      })
    }
  })
  let token = ''
  const result: any = await getIsvTokenInner()
  if (!result.success) {
    const channel = getPageChannel()
    if (channel === PageChannel.TYPE_ISV_PACK_SAMPLE) {
      console.log('getIsvToken打包校验中获取token失败')
      if (window['isvTokenFailCallback']) {
        window['isvTokenFailCallback'](result.error)
        console.log('浏览器中调用isvTokenFailCallback结束')
      }
    }
  } else {
    token = result.data
  }
  return token
  return new Promise((resolve) => {
    fetchGateway(
      'isvObfuscator',
      {
        url: window.location.href,
        id: 'shopisv',
      },
      {},
    )
      .then((data: any) => {
        console.log('fetchGateway isvObfuscator data:' + JSON.stringify(data))
        if (
          data?.statusCode == 200 &&
          data?.data?.errcode === 0 &&
          data?.data?.token
        ) {
          resolve({
            success: true,
            data: data?.data?.token,
          })
        } else {
          resolve({
            success: false,
            error: data,
          })
        }
      })
      .catch((error: { message: any }) => {
        console.log('fetchGateway isvObfuscator error:' + error.message)
        resolve({
          success: false,
          error,
        })
      })
  })
  const defaultParams = {
    appid: '100',
    returnurl: window.location.href,
  }
  const params = Object.assign({}, defaultParams, options)
  params.returnurl = encodeURIComponent(params.returnurl)
  const loginUrl = `${domain.mobileLogin}/user/login.action?${serialize(
    params,
  )}`
  console.log('loginUrl:', loginUrl)
  window.location.href = loginUrl

package/dist/components/base/CountDown/index.tsx

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