@conecli/cone-render 0.8.38 → 0.8.39

package/dist/common/index.h5.ts

@@ -1 +1 @@
-import Taro from '@tarojs/taro'
    urlCookie
  public config: {
    [key: string]: any
  } 
  public lazyContainer: CommonInterFace.lazyContainer
    this.config = {}
      pin: cookie.get('pin') || ''
    })
    if(!this.checkStatusAndLoginPromise){
      this.checkStatusAndLoginPromise = new Promise(async (resolve, reject) => {
       try {
         const getLoginState = await this.doCheckLoginStateAndForApiCheck()
         if(getLoginState){
           resolve(true)
         }else {
           this.toLogin(options)
           reject(false)
         }
       }catch (e) {
         this.toLogin(options)
         reject(false)
       }
      })
      return this.checkStatusAndLoginPromise
    }else {
      return this.checkStatusAndLoginPromise.then(() => {
        return Promise.resolve(true)
      }).catch (() => {
        this.toLogin(options)
        return Promise.reject(true)
      })
    }
   
  doCheckLoginStateAndForApiCheck() {
    if(this.info.loginState){
      return Promise.resolve(true)
    }else {
      return new Promise((resolve, reject) => {
        if(this.info.isJingGouMiniViewState){
          const getWqAuthToken = cookie.get("wq_auth_token")
          if(getWqAuthToken){
            this.info.loginState = true
            resolve(true)
          }else {
            reject(false)
          }
        }else{
          Taro.request({
            url: api.isLogin,
            jsonp:true,
            timeout: 3000,
            success: (res) => {
              const {statusCode,data} = res
              if (statusCode === 200 && data?.islogin && Number(data.islogin) === 1) {
                this.info.loginState = true
                resolve(true);
              } else {
                reject(false)
              }
            },
            fail:(err) => {
              console.log("登录检查异常", err)
              reject(false)
            }
          })
        }
      })
    }
  }
  
      try {
        const getLoginState = await this.doCheckLoginStateAndForApiCheck()
        if(getLoginState){
          const { pin } = await this.getLoginCookie();
          this.info.userInfo = {
            pin,
            encodePin: encodeURIComponent(pin),
            ptkey: '',
          }
          resolve(true)
        }else {
          reject(false)
        }
      }catch (e) {
        reject(false)
      }
    })
    if(un_area && un_area.length > 0){
      this.info.pageInfo.address = un_area
      this.info.pageInfo.un_area = un_area
      this.info.pageInfo.addressCommaStr = un_area.replace(/_/g, ',')
    }
