From 66c3b2c6eb8b2a43ee15c54d36fdf96805112d4c Mon Sep 17 00:00:00 2001
From: Raistlin916 <raistlin916@gmail.com>
Date: Mon, 7 Aug 2017 20:07:33 +0800
Subject: [PATCH 1/4] fix: one page swiper broken

---
 packages/swipe/src/swipe.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/swipe/src/swipe.vue b/packages/swipe/src/swipe.vue
index f1b9862be..5063cf8e2 100644
--- a/packages/swipe/src/swipe.vue
+++ b/packages/swipe/src/swipe.vue
@@ -36,6 +36,11 @@ export default {
   },
 
   mounted() {
+    const pages = this.$el.querySelectorAll('.van-swipe-item')
+    if (pages.length <= 1) {
+      return
+    }
+
     this.input = new Input(this.$el, {
       listenMoving: true
     });

From cc3aad3802a7dbf947421bc75b550021977c3af3 Mon Sep 17 00:00:00 2001
From: Raistlin916 <raistlin916@gmail.com>
Date: Wed, 9 Aug 2017 12:15:18 +0800
Subject: [PATCH 2/4] fix: one page swipe error

---
 packages/swipe/src/scroll.js      | 12 ++++++------
 packages/swipe/src/swipe-item.vue |  7 +++++++
 packages/swipe/src/swipe.vue      | 27 ++++++++++++++++++++-------
 3 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/packages/swipe/src/scroll.js b/packages/swipe/src/scroll.js
index d70b1aba1..988e74e49 100755
--- a/packages/swipe/src/scroll.js
+++ b/packages/swipe/src/scroll.js
@@ -69,12 +69,6 @@ extend(Scroll.prototype, {
     var leftOffset = offset - wrapWidth;
     var rightOffset = offset + wrapWidth;
 
-    page = this.getCurrentPage();
-    if (page) {
-      page.style['-webkit-transform'] = 'translate3d(' + offset + 'px, 0, 0)';
-      page.style['display'] = 'block';
-    }
-
     leftPage = this.pages[this.mapLoopPage(currentOffsetPage - 1)];
     if (leftPage) {
       if (Math.abs(leftOffset) <= wrapWidth) {
@@ -96,6 +90,12 @@ extend(Scroll.prototype, {
         }
       }
     }
+
+    page = this.getCurrentPage();
+    if (page) {
+      page.style['-webkit-transform'] = 'translate3d(' + offset + 'px, 0, 0)';
+      page.style['display'] = 'block';
+    }
   },
 
   movePage: function(dist, isEnd) {
diff --git a/packages/swipe/src/swipe-item.vue b/packages/swipe/src/swipe-item.vue
index ba4489474..dafed2fd2 100644
--- a/packages/swipe/src/swipe-item.vue
+++ b/packages/swipe/src/swipe-item.vue
@@ -10,6 +10,13 @@ export default {
 
   beforeCreate() {
     this.$parent.swipes.push(this);
+  },
+
+  destroyed() {
+    const index = this.$parent.swipes.indexOf(this)
+    if (index > -1) {
+      this.$parent.swipes.splice(index, 1)
+    }
   }
 };
 </script>
diff --git a/packages/swipe/src/swipe.vue b/packages/swipe/src/swipe.vue
index 5063cf8e2..4b6d818b6 100644
--- a/packages/swipe/src/swipe.vue
+++ b/packages/swipe/src/swipe.vue
@@ -36,11 +36,6 @@ export default {
   },
 
   mounted() {
-    const pages = this.$el.querySelectorAll('.van-swipe-item')
-    if (pages.length <= 1) {
-      return
-    }
-
     this.input = new Input(this.$el, {
       listenMoving: true
     });
@@ -66,10 +61,28 @@ export default {
     }).on('autoPlay', function(dist, isEnd) {
       scroll.movePage(dist.x, isEnd);
     });
+    this.dummy = dummy
   },
 
-  updated() {
-    this.scroll.update();
+  watch: {
+    swipes(value) {
+      if (this.autoPlay && value.length > 1) {
+        this.dummy.initMove()
+      } else {
+        this.dummy.clearMove()
+      }
+      this.scroll.update();
+      return value
+    },
+
+    autoPlay(value) {
+      if (value && this.swipes.length > 1) {
+        this.dummy.initMove()
+      } else {
+        this.dummy.clearMove()
+      }
+      return value
+    }
   },
 
   methods: {

From efbdc0d76fc7a5bfac6b4e842223cc155312dfd3 Mon Sep 17 00:00:00 2001
From: Raistlin916 <raistlin916@gmail.com>
Date: Wed, 9 Aug 2017 12:17:26 +0800
Subject: [PATCH 3/4] remove

---
 packages/swipe/src/swipe.vue | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/packages/swipe/src/swipe.vue b/packages/swipe/src/swipe.vue
index 68b0fc348..4b6d818b6 100644
--- a/packages/swipe/src/swipe.vue
+++ b/packages/swipe/src/swipe.vue
@@ -36,11 +36,6 @@ export default {
   },
 
   mounted() {
-    const pages = this.$el.querySelectorAll('.van-swipe-item')
-    if (pages.length <= 1) {
-      return
-    }
-
     this.input = new Input(this.$el, {
       listenMoving: true
     });

From cdb67fe6066054996fe4439d693e8f335d944401 Mon Sep 17 00:00:00 2001
From: Raistlin916 <raistlin916@gmail.com>
Date: Fri, 1 Sep 2017 14:54:15 +0800
Subject: [PATCH 4/4] payorder add tip slot

---
 docs/examples-docs/pay-order.md | 28 ++++++++++++++++++++++++++++
 packages/pay-order/index.vue    |  5 ++++-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/docs/examples-docs/pay-order.md b/docs/examples-docs/pay-order.md
index 1df37b4a2..7513b0771 100644
--- a/docs/examples-docs/pay-order.md
+++ b/docs/examples-docs/pay-order.md
@@ -7,6 +7,9 @@ export default {
   methods: {
     onClickButton() {
       Toast('点击按钮');
+    },
+    onClickEditAddress() {
+      Toast('修改地址');
     }
   }
 }
@@ -17,6 +20,9 @@ export default {
   .van-pay-order {
     position: relative;
   }
+  .van-edit-address {
+    color: #38F;
+  }
 }
 </style>
 
@@ -69,6 +75,22 @@ Vue.component(PayOrder.name, PayOrder);
 ```
 :::
 
+#### 
+提示文案中的额外操作和说明
+:::demo 提示文案中添加操作
+```html
+<van-pay-order
+  :price="3050"
+  button-text="提交订单"
+  @submit="onClickButton"
+>
+  <span slot="tip">
+    您的收货地址不支持同城送, <span class="van-edit-address" @click="onClickEditAddress">修改地址 ></span>
+  </span>
+</van-pay-order>
+```
+:::
+
 ### API
 
 | 参数       | 说明      | 类型       | 默认值       | 必须      |
@@ -85,3 +107,9 @@ Vue.component(PayOrder.name, PayOrder);
 | 事件名       | 说明      | 参数       |
 |-----------|-----------|-----------|
 | submit | 按钮点击事件回调 | - |
+
+### Slot
+
+| 名称      | 说明      |
+|-----------|-----------|
+| tip | 提示文案中的额外操作和说明 |
diff --git a/packages/pay-order/index.vue b/packages/pay-order/index.vue
index c0d97122c..18a71ffe2 100644
--- a/packages/pay-order/index.vue
+++ b/packages/pay-order/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="van-pay-order">
-    <div class="van-pay-order__tip" v-show="tip">{{ tip }}</div>
+    <div class="van-pay-order__tip" v-show="tip || hasTipSlot">{{ tip }}<slot name="tip" /></div>
     <div class="van-pay-order__bar">
       <div class="van-pay-order__price">
         <template v-if="hasPrice">
@@ -49,6 +49,9 @@ export default {
     priceDecimal() {
       const decimal = this.price % 100;
       return (decimal < 10 ? '0' : '') + decimal;
+    },
+    hasTipSlot () {
+      return !!this.$slots['tip']
     }
   },