@conecli/cone-render 0.8.20 → 0.8.21-shop-beta.3

package/dist/common/token/token.ts

@@ -0,0 +1 @@
+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/common/token/token.wxapp.ts

@@ -0,0 +1 @@
+import cookie from '../../utils/jm-cookie'
  return new Promise((resolve) => {
    const token = cookie.get('wq_auth_token')
    resolve(!!token)
  })
  return new Promise((resolve) => {
    const token = cookie.get('wq_auth_token') || ''
    resolve(token)
  })
  return new Promise((resolve) => {
    fetchGateway(
      'isvObfuscator',
      {
        url: window.location.href,
        id: 'shopisv',
      },
      { loginType: 1, loginWQBiz: WXAPP_BIZ_KEY },
    )
      .then((data: any) => {
        console.warn('fetchGateway isvObfuscator data:' + JSON.stringify(data))
        if (
          data?.statusCode == 200 &&
          data?.data?.errcode === 0 &&
          data?.data?.token
        ) {
          resolve(data?.data?.token)
        } else {
          resolve('')
        }
      })
      .catch((e: { message: any }) => {
        console.warn('fetchGateway isvObfuscator error:' + e.message)
        resolve('')
      })
  })
  const returnurl = options?.returnurl || window.location.href
  pinTokenRedirect(WXAPP_BIZ_KEY, returnurl)
  const url = `
  ${domain.wq}/pinbind/pintokenredirect?biz=${biz}&url=${encodeURIComponent(
    targetUrl,
  )}`
  console.log('pinTokenRedirect:', url)
  window.location.href = url

package/dist/components/ErrorBoundary.tsx

@@ -1 +1 @@
-import React from 'react'
      if(this.props.customErrorIsvFloorModule){
        return this.props.customErrorIsvFloorModule
      }
+import React from 'react'
      code: 'isvModuleError',
      msg: opt,
    })
      if(this.props.customErrorIsvFloorModule){
        return this.props.customErrorIsvFloorModule
      }

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/CustomScrollView/index.tsx

@@ -1 +1 @@
-import React, {useRef, useEffect} from 'react'
+import React, {useRef, useEffect} from 'react'
  isH5AndJdShopView,
  isAndroidDevice,
  isIosDevice,
  isJdApp,
  isWxMin,
  isH5AndJdShopViewH5Scroll,
  isH5,
  const rootEleNode = isH5 && document ? document.querySelector('body') : null
  const needShowHighVersion = isH5AndJdShopViewH5Scroll && !(global.info.queryInfo?.downgraded && global.info.queryInfo.downgraded === "true")
    e && e.stopPropagation()
      if(!verticalScrolling) {
        needShowHighVersion && rootEleNode &&  rootEleNode.classList.add('over-hidden')
      }
    e && e.stopPropagation()
    e && e.stopPropagation()
        if(!verticalScrolling) {
          needShowHighVersion && rootEleNode &&  rootEleNode.classList.add('over-hidden')
        }
        if(!verticalScrolling) {
          needShowHighVersion && rootEleNode &&  rootEleNode.classList.remove('over-hidden')
        }
      <ScrollView
        scrollX
        onTouchStart={changeTouchStart}
        onTouchEnd={changeTouchEnd}
        onTouchCancel={changeTouchEnd}
        onTouchMove={changeTouchMove}
        enhanced
        showScrollbar={false}
        style={style}
        className={classNames(className, {
          [customScrollViewStyle[
            'd-custom-ios-h5-extend-border-radius'
            ]]: isIosDevice,
        },'J_customScroll')}
        {...otherProps}
      >
        {children}
      </ScrollView>
  verticalScrolling: false,

package/dist/components/base/CustomVideo/const.ts

