@conecli/cone-render 0.8.38 → 0.8.39

package/dist/common/index.ts

@@ -1 +1 @@
-import Taro from '@tarojs/taro'
  public config: {
    [key: string]: any
  } 
  public lazyContainer: CommonInterFace.lazyContainer
    this.config = {}
  
  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()
+import Taro from '@tarojs/taro'
    floorVideInfo: {}, 
  public config: {
    [key: string]: any
  } 
  public lazyContainer: CommonInterFace.lazyContainer
    this.config = {}
  
  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/index.weapp.ts

@@ -1 +1 @@
-import Taro from '@tarojs/taro'
  public config: {
    [key: string]: any
  } 
    this.config = {}
        console.log('=================>', 'updateBusinessDomainAndApi')
  
        setTimeout(() => {
          console.log("微信app登录返回成功后，后台会写入cookie，有延迟，这里延迟500ms去获取最新cookie")
          this.getLoginCookie(`${Date.now()}`)
        },500)
        this.getLoginCookie(`${Date.now()}`)
      setTimeout(() => {
        console.log("微信强制登录后，后台会写入cookie，有延迟，这里延迟500ms去获取最新cookie")
        this.getLoginCookie(`${Date.now()}`)
      },500)
    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,
          })
        }
      }
    })
+import Taro from '@tarojs/taro'
  WXAPP_SUBS_GUIDER
    floorVideInfo: {}, 
  public config: {
    [key: string]: any
  } 
    this.config = {}
    this.wxAppSubsGuider = WXAPP_SUBS_GUIDER
        console.log('=================>', 'updateBusinessDomainAndApi')
  
        setTimeout(() => {
          console.log("微信app登录返回成功后，后台会写入cookie，有延迟，这里延迟500ms去获取最新cookie")
          this.getLoginCookie(`${Date.now()}`)
        },500)
        this.getLoginCookie(`${Date.now()}`)
      setTimeout(() => {
        console.log("微信强制登录后，后台会写入cookie，有延迟，这里延迟500ms去获取最新cookie")
        this.getLoginCookie(`${Date.now()}`)
      },500)
    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,
          })
        }
      }
    })
  
  getAddressCachePromise = () => {
    return Promise.reject("该方法只在APP内适用")
  }

package/dist/common/jssdk.ts

@@ -0,0 +1 @@
+import ready from '../utils/ready'
  return new Promise((resolve, reject) => {
    ready('jmfe', timeout)
      .then(() => {
        registerCode(JSSDK_APP_WEBVIEW_CODE)
        resolve(window['jmfe'])
      })
      .catch(() => {
        console.log('window.jmfe不存在')
        reject(null)
      })
  })
  if (window['jmfe']) {
    console.log('registerCode:', code)
    window['jmfe'].registerCode(code)
  } else {
    console.warn('jmfe对象不存在，可能没有提前引入jd-jssdk.js')
  }

package/dist/common/pageType.ts

