Merge pull request #118 from chenjiahan/dev

Toast: fix background color

docs/src/index.js

@@ -29,9 +29,7 @@ router.beforeEach((route, redirect, next) => {
 });
 
 router.afterEach(() => {
-  if (!isMobile) {
   window.scrollTo(0, 0);
-  }
   window.syncPath();
 });
 

packages/dialog/index.js

@@ -58,5 +58,5 @@ Dialog.close = () => {
 
 export default Dialog;
 export {
-  Dialog
+  DialogComponent as Dialog
 };

packages/pay-order/index.vue

@@ -1,6 +1,8 @@
 <template>
   <div class="van-pay-order">
-    <div class="van-pay-order__tip" v-show="tip || hasTipSlot">{{ tip }}<slot name="tip" /></div>
+    <div class="van-pay-order__tip" v-show="tip || $slots.tip">
+      <slot name="tip">{{ tip }}</slot>
+    </div>
     <div class="van-pay-order__bar">
       <div class="van-pay-order__price">
         <template v-if="hasPrice">
@@ -49,9 +51,6 @@ export default {
     priceDecimal() {
       const decimal = this.price % 100;
       return (decimal < 10 ? '0' : '') + decimal;
-    },
-    hasTipSlot () {
-      return !!this.$slots['tip']
     }
   },
 

packages/vant-css/src/toast.css

@@ -14,7 +14,7 @@
   justify-content: center;
   flex-direction: column;
   transform: translate3d(-50%, -50%, 0);
-  background-color: rgb(39, 39, 39, .7);
+  background-color: rgba(39, 39, 39, .7);
 
   &-wrapper {
     transition: opacity .2s;