@@ -0,0 +1 @@
+export const DEFAULT_MUTE_BTN_PIC = {
  IS_MUTED:
    '//img11.360buyimg.com/imagetools/jfs/t1/216103/12/32490/3414/64cb0ba1F51cd0f76/90ec3bc480166942.png',
  NOT_MUTED:
    '//img13.360buyimg.com/imagetools/jfs/t1/107420/15/23323/3356/64cb0ba1F079aeb66/35883b1d6ff460d2.png',

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

@@ -1,66 +1,42 @@
-.d-video-wrap{
-	position: relative;
-	overflow: hidden;
+.d-video-wrap {
+  // 便于静音按钮 相对视频 定位
+  position: relative;
+}
 
-	.d-video-play {
-		display: block;
-		overflow: hidden;
-		width: 100%;
-		height: 100%;
-		background-color: transparent;
-		-webkit-backface-visibility: hidden;
-		-webkit-transform: translate3d(0, 0, 0);
-		object-fit: fill;
-	}
+.d-video-play {
+  display: block;
+  overflow: hidden;
+  width: 100%;
+  height: 100%;
+  background-color: transparent;
+  -webkit-backface-visibility: hidden;
+  -webkit-transform: translate3d(0, 0, 0);
+  object-fit: fill;
+}
 
-	.d-video-mute-btn{
-		position: absolute;
-		width: 51px;
-		height: 51px;
-		background-repeat: no-repeat;
-		background-position: 50% 50%;
-		background-size: 50%;
-	}
-	.d-mute-btn-topLeft{
-		left: 10px;
-		top: 10px;
-	}
-	.d-mute-btn-topRight{
-		right: 10px;
-		top: 10px;
-	}
-	.d-mute-btn-bottomLeft{
-		left: 10px;
-		bottom: 10px;
-	}
-	.d-mute-btn-bottomRight{
-		right: 10px;
-		bottom: 10px;
-	}
-	.d-is-muted{
-		background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACIAAAAgCAYAAAB3j6rJAAAACXBIWXMAAAsTAAALEwEAmpwYAAAGAGlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNS42LWMxNDAgNzkuMTYwNDUxLCAyMDE3LzA1LzA2LTAxOjA4OjIxICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1sbnM6cGhvdG9zaG9wPSJodHRwOi8vbnMuYWRvYmUuY29tL3Bob3Rvc2hvcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RFdnQ9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZUV2ZW50IyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOCAoTWFjaW50b3NoKSIgeG1wOkNyZWF0ZURhdGU9IjIwMTktMDQtMTFUMTA6MTk6MDMrMDg6MDAiIHhtcDpNb2RpZnlEYXRlPSIyMDE5LTA0LTExVDEwOjIyOjMzKzA4OjAwIiB4bXA6TWV0YWRhdGFEYXRlPSIyMDE5LTA0LTExVDEwOjIyOjMzKzA4OjAwIiBkYzpmb3JtYXQ9ImltYWdlL3BuZyIgcGhvdG9zaG9wOkNvbG9yTW9kZT0iMyIgcGhvdG9zaG9wOklDQ1Byb2ZpbGU9InNSR0IgSUVDNjE5NjYtMi4xIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjAzYjJmNjE2LTZmZTUtNDJjNC1iNTgwLTczNzZjZjI2NzdmNSIgeG1wTU06RG9jdW1lbnRJRD0iYWRvYmU6ZG9jaWQ6cGhvdG9zaG9wOjYzZjQ2NTYzLWE0ZjktOGQ0Mi1hM2FhLTY3ODJhNDBhYWNjMSIgeG1wTU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjIyYWNjMWFlLTg4ZmMtNDBlZi1iMWM1LTNmODgwY2QzYWI2MiI+IDx4bXBNTTpIaXN0b3J5PiA8cmRmOlNlcT4gPHJkZjpsaSBzdEV2dDphY3Rpb249ImNyZWF0ZWQiIHN0RXZ0Omluc3RhbmNlSUQ9InhtcC5paWQ6MjJhY2MxYWUtODhmYy00MGVmLWIxYzUtM2Y4ODBjZDNhYjYyIiBzdEV2dDp3aGVuPSIyMDE5LTA0LTExVDEwOjE5OjAzKzA4OjAwIiBzdEV2dDpzb2Z0d2FyZUFnZW50PSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOCAoTWFjaW50b3NoKSIvPiA8cmRmOmxpIHN0RXZ0OmFjdGlvbj0ic2F2ZWQiIHN0RXZ0Omluc3RhbmNlSUQ9InhtcC5paWQ6MDNiMmY2MTYtNmZlNS00MmM0LWI1ODAtNzM3NmNmMjY3N2Y1IiBzdEV2dDp3aGVuPSIyMDE5LTA0LTExVDEwOjIyOjMzKzA4OjAwIiBzdEV2dDpzb2Z0d2FyZUFnZW50PSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOCAoTWFjaW50b3NoKSIgc3RFdnQ6Y2hhbmdlZD0iLyIvPiA8L3JkZjpTZXE+IDwveG1wTU06SGlzdG9yeT4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz5PmxYVAAACLklEQVRYhc2XP2sVQRRHz40hKoqaQgVBCy1EozFlGiVFxMLGh4piYWEh+hkEP4YKAVFEEFTyughaCH6DqIVpAhYWEgIxoJE8cywyi5tNHu/tJmvyg2WZO3dmzt47/zZUtoJ6Nhsg09YDiYhKDzACTAFNYH9lEpUq80TdrT5wpV5n/ZV9KoGoo+pXV2uyKkipOaLuUceAt8DhUvQd1FsCYhR4ChzaSIBMHSOi7lOfsByFWiCgEBH1GHAF2JlMPcBt4GC3HUYEaj9wF3gVEVPtfNVTwAXgWX7CDKq/1piAZTSZBmim8qJ6sQ3EgDqb/L7kU3MH2NHtl3dQX3r3Ak21UYAYAj4A/cl0JB+RF+uMRj4iQ+p8zt7KYFLdXKHuRi0gacBhV6a6pd5bA6KRNagFJPU9qv5u47toLmW1HnoR8Q5oAK1CVQu4FBHj/wUkaXsb+4pzpVaQFPqXrN7Be4Fx9VztIOr1BLEtmX4A94E/qdwHTKjDWYM6lu81dSlnn3V570BtuLxaMs2rZ/IgYxsBovaoPwsQA4VoFWEm8ql5DiysNyURsQTMpOIMcDYiPhd8xoGr/FtNC2G6FKXD6ihwGdiVHMoeeh8jYlA9ANwE3kTEp3bO6vE03qOONzR1r/q4RGrquaFFxFxE3ALOA9+6jExpdb180y55AhirhaRTatq0GXEzL8+ZIuI9cBJ4WKiartJf9nWV/mty7UfUafW7erpqRGI9EBuprffvu9n6C1KOmsqwI5A1AAAAAElFTkSuQmCC");
-	}
-	.d-not-muted{
-		background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAACXBIWXMAAAsTAAALEwEAmpwYAAAGAGlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNS42LWMxNDAgNzkuMTYwNDUxLCAyMDE3LzA1LzA2LTAxOjA4OjIxICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1sbnM6cGhvdG9zaG9wPSJodHRwOi8vbnMuYWRvYmUuY29tL3Bob3Rvc2hvcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RFdnQ9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZUV2ZW50IyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOCAoTWFjaW50b3NoKSIgeG1wOkNyZWF0ZURhdGU9IjIwMTktMDQtMTFUMTA6MTg6MjArMDg6MDAiIHhtcDpNb2RpZnlEYXRlPSIyMDE5LTA0LTExVDEwOjIyOjIyKzA4OjAwIiB4bXA6TWV0YWRhdGFEYXRlPSIyMDE5LTA0LTExVDEwOjIyOjIyKzA4OjAwIiBkYzpmb3JtYXQ9ImltYWdlL3BuZyIgcGhvdG9zaG9wOkNvbG9yTW9kZT0iMyIgcGhvdG9zaG9wOklDQ1Byb2ZpbGU9InNSR0IgSUVDNjE5NjYtMi4xIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjk3YmE4Yjg0LTFhNTYtNGM1MS04NDVkLTNiZmYyMGI0ZDc0ZiIgeG1wTU06RG9jdW1lbnRJRD0iYWRvYmU6ZG9jaWQ6cGhvdG9zaG9wOjg1NGQ3MjlkLWUwNjctZjU0OC1hMTlhLTBlZjQ4OGRkYjJiOSIgeG1wTU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjA1ODY3ZDFlLWQ3NGEtNDgyNC04MDU3LTYzYmRmMTdjODk5ZSI+IDx4bXBNTTpIaXN0b3J5PiA8cmRmOlNlcT4gPHJkZjpsaSBzdEV2dDphY3Rpb249ImNyZWF0ZWQiIHN0RXZ0Omluc3RhbmNlSUQ9InhtcC5paWQ6MDU4NjdkMWUtZDc0YS00ODI0LTgwNTctNjNiZGYxN2M4OTllIiBzdEV2dDp3aGVuPSIyMDE5LTA0LTExVDEwOjE4OjIwKzA4OjAwIiBzdEV2dDpzb2Z0d2FyZUFnZW50PSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOCAoTWFjaW50b3NoKSIvPiA8cmRmOmxpIHN0RXZ0OmFjdGlvbj0ic2F2ZWQiIHN0RXZ0Omluc3RhbmNlSUQ9InhtcC5paWQ6OTdiYThiODQtMWE1Ni00YzUxLTg0NWQtM2JmZjIwYjRkNzRmIiBzdEV2dDp3aGVuPSIyMDE5LTA0LTExVDEwOjIyOjIyKzA4OjAwIiBzdEV2dDpzb2Z0d2FyZUFnZW50PSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOCAoTWFjaW50b3NoKSIgc3RFdnQ6Y2hhbmdlZD0iLyIvPiA8L3JkZjpTZXE+IDwveG1wTU06SGlzdG9yeT4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz459+FoAAABqElEQVRYhc2XPWsVQRSGnxPjF4oGRfxoRQKGWCU2Ft7CykrQWosEyf/If0hhIPgHDEmbNJZqCFxiQEgTUGxsBUVEHgvnyrjZZJO92V1fGIaZnTPvszPszNlQ6VIjnbr/DwCoDLMNak/dUVfUK0f2rQugnlcX/FevWgFQH6gf3autRgHUC+piiXHzAOmtPx9gXgug8itQx9SXwDpw47AGKXZWvXvQmNFCwE3gCXA2dY0Az4GrRzHONA9cU/vAbERsllEOyh31e8USV2mrMPdG9uyn+rDom2/BHHCm5puWKiKmgdtAnz+rvaxO5mNygEvHaZ5BfADuARvAaWBpP4DGFBHfgBngFzClTrUKkCDeA+9S837rAEnbqb7VFcCpVJ/oCmCw959aB1AfAROpudYqgDoOLKRmPyLelAF8bcD4pPoMeAtcB34AT4uDBqXXwFG8XXUU/72MIuK1OgE8Bs6l7mEvo8up7lN1Ge0n9aK6VHMFZvJTr9S3CiALaCQhqZOSvegMIAvu2UVSWpigLC1fbQ0gm6in7qpfLCQbhwGIYcyPQ53/G3YO8BtUtd35bvKcVwAAAABJRU5ErkJggg==");
-	}
-
-	.d-video-play-btn{
-		position: absolute;
-		width: 120px;
-		height: 120px;
-		background-repeat: no-repeat;
-		background-position: 50% 50%;
-		background-size: 50%;
-		top: 50%;
-		left: 50%;
-		transform: translateX(-50%) translateY(-50%);
-	}
-
-	.d-is-pause{
-		background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABoAAAAeCAYAAAAy2w7YAAAAAXNSR0IArs4c6QAAAWhJREFUSA1j+P///0cgBoHjQGzCQCsAtgJB/AMy5wCxGNXtQ9iBwvoA5BUCMQvVLEQxHpNzDSjkRhXLMM3GKrIeKKpEkYVYjcUu+AMo3ALE3GRZiN1MvKKPgbIRJFuG10j8koeA0gZEW4jfLIKyf4EqpgOxMEELCRpFnIJ3QGU5QMyM00LizCFa1SWgSkeslhFtBGkKVwGVy6FYSJp+klR/A6quB2JOkIWMIK0oNlOf8xBoZDE9LAI7nYn6HsBq4l96WHQEaLUpAyiOaASeAM2NgvuPBpaACt82IEYtfKls0UagecpwXyAzqGTRdaA57sjmYrAptAjUsCkGYlYMg9EFyLQI1IiZB8Ti6Obh5JNh0QmgHlOcBuKSIMGi50C18UDMiMssvOJEWPQLqKYbiHnxGkRIkoBF24DyaoTMIEoeh0W3geI+RBlArCI0iz4D+RVAzEasfqLVAQ19AcSg5LoYiKWI1kiiQgCMBLnEEcfDSgAAAABJRU5ErkJggg==");
-	}
-
-	.d-not-pause{
-		background-image: none;
-	}
-}
+.d-video-mute-btn {
+  position: absolute;
+  background-repeat: no-repeat;
+  background-position: center center;
+  background-size: 100%;
+  z-index: 20;
+  transform: translateZ(20px);
+  width: 24px;
+  height: 24px;
+}
+.d-mute-btn-topLeft {
+  left: 20px;
+  top: 20px;
+}
+.d-mute-btn-topRight {
+  right: 20px;
+  top: 20px;
+}
+.d-mute-btn-bottomLeft {
+  left: 20px;
+  bottom: 20px;
+}
+.d-mute-btn-bottomRight {
+  right: 20px;
+  bottom: 20px;
+}

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

@@ -1 +1 @@
-import React, { useCallback, useEffect, useRef, useState } from 'react'
      if (!isH5 || !ref.current) return
      playVideo()
      manualPauseStateRef.current = false
    }
      if (!isH5 || !ref.current) return
      pauseVideo()
      manualPauseStateRef.current = true
    }
    if (!isH5 || !ref.current) return
  }, [])