@@ -0,0 +1 @@
+export const getPageType = () => {
  return process.env.BUILD_TYPE || ''
  
  M_DECORATE = 'm-decorate', 
  M_RENDER_MODULE = 'm-render-module', 
  M_PREVIEW = 'm-preview', 
  M_ISV_PREVIEW = 'm-isv-preview', 
  MARKETING_PREVIEW = 'marketing-preview', 
  
  APP_VIEW = 'app-view', 
  APP_MEMBER = 'app-member', 
  APP_INTRODUCE = 'app-introduce', 
  APP_PROMOTION = 'app-promotion', 
  APP_CLASSIFY = 'app-classify', 
  APP_PRODUCT = 'app-product', 
  
  
  PC_VIEW = 'pc-view', 
  PC_VIEW1 = 'pc-view1', 
  PC_VIEW2 = 'pc-view2', 
  M_VIEW = 'm-view', 
  M_BSC_VIEW = 'm-bsc-view', 
  SALE_VIEW = 'sale-view', 
  VIP_VIEW = 'vip-view', 
  M_SEARCH = 'm-search', 
  M_INTRODUCE = 'm-introduce', 
  
  MEMBER_SHOPCARD = 'member-shopcard', 
  M_MEMBER = 'm-member', 
  M_MEMBER_SAM_BIND_CARD = 'm-member-sam-bind-card', 
  M_MEMBER_WATSONS_BIND_CARD = 'm-member-watsons-bind-card', 
  M_SAM_CARD = 'm-sam-card', 
  M_SAM_CENTER = 'm-sam-center', 
  M_WATSONS_CARD = 'm-watsons-card', 
  
  M_LOTTERY = 'm-lottery', 
  M_COUPON = 'm-coupon', 
  M_WARES = 'm-wares', 
  M_FAST_SHOPPING = 'm-fast-shopping', 
  M_SPECIAL_SECKILL = 'm-special-seckill', 
  WEAPP_SHOP = 'weapp-shop', 
  WEAPP_PROMOTION = 'weapp-promotion', 
  M_VIDEOS = 'm-videos', 

package/dist/common/token/index.h5.ts

@@ -1 +1 @@
-import { isApp } from '../../utils/jm-common'
  return new Promise((resolve, reject) => {
    let platform: string = getPlatform()
    if (platform === TokenPlatform.TYPE_JDAPP) {
      ready('jmfe', 3000)
        .then(() => {
          console.log('window.jmfe已经存在：', jmfe)
          import('./token.jd')
            .then((data) => {
              console.log('data:', data)
              resolve(data)
            })
            .catch((err) => {
              reject(err)
            })
        })
        .catch((e) => {
          console.log('window.jmfe不存在')
          reject(e)
        })
    }
    else if (platform === TokenPlatform.TYPE_WQ) {
      import('./token.wxapp')
        .then((data) => {
          console.log('data:', data)
          resolve(data)
        })
        .catch((err) => {
          reject(err)
        })
    } else {
      import('./token')
        .then((data) => {
          console.log('data:', data)
          resolve(data)
        })
        .catch((err) => {
          reject(err)
        })
    }
  })
  console.log(e);
  return {}
  return new Promise((resolve) => {
    loadTokenPromise
      .then((proxy: any) => {
        if (proxy?.isLogin) {
          proxy?.isLogin().then((data: boolean) => {
            resolve(data)
          })
        } else {
          resolve(false)
        }
      })
      .catch((err) => {
        resolve(false)
      })
  })
  return new Promise((resolve) => {
    loadTokenPromise
      .then((proxy: any) => {
        if (proxy?.getIsvToken) {
          proxy?.getIsvToken().then((data: string) => {
            resolve(data)
          })
        } else {
          resolve('')
        }
      })
      .catch((err) => {
        resolve('')
      })
  })
  return new Promise((resolve) => {
    loadTokenPromise
      .then((proxy: any) => {
        if (proxy?.toLogin) {
          proxy?.toLogin(options)
          resolve(true)
        } else {
          resolve(false)
        }
      })
      .catch((err) => {
        resolve(false)
      })
  })
  let platform = TokenPlatform.TYPE_M
  if (isApp('jd')) {
    platform = TokenPlatform.TYPE_JDAPP
  }
  else if (isApp('wx') && isApp('mp')) {
    platform = TokenPlatform.TYPE_WQ
  }
  return platform
  let platform = getPlatform()
  let source = platform
  if (platform === TokenPlatform.TYPE_M || platform === TokenPlatform.TYPE_WQ) {
    source = TokenPlatform.TYPE_JDAPP
  }
  return source
  return window?.page_data?.pageChannel || ''
+import { isApp } from '../../utils/jm-common'
  return new Promise((resolve, reject) => {
    let platform: string = getPlatform()
    if (platform === TokenPlatform.TYPE_JDAPP) {
      ready('jmfe', 3000)
        .then(() => {
          console.log('window.jmfe已经存在：', window['jmfe'])
          import('./token.jd')
            .then((data) => {
              console.log('data:', data)
              resolve(data)
            })
            .catch((err) => {
              reject(err)
            })
        })
        .catch((e) => {
          console.log('window.jmfe不存在')
          reject(e)
        })
    }
    else if (platform === TokenPlatform.TYPE_WQ) {
      import('./token.wxapp')
        .then((data) => {
          console.log('data:', data)
          resolve(data)
        })
        .catch((err) => {
          reject(err)
        })
    } else {
      import('./token')
        .then((data) => {
          console.log('data:', data)
          resolve(data)
        })
        .catch((err) => {
          reject(err)
        })
    }
  })
  console.log(e)
  return {}
  return new Promise((resolve) => {
    loadTokenPromise
      .then((proxy: any) => {
        if (proxy?.isLogin) {
          proxy?.isLogin().then((data: boolean) => {
            resolve(data)
          })
        } else {
          resolve(false)
        }
      })
      .catch((err) => {
        resolve(false)
      })
  })
  return new Promise((resolve) => {
    loadTokenPromise
      .then((proxy: any) => {
        if (proxy?.getIsvToken) {
          proxy?.getIsvToken().then((data: string) => {
            resolve(data)
          })
        } else {
          resolve('')
        }
      })
      .catch((err) => {
        resolve('')
      })
  })
  return new Promise((resolve) => {
    loadTokenPromise
      .then((proxy: any) => {
        if (proxy?.toLogin) {
          proxy?.toLogin(options)
          resolve(true)
        } else {
          resolve(false)
        }
      })
      .catch((err) => {
        resolve(false)
      })
  })
  let platform = TokenPlatform.TYPE_M
  if (isApp('jd')) {
    platform = TokenPlatform.TYPE_JDAPP
  }
  else if (isApp('wx') && isApp('mp')) {
    platform = TokenPlatform.TYPE_WQ
  }
  return platform
  let platform = getPlatform()
  let source = platform
  if (platform === TokenPlatform.TYPE_M || platform === TokenPlatform.TYPE_WQ) {
    source = TokenPlatform.TYPE_JDAPP
  }
  return source
  return window?.page_data?.pageChannel || ''

package/dist/common/token/token.jd.ts

@@ -1 +1 @@
-console.log('load token.jd')
  return new Promise((resolve) => {
    if (jmfe) {
      jmfe.isJDAppLogin().then(({ data }) => {
        if (data === '1') {
          resolve(true)
        } else if (data === '0') {
          resolve(false)
        }
      })
    } else {
      console.warn('jmfe对象不存在，可能没有提前动态引入jd-jssdk.js')
      resolve(false)
    }
  })
  return requestIsvToken(window.location.href)
  if (jmfe) {
    jmfe.toLogin(options)
  } else {
    console.warn('jmfe对象不存在，可能没有提前动态引入jd-jssdk.js')
  }
  if (jmfe) {
    console.log('registerCode:', code)
    jmfe.registerCode(code)
  } else {
    console.warn('jmfe对象不存在，可能没有提前引入jd-jssdk.js')
  }
  return new Promise((resolve) => {
    console.log('requestIsvToken:', url)
    if (jmfe) {
      jmfe
        .requestIsvToken(url)
        .then((result: any) => {
          console.log('requestIsvToken result:' + JSON.stringify(result))
          const { status, data, msg } = result
          if (status === '0') {
            resolve(data || '')
          } else {
            resolve('')
          }
        })
        .catch((e: any) => {
          console.log('requestIsvToken error:' + JSON.stringify(e))
          resolve('')
        })
    } else {
      console.warn('jmfe对象不存在，可能没有提前引入jd-jssdk.js')
      resolve('')
    }
  })
+console.log('load token.jd')
  return new Promise((resolve) => {
    if (window['jmfe']) {
      window['jmfe'].isJDAppLogin().then(({ data }) => {
        if (data === '1') {
          resolve(true)
        } else if (data === '0') {
          resolve(false)
        }
      })
    } else {
      console.warn('jmfe对象不存在，可能没有提前动态引入jd-jssdk.js')
      resolve(false)
    }
  })
  return requestIsvToken(window.location.href)
  if (window['jmfe']) {
    window['jmfe'].toLogin(options)
  } else {
    console.warn('jmfe对象不存在，可能没有提前动态引入jd-jssdk.js')
  }
  if (window['jmfe']) {
    console.log('registerCode:', code)
    window['jmfe'].registerCode(code)
  } else {
    console.warn('jmfe对象不存在，可能没有提前引入jd-jssdk.js')
  }
  return new Promise((resolve) => {
    console.log('requestIsvToken:', url)
    if (window['jmfe']) {
      window['jmfe']
        .requestIsvToken(url)
        .then((result: any) => {
          console.log('requestIsvToken result:' + JSON.stringify(result))
          const { status, data, msg } = result
          if (status === '0') {
            resolve(data || '')
          } else {
            resolve('')
          }
        })
        .catch((e: any) => {
          console.log('requestIsvToken error:' + JSON.stringify(e))
          resolve('')
        })
    } else {
      console.warn('jmfe对象不存在，可能没有提前引入jd-jssdk.js')
      resolve('')
    }
  })

package/dist/common/wxappApi.ts

@@ -1 +1 @@
-import * as WXAPP_LOGIN from '../wxapp/common/login/login.js'
+import * as WXAPP_LOGIN from '../wxapp/common/login/login.js'