diff --git a/packages/address-edit/test/__snapshots__/index.spec.js.snap b/packages/address-edit/test/__snapshots__/index.spec.js.snap index c0c0d2baf..7aa48d65c 100644 --- a/packages/address-edit/test/__snapshots__/index.spec.js.snap +++ b/packages/address-edit/test/__snapshots__/index.spec.js.snap @@ -39,13 +39,13 @@ exports[`create a AddressEdit 1`] = `
-
+
    -
    +
      -
      +
        @@ -109,13 +109,13 @@ exports[`create a AddressEdit with props 1`] = `
        -
        +
          -
          +
            -
            +
              diff --git a/packages/area/test/__snapshots__/index.spec.js.snap b/packages/area/test/__snapshots__/index.spec.js.snap index f06cbfa34..ca8fe3fac 100644 --- a/packages/area/test/__snapshots__/index.spec.js.snap +++ b/packages/area/test/__snapshots__/index.spec.js.snap @@ -8,21 +8,21 @@ exports[`change option 1`] = `
              -
              +
                -
              • 北京市
              • +
              • 北京市
              • 天津市
              -
              +
                -
              • 北京市
              • +
              • 北京市
              -
              +
                -
              • 东城区
              • +
              • 东城区
              • 西城区
              @@ -40,21 +40,21 @@ exports[`change option 2`] = `
              -
              +
              • 北京市
              • -
              • 天津市
              • +
              • 天津市
              -
              +
                -
              • 天津市
              • +
              • 天津市
              -
              +
                -
              • 和平区
              • +
              • 和平区
              • 河东区
              @@ -72,22 +72,22 @@ exports[`change option 3`] = `
              -
              +
              • 北京市
              • -
              • 天津市
              • +
              • 天津市
              -
              +
                -
              • 天津市
              • +
              • 天津市
              -
              +
              • 和平区
              • -
              • 河东区
              • +
              • 河东区
              @@ -104,21 +104,21 @@ exports[`reset method 1`] = `
              -
              +
              • 北京市
              • -
              • 天津市
              • +
              • 天津市
              -
              +
              • 天津市
              • -
              • +
              -
              +
                -
              • 蓟县
              • +
              • 蓟县
              @@ -135,21 +135,21 @@ exports[`reset method 2`] = `
              -
              +
                -
              • 北京市
              • +
              • 北京市
              • 天津市
              -
              +
                -
              • 北京市
              • +
              • 北京市
              -
              +
                -
              • 东城区
              • +
              • 东城区
              • 西城区
              @@ -167,21 +167,21 @@ exports[`watch areaList & code 1`] = `
              -
              +
                -
              • 北京市
              • +
              • 北京市
              • 天津市
              -
              +
                -
              • 北京市
              • +
              • 北京市
              -
              +
                -
              • 东城区
              • +
              • 东城区
              • 西城区
              @@ -199,21 +199,21 @@ exports[`watch areaList & code 2`] = `
              -
              +
                -
              • 北京市
              • +
              • 北京市
              • 天津市
              -
              +
                -
              • 北京市
              • +
              • 北京市
              -
              +
                -
              • 东城区
              • +
              • 东城区
              • 西城区
              @@ -231,21 +231,21 @@ exports[`watch areaList & code 3`] = `
              -
              +
                -
              • 北京市
              • +
              • 北京市
              • 天津市
              -
              +
                -
              • 北京市
              • +
              • 北京市
              -
              +
                -
              • 东城区
              • +
              • 东城区
              • 西城区
              diff --git a/packages/picker/PickerColumn.js b/packages/picker/PickerColumn.js index ec5608efb..76ae1851a 100644 --- a/packages/picker/PickerColumn.js +++ b/packages/picker/PickerColumn.js @@ -219,10 +219,6 @@ export default sfc({ const baseOffset = (itemHeight * (visibleItemCount - 1)) / 2; - const columnStyle = { - height: `${itemHeight * visibleItemCount}px` - }; - const wrapperStyle = { transform: `translate3d(0, ${this.offset + baseOffset}px, 0)`, transitionDuration: `${this.duration}ms`, @@ -235,7 +231,6 @@ export default sfc({ return (
              { diff --git a/packages/picker/index.less b/packages/picker/index.less index 4ad94e474..202760efe 100644 --- a/packages/picker/index.less +++ b/packages/picker/index.less @@ -2,7 +2,6 @@ .van-picker { position: relative; - overflow: hidden; background-color: @picker-background-color; user-select: none; -webkit-text-size-adjust: 100%; /* avoid iOS text size adjust */ @@ -68,8 +67,8 @@ z-index: 2; width: 100%; height: 100%; - background-image: linear-gradient(180deg, hsla(0, 0%, 100%, .8), hsla(0, 0%, 100%, .6)), - linear-gradient(0deg, hsla(0, 0%, 100%, .8), hsla(0, 0%, 100%, .6)); + background-image: linear-gradient(180deg, hsla(0, 0%, 100%, .9), hsla(0, 0%, 100%, .4)), + linear-gradient(0deg, hsla(0, 0%, 100%, .9), hsla(0, 0%, 100%, .4)); background-repeat: no-repeat; background-position: top, bottom; pointer-events: none; @@ -89,10 +88,6 @@ padding: 0 5px; color: @picker-option-text-color; - &--selected { - font-weight: 500; - } - &--disabled { opacity: @picker-option-disabled-opacity; } diff --git a/packages/picker/test/__snapshots__/index.spec.js.snap b/packages/picker/test/__snapshots__/index.spec.js.snap index ca98a9a24..ec496cdcf 100644 --- a/packages/picker/test/__snapshots__/index.spec.js.snap +++ b/packages/picker/test/__snapshots__/index.spec.js.snap @@ -1,10 +1,10 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`column watch default index 1`] = ` -
              +
              • 1
              • -
              • 1990
              • +
              • 1990
              • 1991
              • 1992
              • 1993
              • @@ -15,11 +15,11 @@ exports[`column watch default index 1`] = ` `; exports[`column watch default index 2`] = ` -
                +
                • 1
                • 1990
                • -
                • 1991
                • +
                • 1991
                • 1992
                • 1993
                • 1994
                • diff --git a/packages/style/var.less b/packages/style/var.less index dc67dfa51..cd5003b63 100644 --- a/packages/style/var.less +++ b/packages/style/var.less @@ -362,7 +362,7 @@ @picker-action-text-color: @blue; @picker-action-active-color: @active-color; @picker-option-font-size: 16px; -@picker-option-text-color: @text-color; +@picker-option-text-color: @black; @picker-option-disabled-opacity: .3; // Popup