@conecli/cone-render 0.8.38-beta.0 → 0.8.38

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 = {}
      ...info,
    let getFullUrl = loginUrl + '?' + serialize(params)
    if(isPc) {
      getFullUrl = getFullUrl.replace(/returnurl/,'ReturnUrl')
    }
      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)
      }
    })
    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, ',')
    }
+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, ',')
    }

package/dist/common/index.jd.ts

@@ -1 +1 @@
-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)
      }
    })
+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)
      }
    })

package/dist/common/index.ts

@@ -1 +1 @@
-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()
+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()

package/dist/common/index.weapp.ts

@@ -1 +1 @@
-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,
          })
        }
      }
    })
+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,
          })
        }
      }
    })

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'

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

@@ -1 +1 @@
-import React, { useMemo } from 'react'
  key: 1, 
+import React, { useMemo } from 'react'