@conecli/cone-render 0.8.28 → 0.8.29

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)
        })
    }
  })
  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已经存在：', 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.ts

@@ -1 +1 @@
-import { domain } from '../../api'
  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 {
      const isLogin: string = `${domain.mobileLogin}/cgi-bin/ml/islogin`
      fetchJsonp(isLogin)
        .then((response: any) => {
          return response.json()
        })
        .then((data) => {
          console.log('data:', data)
          if (data?.islogin === '1') {
            resolve(true)
          } else {
            resolve(false)
          }
        })
        .catch((e) => {
          console.log('fetchJsonp cgi-bin/ml/islogin error:', e.message)
          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/CommonFloorHead/index.module.scss

@@ -105,7 +105,7 @@
 
 .d-title-more {
 	position: relative;
-	top: 18px;
+	top: 16px;
 	display: flex;
 	align-items: flex-end;
 	height: 56px;

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

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

package/dist/components/base/CustomVideo/index.module.scss

@@ -1,6 +1,6 @@
 .d-video-wrap {
+  // 便于静音按钮 相对视频 定位
   position: relative;
-  overflow: hidden;
 }
 
 .d-video-play {
@@ -19,7 +19,8 @@
   background-repeat: no-repeat;
   background-position: center center;
   background-size: 100%;
-  z-index: 20;
+  // z-index: 20;
+  transform: translateZ(20px);
   width: 24px;
   height: 24px;
 }