+import React, { useCallback, useEffect, useRef, useState } from 'react'
  isH5,
  addHttps,
  isH5AndJingGouMini,
  isH5AndJdShopView,
  (props: ComponentInterFace.CustomVideoProps, ref: any) => {
    const {
      style,
      videoStyle,
      src,
      width,
      height,
      controls,
      poster,
      autoplay,
      loop,
      showMuteBtn,
      muteButtonPostion,
      showFullscreenBtn,
      muteBtnPicSrcObj,
      muteBtnClassName,
      muteBtnStyle,
      objectFit,
      mockAutoplay,
      threshold,
      onPlayCallback,
      onPauseCallback,
      onVideoApiCall,
      inViewCallback,
      outViewCallback,
    } = props
    const [videoMutedState, setVideoMutedState] = useState(MUTED)
    const manualPauseStateRef = useRef(false)
    const initPlayStatusRef = useRef(false)
    const isInViewStateRef = useRef(false)
    const disposeRef = useRef<Function | null>()
    ref === null && (ref = useRef<HTMLVideoElement | null>())
    
    const playVideo = useCallback(() => {
      if (ref && ref.current) {
        const result = ref.current.play()
        result &&
          result
            .then(() => {
              console.log('播放成功')
            })
            .catch((e) => {
              console.log('playVideo Error:', e.message)
            })
      }
    }, [])
    
    const pauseVideo = useCallback(() => {
      if (ref && ref.current) {
        console.log('pauseVideo')
        ref.current.pause()
      }
    }, [])
    
    useEffect(() => {
      if (!isH5 || !ref.current) return
      if (autoplay && mockAutoplay) {
        
        const callInitAutoplay = () => {
          console.log(
            'callInitAutoplay:',
            autoplay,
            'initPlayStatusRef:',
            initPlayStatusRef.current,
            'isInViewStateRef:',
            isInViewStateRef.current,
            'paused:',
            ref.current.paused,
          )
          if (
            autoplay &&
            mockAutoplay &&
            !initPlayStatusRef.current &&
            isInViewStateRef.current &&
            ref.current.paused
          ) {
            console.log('callInitAutoplay playVideo')
            playVideo()
          }
        }
        const onWeixinJSBridgeReady = (e) => {
          console.log('onWeixinJSBridgeReady:', e.type)
          callInitAutoplay()
        }
        const onTouchstart = (e) => {
          console.log('onTouchstart:', e.type)
          callInitAutoplay()
        }
        const onScroll = (e) => {
          console.log('onScroll:', e.type)
          callInitAutoplay()
        }
        const onPlay = (e) => {
          console.log('onPlay:', e.type)
          if (!initPlayStatusRef.current) {
            const dispose = disposeRef.current
            console.log('onPlay dispose:', dispose)
            dispose && dispose()
            disposeRef.current = null
          }
          initPlayStatusRef.current = true
        }
        document?.addEventListener('WeixinJSBridgeReady', onWeixinJSBridgeReady)
        document?.addEventListener('touchstart', onTouchstart)
        document?.addEventListener('scroll', onScroll)
        ref.current.addEventListener('play', onPlay)
        const dispose = () => {
          console.log('调用dispose')
          document?.removeEventListener(
            'WeixinJSBridgeReady',
            onWeixinJSBridgeReady,
          )
          document?.removeEventListener('touchstart', onTouchstart)
          document?.removeEventListener('scroll', onScroll)
          ref?.current?.removeEventListener('play', onPlay)
        }
        disposeRef.current = dispose
      }
      !autoplay && (manualPauseStateRef.current = true)
      const handleVideoPlayApiCall = () => {
        if (!isH5 || !ref.current) return
        playVideo()
        manualPauseStateRef.current = false
      }
      const handleVideoPauseApiCall = () => {
        if (!isH5 || !ref.current) return
        pauseVideo()
        manualPauseStateRef.current = true
      }
      
      const handleVideoSeekApiCall = (position: number) => {
        console.log('video定位至', position)
        if (!isH5 || !ref.current) return
        if (typeof position === 'undefined' || typeof position !== 'number')
          return
        ref.current.currentTime = position
      }
      
      if (onVideoApiCall) {
        onVideoApiCall({
          play: handleVideoPlayApiCall,
          pause: handleVideoPauseApiCall,
          seek: handleVideoSeekApiCall,
        })
      }
      return () => {
        const dispose = disposeRef.current
        dispose && dispose()
        disposeRef.current = null
      }
    }, [])
    
    const handleMuted = useCallback(() => {
      if (!isH5 || !ref.current) return
      const handleMutedState = ref.current.muted
      if (handleMutedState === true) {
        ref.current.muted = false
        setVideoMutedState(false)
      } else {
        ref.current.muted = true
        setVideoMutedState(true)
      }
    }, [videoMutedState])
    
    const handleVideoInViewCallback = useCallback(() => {
      if (!isH5 || !ref.current) return
      isInViewStateRef.current = true
      console.log(
        '进入可视区域，initPlayStatusRef:',
        initPlayStatusRef.current,
        'isInViewStateRef:',
        isInViewStateRef.current,
      )
      if (
        autoplay &&
        mockAutoplay &&
        !initPlayStatusRef.current &&
        ref.current.paused
      ) {
        console.log('进入可视区域了 callInitAutoplay playVideo')
        playVideo()
      } else if (!manualPauseStateRef.current && ref.current.paused) {
        playVideo()
      }
      typeof inViewCallback === 'function' && inViewCallback()
    }, [])
    
    const handleVideoOutViewCallback = useCallback(() => {
      if (!isH5 || !ref.current) return
      isInViewStateRef.current = false
      console.log(
        '不在可视区域, 视频暂停了, isInViewStateRef:',
        isInViewStateRef.current,
      )
      pauseVideo()
      typeof outViewCallback === 'function' && outViewCallback()
    }, [])
    
    const getVideoWidthAndHeightStyle = () => {
      const style = {}
      width && (style['width'] = width)
      height && (style['height'] = height)
      return style
    }
    
    const getMuteBtnBackgroundImageStyle = useCallback(() => {
      const isMutedPicSrc = muteBtnPicSrcObj?.IS_MUTED
      const notMutedPicSrc = muteBtnPicSrcObj?.NOT_MUTED
      const finalIsMutedPicSrc =
        typeof isMutedPicSrc !== 'undefined' && isMutedPicSrc !== ''
          ? isMutedPicSrc
          : DEFAULT_MUTE_BTN_PIC.IS_MUTED
      const finalNotMutedPicSrc =
        typeof notMutedPicSrc !== 'undefined' && notMutedPicSrc !== ''
          ? notMutedPicSrc
          : DEFAULT_MUTE_BTN_PIC.NOT_MUTED
      return {
        backgroundImage: `url(${
          videoMutedState ? finalIsMutedPicSrc : finalNotMutedPicSrc
        })`,
      }
    }, [videoMutedState])
    console.log('autoplay:', autoplay, 'muted:', MUTED)
    console.log('isH5:', isH5, 'isH5AndJingGouMini:', isH5AndJingGouMini)
    return src ? (
      <InOrOutViewObserver
        inViewCallback={handleVideoInViewCallback}
        outViewCallback={handleVideoOutViewCallback}
        threshold={threshold}
      >
        {isH5 ? (
          <View
            className={customVideoStyle['d-video-wrap']}
            style={{ ...style, ...getVideoWidthAndHeightStyle() }}
          >
            <video
              style={{ ...videoStyle }}
              className={customVideoStyle['d-video-play']}
              src={src}
              controls={controls}
              poster={poster ? addHttps(poster) : ''}
              ref={ref}
              loop={loop}
              autoPlay={autoplay}
              muted={MUTED}
              x5-playsinline="true"
              playsInline
              webkit-playsinline="true"
              controlsList={
                isH5AndJdShopView
                  ? 'nodownload nofullscreen noremoteplayback'
                  : ''
              }
              onPlay={onPlayCallback}
              onPause={onPauseCallback}
            />
            {!controls && showMuteBtn && (
              <View
                className={classNames(
                  customVideoStyle['d-video-mute-btn'],
                  customVideoStyle[`d-mute-btn-${muteButtonPostion}`],
                  `${muteBtnClassName}`,
                )}
                style={{ ...getMuteBtnBackgroundImageStyle(), ...muteBtnStyle }}
                onClick={handleMuted}
              ></View>
            )}
          </View>
        ) : (
          <Video
            style={{ ...videoStyle }}
            ref={ref}
            className={customVideoStyle['d-video-play']}
            src={src}
            controls={controls}
            poster={poster ? addHttps(poster) : ''}
            loop={loop}
            autoplay={autoplay}
            muted={MUTED}
            showMuteBtn={showMuteBtn}
            showFullscreenBtn={showFullscreenBtn}
            objectFit={objectFit}
            onPlay={onPlayCallback}
            onPause={onPauseCallback}
          />
        )}
      </InOrOutViewObserver>
    ) : null
  },
  const buildType = process.env.BUILD_TYPE
  const mockAutoplay = buildType === BUILD_TYPE.DECORATE ? false : true
  return mockAutoplay
  style: {},
  videoStyle: {},
  className: '',
  src: '',
  width: '100%',
  height: '100%',
  controls: false,
  poster: '',
  autoplay: true,
  mockAutoplay: getDefaultMockAutoplay(),
  loop: true,
  showMuteBtn: true,
  muteButtonPostion: 'topLeft',
  muteBtnPicSrcObj: DEFAULT_MUTE_BTN_PIC,
  muteBtnClassName: '',
  muteBtnStyle: {},
  showFullscreenBtn: false,
  objectFit: 'cover',
  threshold: 0.6,

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

@@ -40,6 +40,7 @@
 	.d-dialog-footer {
 		.d-dialog-btn {
 			position: relative;
+      margin: 0;
 			display: block;
 			height: 88px;
 			line-height: 88px;
@@ -50,6 +51,8 @@
 			text-overflow: ellipsis;
 			white-space: nowrap;
 			box-sizing: border-box;
+      background-color: #fff;
+      border-radius: 0;
 			&:after {
 				content: '';
 				display: block;
@@ -62,6 +65,8 @@
 				-ms-transform: scaleX(0.5);
 				transform: scaleY(0.5);
 				pointer-events: none;
+        border: none;
+        border-radius: 0;
 			}
 		}
 		.d-dialog-ensure-btn {
@@ -81,8 +86,7 @@
 			}
 		}
 		.d-dialog-cancel-btn {
-			background-color: #ffffff;
-			color: #000000;
+			color: #000;
 		}
 	}
 }