+import Taro from '@tarojs/taro'
  isJdApp,
  jdAppVersion,
  jdAppVersionStr,
  isString,
  isObject,
  serialize,
  urlCookie,
  BUSINESS_TYPE,
  SECTION_HOME_TAB_TYPE,
  SECTION_HOME_TAB_NAME_TYPE,
  WXAPP_BIZ_KEY,
  WX_BUSINESS_TYPE,
  const designWidth = 750
  return (
    Math.ceil(
      (((parseInt(String(size), 10) / 40) * 750) / designWidth) * 10000,
    ) /
      10000 +
    'rem'
  )
  loginState: false, 
  cookiesStr: '', 
  userInfo: userPinKey,
  isJingGouMiniViewState: false, 
  pageInfo: {
    wxBusinessType: WX_BUSINESS_TYPE.NO,
    address: '', 
    addressCommaStr: '', 
    un_area: '', 
    vapptype: '1', 
    pageType: 'home', 
    isExposureState: false, 
    moduleId: '',
    entrance: '',
    dataType: BUSINESS_TYPE.ONLINE, 
    floorExposureInfo: {}, 
    floorVideInfo: {}, 
    tabsLoadAllDataInfo: {
      [SECTION_HOME_TAB_NAME_TYPE[SECTION_HOME_TAB_TYPE.HOME_WELL_CHOSEN]]:
        false,
    }, 
    updateShopInfosAllState: false, 
    isVipShop: false, 
    ...shopConfig,
    pageScrollTop: 0, 
    shopNavBarHeight: 0, 
  },
  defaultQueryLogInfo: {
    sourceType: 'JDshop',
    sourceValue: '',
    moduleId: 'none', 
    entrance: 'none',
  },
  sysInfo: {
    windowWidth: isPc ? 375 : 0,
    containerWidth: isPc ? 375 : 0,
    windowHeight: 0,
    netWorkType: '4g',
  },
  queryInfo: {},
  shopInfo: {},
  public info: CommonInterFace.BaseConfigInfo
  public config: {
    [key: string]: any
  } 
  public lazyContainer: CommonInterFace.lazyContainer
  public renderedIsvComponents: CommonInterFace.renderedIsvComponents
  public rootEleNode: HTMLElement | null
  public checkStatusAndLoginPromise: object | null
  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.renderedIsvComponents = {}
    this.rootEleNode = document.querySelector('body')
    this.checkStatusAndLoginPromise = null
  }
  _getConfig(opt) {
    return Object.assign({}, DefaultConfig, opt)
  }
  
  updateBusinessDomainAndApi(domain, api) {
  }
  
  getSystemInfo() {
    const info: UtilsInterFace.taroGetSystemInfoSyncRes = isPc
      ? {}
      : getSystemInfos()
    this.info.sysInfo = {
      actualNavBarHeight: 0,
      ...this.info.sysInfo,
      ...info,
      safeContentHeight: info.screenHeight, 
      headerHeight: 0, 
      tabBarHeight: 0, 
    }
    if (isJdApp) {
      this.info.sysInfo['hostVersionName'] = jdAppVersionStr
      this.info.sysInfo['hostAppVersion'] = jdAppVersion
      this.getAddressCachePromise()
    }
    this.getNetWorkType()
  }
  
  getNetWorkType() {
    Taro.getNetworkType().then((getRes) => {
      getRes &&
        getRes.networkType &&
        (this.info.sysInfo['netWorkType'] = getRes.networkType)
    })
  }
  registerCode(code: string) {
    if (window?.jmfe) {
      console.log('registerCode:', code)
      window.jmfe.registerCode(code)
    } else {
      console.warn('jmfe对象不存在，可能没有提前引入jd-jssdk.js')
    }
  }
  getCacheAddressRouter() {
    if (!window.jmfe) return
    if (isAndroidDevice) {
      return window.jmfe.callRouter({
        jdRouter: '1', 
        routerURL: 'router://JDAddressModule/getCacheAddress',
        routerParam: { sceneId: 'basicShoppingProcess' },
      })
    } else {
      return window.jmfe.callRouter({
        jdRouter: '1', 
        routerURL: 'router://JDBAddressCacheManagerModule/getCacheAddress',
        routerParam: { sceneId: 'basicShoppingProcess' },
      })
    }
  }
  
  getAddressCachePromise() {
    return new Promise((resolve, reject) => {
      if (
        this?.info?.sysInfo?.lat &&
        this?.info?.sysInfo?.lng &&
        this?.info?.sysInfo?.area
      ) {
        resolve({
          lat: this.info.sysInfo.lat,
          lng: this.info.sysInfo.lng,
          area: this?.info?.sysInfo?.area,
        })
      } else {
        ready('jmfe', 3000)
          .then(() => {
            this.registerCode(JSSDK_APP_WEBVIEW_CODE)
            this.getCacheAddressRouter()
              .then(({ status, data }) => {
                if (status === '0' && data) {
                  let area = '',
                    lat = this?.info?.sysInfo?.lat || '',
                    lng = this?.info?.sysInfo?.lng || ''
                  if (
                    (data?.lat || data?.latitude) &&
                    (data?.lng || data?.longitude)
                  ) {
                    lat =  data.lat || data.latitude
                    lng =  data.lng || data.longitude
                    this.info.sysInfo['lat'] = lat
                    this.info.sysInfo['lng'] = lng
                  }
                  if (data.provinceId) {
                    area = `${data.provinceId}_${data.cityId || 0}_${
                      data.countyId || 0
                    }_${data.townId || 0}`
                    this.info.pageInfo['address'] = area
                    this.info.pageInfo['addressCommaStr'] = area.replace(
                      /_/g,
                      ',',
                    )
                  }
                  resolve({
                    lat: lat,
                    lng: lng,
                    area: area,
                  })
                } else {
                  resolve({ lat: '', lng: '', area: '' })
                }
              })
              .catch(() => {
                reject(null)
              })
          })
          .catch(() => {
            console.log('window.jmfe不存在')
            reject(null)
          })
      }
    })
  }
  
  toLogin(options) {
    return this.info.isJingGouMiniViewState
      ? this.toWxAppLogin(options)
      : this.toWebLogin(options)
  }
  
  doLogin(options) {
    return this.toLogin(options)
  }
  
  toWebLogin(options) {
    let params: {
      returnurl: string
    } = {
      returnurl: '',
    }
    const loginUrl = isPc
      ? `//passport.jd.com/new/login.aspx`
      : `${domain.mobileLogin}/user/login.action`
    const defaultParams = {
      appid: '100',
      returnurl: window.location.href,
    }
    if (isString(options)) {
      params = Object.assign({}, defaultParams, {
        returnurl: options,
      })
    } else if (isObject(options)) {
      params = Object.assign({}, defaultParams, options)
    } else {
      params = defaultParams
    }
    params.returnurl = encodeURIComponent(params.returnurl)
    let getFullUrl = loginUrl + '?' + serialize(params)
    if (isPc) {
      getFullUrl = getFullUrl.replace(/returnurl/, 'ReturnUrl')
    }
    return Promise.resolve({
      h5ToUrl: true,
      url: getFullUrl,
    }).then(() => {
      window.location.href = getFullUrl
    })
  }
  
  toWxAppLogin(options) {
    console.log('微信京购小程序中h5登录跳转', options)
    return Promise.resolve(true).then(() => {
      window.location.href = `${
        domain.wq
      }/pinbind/pintokenredirect?biz=${WXAPP_BIZ_KEY}&url=${encodeURIComponent(
        window.location.href,
      )}`
    })
  }
  
  getLoginCookie() {
    return Promise.resolve({
      pin: cookie.get('pin') || '',
    })
  }
  
  clearLoginCookie() {
    cookie.remove('pin')
  }
  
  checkStatusAndLogin(options = {}) {
    if (!this.checkStatusAndLoginPromise) {
      this.checkStatusAndLoginPromise = new Promise(async (resolve, reject) => {
        try {
          const getLoginState = await this.doCheckLoginStateAndForApiCheck()
          if (getLoginState) {
            resolve(true)
          } else {
            this.toLogin(options)
            reject(false)
          }
        } catch (e) {
          this.toLogin(options)
          reject(false)
        }
      })
      return this.checkStatusAndLoginPromise
    } else {
      return this.checkStatusAndLoginPromise
        .then(() => {
          return Promise.resolve(true)
        })
        .catch(() => {
          this.toLogin(options)
          return Promise.reject(true)
        })
    }
  }
  
  doCheckLoginStateAndForApiCheck() {
    if (this.info.loginState) {
      return Promise.resolve(true)
    } else {
      return new Promise((resolve, reject) => {
        if (this.info.isJingGouMiniViewState) {
          const getWqAuthToken = cookie.get('wq_auth_token')
          if (getWqAuthToken) {
            this.info.loginState = true
            resolve(true)
          } else {
            reject(false)
          }
        } else {
          Taro.request({
            url: api.isLogin,
            jsonp: true,
            timeout: 3000,
            success: (res) => {
              const { statusCode, data } = res
              if (
                statusCode === 200 &&
                data?.islogin &&
                Number(data.islogin) === 1
              ) {
                this.info.loginState = true
                resolve(true)
              } else {
                reject(false)
              }
            },
            fail: (err) => {
              console.log('登录检查异常', err)
              reject(false)
            },
          })
        }
      })
    }
  }
  
  checkLoginStatus() {
    return new Promise(async (resolve, reject) => {
      try {
        const getLoginState = await this.doCheckLoginStateAndForApiCheck()
        if (getLoginState) {
          const { pin } = await this.getLoginCookie()
          this.info.userInfo = {
            pin,
            encodePin: encodeURIComponent(pin),
            ptkey: '',
          }
          resolve(true)
        } else {
          reject(false)
        }
      } catch (e) {
        reject(false)
      }
    })
  }
  
  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, un_area } = 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,
      }
      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(
      'h5==获取店铺下发查询参数\n',
      query,
      '\n获取店铺最后查询参数\n',
      this.info.queryInfo,
      '\n是否为更新店铺状态\n',
      updateShopInfoState,
    )
    const changeArea =
      un_area && un_area.length > 0 ? un_area : ipLoc_djd ? ipLoc_djd : ''
    if (changeArea) {
      this.info.pageInfo.address = changeArea
      this.info.pageInfo.un_area = changeArea
      this.info.pageInfo.addressCommaStr = changeArea.replace(/_/g, ',')
    }
    if (urlCookie['wq_auth_token']) {
      try {
        this.info.userInfo.wqAuthToken = urlCookie['wq_auth_token']
        console.log(
          'url中获取cookie内wq_auth_token下发成功，将会在接口中的cookie携带',
          urlCookie['wq_auth_token'],
        )
        cookie.set('wq_auth_token', this.info.userInfo.wqAuthToken, {
          domain: '.jd.com',
          path: '/', 
          expires: new Date(Date.now() + 4 * 60 * 60 * 1000), 
        })
      } catch (e) {
        console.log(
          'url中转换解析下发的cookie失败，这里主要是京购下面访问h5会携带',
        )
      }
    }
  }

package/dist/common/index.jd.ts

@@ -1 +1 @@
-import Taro from '@tarojs/taro'
  public config: object 
    this.config = {}
    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)
      }
    })
+import Taro from '@tarojs/taro'
    floorVideInfo: {}, 
  public config: object 
    this.config = {}
    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内适用")