Merge branch 'dev' into feature/sku_migration

packages/vant-css/src/coupon-list.css

@@ -1,7 +1,7 @@
 @import './common/var.css';
 @import "./mixins/ellipsis.css";
 
-.van-order-coupon {
+.van-coupon {
   &-list {
     height: 100%;
     background-color: $background-color;
@@ -57,7 +57,7 @@
         }
       }
 
-      .van-order-coupon-card + h3 {
+      .van-coupon-item + h3 {
         margin-top: 30px;
       }
     }
@@ -74,7 +74,7 @@
     }
   }
 
-  &-coupon {
+  &-item {
     display: flex;
     height: 100px;
     margin: 0 15px 10px;
@@ -176,11 +176,11 @@
     }
 
     &--disabled {
-      .van-order-coupon-coupon__lines {
+      .van-coupon-item__lines {
         background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACQAAADICAMAAAC3WLNTAAAAWlBMVEUAAACqrremq7Oqv7+mq7Wqqr+rsLeprreqsrmqrralq7SkqbKrsbikqLGqwNWqrrmrr7mkqbGrsbijqLGnq7SssrimrLKlqrOnrLWprraqr7ekqbKrsLijqLGfTYl9AAAAF3RSTlMAN5oMQgya5kJC5uaSkgZC8/PV1b0rK6hQU+kAAASjSURBVFjDfZlJduMwDESZntJDeh5sUdb9r9kuA+AXA0iIIi/8X6FYALNJU/19+fWj3/pNT1V35NvLratgMvTtjxH+1NBLt7rLHbb7OwhVrSUhKQhz7z1Dv6xZoLWnH70vg5ESINDedkg5BrR0yrGs9Pbpw21SqxNvH593YsN+30OibhwvaQXUPgghVH1m6EkAXK30VllB+UeCMG7OmCPtlk5exN6TcWsRv0UE/aG0GIKxMsycfB9j6QgZwn7FgO/AYhSFq+7Q4hBgyMT9kJKkkhJiriTEuoKACereTw+Y98LTsDVvKdenDWAW6gh1lNwTGHvjEGGhRre+U3J0iKGGknl7zeCJjoBCDPQBBxXhY94WwlYFuXLQTfW979LKYKzvECKH3aLGRSCFnnPwK7UPi8VZ7IRAGH+9X9w7iv0a3GvjZG+F8Y8LRRS0fMQ0hUn0o2ws1wEB7tJqV4iEDKVlgZo5bDWYPQWiVzNmNCX2CMo9XSutziEFoTRjRNqkAwBBqBGBvSpMpEVwrXLgr9Gidi511FaQSZVASO2VkJqxRQPefw3GbX2syqdnqdEy2bd7F77qWRvU3ggp09LDvUMmu/crJVN+wlRA9CrG4+0eadmTteLeScW0/De3+zSEljIpD3Mx53WoGssbfQfgrwm6Un5EgAJCL0MAQ2r4AkoYzoBgBnbuiREilSGLw/YLpUuSChBjKAGltIBSzxDKUOpVQYbEx27ABTYiEOurUjvSi6V7V0ihxb3LqbNfXARqRvdXqmb8fgyI8eSNqNst834l41mNe1f1G38EHzE9w8ycZW5juVzEwCHl7S5CqJJrd0Sci9VUM8CcJ843qwnBVFUGCamJBU+OGVsEKsiYE18egQllJSLA1ZF3Nx6uyoYonRwRJbBM+oANtY6pbFU+iwBMp/R7x/dZa6yvGELVZ4aeRliEn6C3QlDzvgnyIvS6HYWpZJxQzRQUEYC5fTDCpFjleLf3jGWvhTG2oKKoBHEA2tZK1gxPpdC8XzXELosBOsIeYDsEEMpKOXugGjG1MyUW9VgJBqWC88cGfJKCgazKETiW7jhOFeubigvNRTjbGIPeFwRJAB1T3LvTwviJFhGshxRhnjl/jGVd0Sk9rUKoGroj4s7EtE/x9aqnhqQRptYzTysqJ578dQIZ475OIvATnhlfcVVjzZFwFXCthNipUo0xYHpVjK3KFxcTk8FYujuB0Hq0vkgJ0WeGnggrjYcrRRCRfwENBk+53SbEQUxl43ZAY48jwDvhz2GqAMuxbPcfPbF/Q4gBb5teoQMFtN0rkE3AiAqw6euBccRaaRMK5kccSsIQYmeMNUiAYU5iC08BGAGAkCBvuEZa+Wq0Gclh6SWl4X1Ogt1pmwMg2/6MYvCkj30/5mgDXi1PDrmNQxpoqxJCSCE3lk4KKdRLjDvWdwPAfQQ6LgJHnPK0CPxK2fnQA1MBCaDZ/oS0A4v9oty4MajNgVoEG7UOMaIgTJy7LZzHWGBWA+FswBTctMsZYr+AfpbAHFb7XQiZScy3rxliFfzd/h06wlY7kJp86d+FGTEhlO4UWgU6Bvzv6++fmWGE/wHKk5MgoCYAjwAAAABJRU5ErkJggg==');
       }
 
-      .van-order-coupon-coupon__gradient {
+      .van-coupon-item__gradient {
         background-image: linear-gradient(45deg, #a4a9b2, #b7bcc3);
       }
     }

packages/vant-css/src/express-way.css

@@ -1,60 +0,0 @@
-@import './common/var.css';
-
-.van-express-way {
-  padding: 0;
-
-  &__fee,
-  &__type {
-    color: $gray-darker;
-    line-height: 1.5;
-  }
-
-  &__fee {
-    font-size: 14px;
-  }
-
-  &__type {
-    font-size: 12px;
-  }
-
-  .van-actionsheet__content {
-    max-height: 290px;
-    overflow-y: auto;
-  }
-
-  &-option {
-    position: relative;
-    padding: 14px 15px 14px 0;
-    
-    .van-radio {
-      top: 50%;
-      left: 0;
-      margin-top: -11px;
-      position: absolute;
-    }
-
-    &__content {
-      padding-left: 30px;
-
-      p {
-        color: $gray-dark;
-        font-size: 12px;
-        line-height: 16px;
-      }
-    }
-
-    &__title {
-      span {
-        vertical-align: middle;
-
-        &:first-child {
-          margin-right: 5px;
-        }
-      }
-    }
-
-    &__warn {
-      color: $yellow;
-    }
-  }
-}

packages/vant-css/src/index.css

@@ -12,10 +12,11 @@
 @import './badge.css';
 @import './button.css';
 @import './cell.css';
-@import './cell-swipe.css';
 @import './card.css';
 @import './icon.css';
 @import './loading.css';
+@import './nav-bar.css';
+@import './notice-bar.css';
 @import './popup.css';
 @import './search.css';
 @import './panel.css';
@@ -23,7 +24,7 @@
 @import './tag.css';
 @import './tab.css';
 @import './image-preview.css';
-@import './quantity.css';
+@import './stepper.css';
 @import './progress.css';
 @import './swipe.css';
 
@@ -41,14 +42,13 @@
 @import './pull-refresh.css';
 @import './toast.css';
 
-/* business components */
-@import './deep-select.css';
-@import './express-way.css';
-@import './goods-action.css';
-@import './invalid-goods.css';
-@import './notice-bar.css';
-@import './order-coupon.css';
-@import './order-goods.css';
-@import './pay-order.css';
+/* high order components */
+@import './cell-swipe.css';
 @import './switch-cell.css';
+@import './tree-select.css';
+
+/* business components */
+@import './coupon-list.css';
+@import './goods-action.css';
+@import './submit-bar.css';
 @import './sku.css';

packages/vant-css/src/invalid-goods.css

@@ -1,122 +0,0 @@
-@import './common/var.css';
-@import "./mixins/ellipsis.css";
-
-$van-invalid-goods-photo-size: 90px;
-
-.van {
-  &-invalid-goods {
-    margin: 10px 0;
-
-    &__title {
-      color: $gray-dark;
-      font-size: 12px;
-      text-align: center;
-      margin-bottom: 10px;
-    }
-
-    &__container {
-      padding: 5px 10px;
-    }
-
-    &__gallery {
-      overflow: hidden;
-      height: $van-invalid-goods-photo-size;
-    }
-
-    &__thumb {
-      float: left;
-      display: flex;
-      height: 100%;
-      position: relative;
-      margin-right: 5px;
-      align-items: center;
-      justify-content: center;
-
-      img {
-        max-width: $van-invalid-goods-photo-size;
-        max-height: $van-invalid-goods-photo-size;
-      }
-    }
-
-    &__count {
-      position: absolute;
-      top: 0;
-      right: 0;
-      width: 80px;
-      color: $gray-darker;
-      font-size: 14px;
-      padding-right: 8px;
-      line-height: calc($van-invalid-goods-photo-size + 10px);
-      background-color: $white;
-      text-align: right;
-
-      span {
-        margin-right: 6px;
-        vertical-align: middle;
-      }
-    }
-
-    &__list {
-      max-height: 400px;
-      overflow-y: scroll;
-    }
-  }
-
-  &-invalid-goods-card {
-    color: $gray-dark;
-    margin: 10px 0;
-    padding: 5px 10px;
-    background-color: #fafafa;
-    height: $van-invalid-goods-photo-size;
-
-    &__flag {
-      position: absolute;
-      left: 0;
-      top: 70px;
-      width: $van-invalid-goods-photo-size;
-      color: $white;
-      font-size: 12px;
-      line-height: 20px;
-      text-align: center;
-      background-color: rgba(0,0,0,.6);
-    }
-
-    &__content {
-      width: 100%;
-      padding-left: 100px;
-      box-sizing: border-box;
-    }
-
-    &__row {
-      display: flex;
-      line-height: 20px;
-    }
-
-    &__title,
-    &__sku {
-      flex: 1;
-      @mixin multi-ellipsis 2;
-    }
-
-    &__title,
-    &__price {
-      font-size: 14px;
-    }
-
-    &__num,
-    &__sku {
-      font-size: 12px;
-    }
-
-    &__desc {
-      color: $orange;
-      font-size: 12px;
-      margin-top: 5px;
-    }
-  }
-
-  .van-icon-arrow {
-    color: $gray-darker;
-    font-size: 10px;
-  }
-}

packages/vant-css/src/nav-bar.css

@@ -0,0 +1,60 @@
+@import './common/var.css';
+
+.van-nav-bar {
+  height: 46px;
+  position: relative;
+  user-select: none;
+  text-align: center;
+  line-height: 46px;
+  background-color: #fff;
+
+  .van-icon {
+    color: $blue;
+  }
+
+  &__arrow {
+    transform: rotate(180deg);
+
+    + .van-nav-bar__text {
+      margin-left: -20px;
+      padding-left: 25px;
+    }
+  }
+
+  &--fixed {
+    top: 0;
+    left: 0;
+    width: 100%;
+    position: fixed;
+  }
+
+  &__title {
+    font-size: 16px;
+  }
+
+  &__left,
+  &__right {
+    bottom: 0;
+    font-size: 14px;
+    position: absolute;
+  }
+
+  &__left {
+    left: 15px;
+  }
+
+  &__right {
+    right: 15px;
+  }
+
+  &__text {
+    color: $blue;
+    margin: 0 -15px;
+    padding: 0 15px;
+    display: inline-block;
+
+    &:active {
+      background-color: $active-color;
+    }
+  }
+}

packages/vant-css/src/order-goods.css

@@ -1,205 +0,0 @@
-@import './common/var.css';
-
-.van-order-goods {
-  background-color: $white;
-
-  &-card {
-    margin-left: -15px;
-    background-color: #fafafa;
-
-    &:not(:first-child) {
-      &::after {
-        border-top-width: 1px;
-      }
-    }
-
-    &__tags {
-      flex: 1;
-    }
-
-    &__tag-green,
-    &__tag-red {
-      font-size: 10px;
-      padding: 3px 5px;
-      margin-right: 5px;
-      border-radius: 2px;
-      display: inline-block;
-    }
-
-    &__tag-green {
-      color: $white;
-      background-color: $green-wx;
-    }
-
-    &__tag-red {
-      color: $gray;
-      padding: 5px 8px;
-      border: 1px solid $gray;
-    }
-
-    &__delivery {
-      padding-left: 15px;
-      background-color: transparent;
-
-      .van-cell__value {
-        color: $gray-darker;
-      }
-    }
-
-    &__present {
-      top: 0;
-      left: 3px;
-      width: 18px;
-      height: 36px;
-      position: absolute;
-      background: url("https://b.yzcdn.cn/v2/image/wap/trade/confirm/present@2x.png") no-repeat;
-      background-size: 18px 36px;
-    }
-
-    .van-button&__message-button {
-      height: 24px;
-      padding: 0 5px;
-      font-size: 10px;
-      line-height: 22px;
-    }
-
-    &__button {
-      padding: 20px 15px 0;
-      .van-button {
-        height: 40px;
-        line-height: 38px;
-      }
-    }
-
-    &__message {
-      width: 100%;
-      height: 100%;
-      background-color: $background-color;
-
-      h2 {
-        color: $gray-dark;
-        font-size: 12px;
-        line-height: 18px;
-        padding: 5px 0 5px 10px;
-      }
-
-      ul {
-        background-color: $white;
-      }
-
-      p,
-      a,
-      label {
-        font-size: 14px;
-        padding: 14px 0;
-        line-height: 20px;
-        vertical-align: top;
-        display: inline-block;
-      }
-
-      label {
-        color: #c9c9c9;
-        min-width: 90px;
-      }
-
-      li {
-        display: flex;
-        padding: 0 10px;
-
-        &:not(:last-child)::after {
-          border-bottom-width: 1px;
-        }
-
-        img {
-          width: 70px;
-          height: 70px;
-        }
-      }
-    }
-  }
-
-  &-empty {
-    margin-left: -15px;
-    text-align: center;
-
-    p {
-      color: $gray-dark;
-      padding: 0 10px;
-      font-size: 14px;
-      line-height: 20px;
-    }
-
-    img {
-      width: 80px;
-      height: 84px;
-      padding: 15px 0;
-    }
-
-    .van-button {
-      height: 41px;
-      margin: 15px 0;
-      padding: 0 10px;
-      line-height: 39px;
-      border-color: $gray-light;
-    }
-  }
-
-  &-header {
-    line-height: 50px;
-
-    a,
-    img,
-    .van-icon {
-      vertical-align: middle;
-    }
-
-    .van-icon {
-      font-size: 18px;
-      margin-right: 5px;
-    }
-
-    a {
-      color: $text-color;
-      font-size: 14px;
-    }
-
-    img {
-      height: 14px;
-      margin-left: 5px;
-    }
-  }
-
-  &-message {
-    textarea {
-      color: $gray-darker;
-      padding: 0;
-      width: 100%;
-      height: 22px;
-      border: none;
-      resize: none;
-      display: block;
-      font-size: 14px;
-      line-height: 22px;
-      transition: height .3s ease-in-out;
-    }
-
-    textarea&-focused {
-      height: 48px;
-    }
-
-    p {
-      color: $gray-darker;
-      text-align: left;
-    }
-
-    .van-cell__title {
-      width: 75px;
-    }
-  }
-
-  &-price {
-    .van-cell__value {
-      color: $red;
-    }
-  }
-}

packages/vant-css/src/stepper.css

@@ -1,12 +1,12 @@
 @import './common/var.css';
 
-.van-quantity {
+.van-stepper {
   font-size: 0;
 
   &--disabled {
-    .van-quantity__input,
-    .van-quantity__minus,
-    .van-quantity__plus {
+    .van-stepper__input,
+    .van-stepper__minus,
+    .van-stepper__plus {
       border-color: $active-color;
     }
   }

packages/vant-css/src/submit-bar.css

@@ -1,6 +1,6 @@
 @import './common/var.css';
 
-.van-pay-order {
+.van-submit-bar {
   left: 0;
   bottom: 0;
   width: 100%;

packages/vant-css/src/tree-select.css

@@ -2,7 +2,7 @@
 @import "./mixins/clearfix.css";
 @import './common/var.css';
 
-.van-deep-select {
+.van-tree-select {
   user-select: none;
   position: relative;
   @mixin clearfix;