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

package/dist/common/index.jd.ts

@@ -1 +1 @@
-import Taro from '@tarojs/taro'
    floorVideInfo: {}, 
    productVideInfo: {}, 
    isJdShowNativeImmersivePlayer: false, 
    pageIdxHeightInfo: {
      list: []
    }, 
    jdBottomBarHeight: 0,
    jdNativeHeaderHeight: 0,
  shopInfo: {},
  openAppData: {} 
  public config: object 
    this.config = {}
  
  doLoginForJdPin(options = {}) {
    return this.doLogin(options)
  }
    return new Promise((resolve, reject) => {
      if (typeof jd !== 'undefined' && jd.requestWebCookie) {
        jd.requestWebCookie({
          needpin: 1, 
          success: (res) => {
            console.log(res)
            const { ticket, pt_pin } = res
            console.log('requestWebCookie.success', res)
            this.info.userInfo = {
              pin: pt_pin,
              encodePin: encodeURIComponent(pt_pin),
              ptkey: ticket,
            }
            this.miniAppLogInstance &&
            this.miniAppLogInstance.set({
              account: pt_pin,
            })
            this.info.loginState = true
            resolve(res)
          },
          fail(res) {
            console.log('requestWebCookie.fail', res)
           reject(res)
          },
        })
      } else {
        resolve({
          pin: '',
          ptkey: '',
          mock: true
        })
      }
    })
          this.checkLoginStatus().then(res => {
            console.log(
              'jdLoadCheckStatusAndLogin hasUserLogined.success: ',
              res,
            )
            resolve(res)
          }).catch(err => {
            console.warn(
              'jdLoadCheckStatusAndLogin hasUserLogined.fail: ',
              err,
            )
            this.toLogin().then(res => {
              resolve(res)
            }).catch(err => {
              reject(err)
            })
          })
    return this.checkStatusAndLoginPromise
    return new Promise((resolve,reject) => {
      if (typeof jd !== 'undefined' && jd.hasUserLogined) {
        jd.hasUserLogined({
          success: (res) => {
            console.log('hasUserLogined.success: ', res)
            if (res.status === 1) {
              this.getLoginCookie()
              resolve(res)
            }else {
              reject(res)
            }
          },
          fail: (res) => {
            console.warn('hasUserLogined.fail: ', res)
            reject(res)
          },
        })
      } else {
        reject(false)
      }
    })
  
  getAddressCachePromise = () => {
    return Promise.reject("该方法只在APP内适用")
+import Taro from '@tarojs/taro'
  WXAPP_LOGIN,
  WXAPP_BIZ,
  WXAPP_USER_INFO,
  WXAPP_NAVIGATOR,
  WXAPP_REPORT_GDT,
  WXAPP_PARAMS_SIGN,
  WXAPP_FINGER_REPORT,
  WXAPP_REPORT_MANAGE,
  BUSINESS_TYPE,
  SHOP_MENU_ID_TYPE,
  SHOP_MENU_ID_NAME,
  SECTION_HOME_TAB_NAME_TYPE,
  SECTION_HOME_TAB_TYPE,
  TaroEventType,
  WX_BUSINESS_TYPE,
  WXAPP_BIZ_KEY,
  getSystemInfos,
  getTaroStorageKeyValue,
  getWxAppCookieStr,
  objectToUrlEncode,
    floorVideInfo: {}, 
    productVideInfo: {}, 
      updateShopInfosAllState: false, 
    isJdShowNativeImmersivePlayer: false, 
    pageIdxHeightInfo: {
      list: []
    }, 
    originQueryInfo: {},
    jdBottomBarHeight: 0,
    jdNativeHeaderHeight: 0,
  shopInfo: {},
  openAppData: {} 
  public info: CommonInterFace.BaseConfigInfo
  public config: {
    [key: string]: any
  } 
  public lazyContainer: CommonInterFace.lazyContainer
  public rootEleNode: HTMLElement | null
  public miniApplogUtil: CommonInterFace.MiniApplogUtil
  public miniAppLogInstance: CommonInterFace.MiniAppLog | null
  public checkStatusAndLoginPromise: object | null
  public wxAppLoginInstance: CommonInterFace.WxAppLogin
  public wxAppBizInstance: CommonInterFace.WxAppUserInfo
  public wxAppUserInfoInstance: CommonInterFace.WxAppUserInfo
  public wxAppReportManageInstance: CommonInterFace.wxAppReportManage
  public wxAppReportGDTInstance: CommonInterFace.WxAppReportGDT
  public wxAppNavigatorInstance: CommonInterFace.WxAppNavigator
  public wxAppParamsSignInstance: CommonInterFace.wxAppParamsSign
  public wxAppFingerReportInstance: CommonInterFace.wxAppParamsSign
  public wxAppSubsGuider: CommonInterFace.wxAppParamsSign
  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.rootEleNode = null
    this.miniApplogUtil = MiniAppLogUtil
    this.miniAppLogInstance = null
    this.checkStatusAndLoginPromise = null
    this.wxAppLoginInstance = WXAPP_LOGIN
    this.wxAppBizInstance = WXAPP_BIZ
    this.wxAppUserInfoInstance = WXAPP_USER_INFO
    this.wxAppReportManageInstance = WXAPP_REPORT_MANAGE
    this.wxAppReportGDTInstance = WXAPP_REPORT_GDT
    this.wxAppNavigatorInstance = WXAPP_NAVIGATOR
    this.wxAppParamsSignInstance = WXAPP_PARAMS_SIGN
    this.wxAppFingerReportInstance = WXAPP_FINGER_REPORT ? new WXAPP_FINGER_REPORT() : {}
    this.wxAppSubsGuider = null
  }
  
  taskTimeoutPromise(callBack, timeout = 2000){
    return new Promise((resolve) => {
      setTimeout(() => {
        const getCallBackRes = typeof callBack === 'function' && callBack()
        return resolve(getCallBackRes || false)
      }, timeout)
    })
  }
  
  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 = this.getFullScreenHeight(info)
    const tabBarHeight = this.getTabBarHeight(info)
    const safeContentHeight = fullScreenHeight - headerHeight
    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, ''),
      )
    }
    console.log('获取系统信息', this.info.sysInfo)
    this.getNetWorkType()
  }
  
  getNetWorkType() {
    Taro.getNetworkType().then((getRes) => {
      getRes &&
      getRes.networkType &&
      (this.info.sysInfo['netWorkType'] = getRes.networkType)
    })
  }
  
  checkStatusAndLogin(options = {}) {
    this.checkStatusAndLoginPromise = new Promise((resolve, reject) => {
      console.log(
        '微信小程序登录状态及获取cookie状态的promise,之前登录状态',
        this.info.loginState,
      )
      this.toLogin(options)
        .then((res) => {
          console.log('微信小程序登录状态结果,成功', res)
          this.info.loginState = true
          resolve(res)
        })
        .catch((err) => {
          console.log('微信小程序登录异常状态结果', err)
          this.doLogin(options)
            .then((res2) => {
              console.log(
                '微信小程序wxDoLogin强制登陆成功：',
                res2,
              )
              this.info.loginState = true
              resolve(res2)
            })
            .catch((err2) => {
              console.log(
                '微信小程序wxDoLogin强制登陆失败：',
                err2,
              )
              this.checkStatusAndLoginPromise = null
              reject(err2)
            })
        })
    })
    return this.checkStatusAndLoginPromise
  }
  
  checkJdStatusAndLogin(options){
    return this.checkStatusAndLogin(options)
  }
  
  doLoginForJdPin(options = {}) {
    return this.doLogin(options)
  }
  
  toLogin(options = {}): Promise<any> {
    return this.wxAppLoginInstance
      .getLoginPromise({
        mode: 'silent',
        loginColor: {
          biz: WXAPP_BIZ_KEY,
          dpin: 0, 
        },
        ...options,
      })
      .then((res) => {
        console.log(
          '微信app登录返回信息,微信侧返回code为0表示成功',
          res,
        )
        setTimeout(() => {
          console.log("微信app登录返回成功后，后台会写入cookie，有延迟，这里延迟500ms去获取最新cookie")
          this.getLoginCookie(`${Date.now()}`)
        },500)
      })
      .catch((err) => {
        console.log('微信app登录异常返回信息，也获取cookie', err)
        this.getLoginCookie(`${Date.now()}`)
      })
  }
  
  doLogin(options) {
    console.log('触发松果小程序 doLogin() new new')
    return new Promise((resolve, reject) => {
        jd.login({
            success: (res) => {
                if (res.code) {
                    console.log("[common]松果小程序登录成功", res.code)
                    jd.redirectTo({
                        url: `/pages/shopx/pages/index/index?${objectToUrlEncode({
                                ...this.info.originQueryInfo
                            })}`
                    })
                    resolve(res)
                } else {
                    console.error("[common]松果小程序登录失败", res.errMsg)
                    reject()
                }
            },
            fail: (res) => {
                console.error("[common]松果小程序登录失败", res.errMsg)
                reject()
            }
        })
    })
  }
  
  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,
          })
        }
      }
    })
  }
  
  
  checkLoginStatus() {
    return this.getLoginCookie()
  }
  
  getAddressCachePromise = () => {
    return Promise.reject("该方法只在APP内适用")
  }
  
  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(
      'weapp===获取店铺下发查询参数\n',
      query,
      '\n获取店铺最后查询参数\n',
      this.info.queryInfo,
      '\n是否为更新店铺状态\n',
      updateShopInfoState
    )
  }

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
  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内适用")
  }
+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 = {}
  
  taskTimeoutPromise(callBack, timeout = 2000){
    return new Promise((resolve) => {
      setTimeout(() => {
        const getCallBackRes = typeof callBack === 'function' && callBack()
        return resolve(getCallBackRes || false)
      }, timeout)
    })
  }
  removeJdAndroidRquestEventForTouchStart(){}
  checkStatusAndLogin(options = {}) {
  
  checkJdStatusAndLogin(options){
    return this.checkStatusAndLogin(options)
  }
  
  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内适用")
  }