From df2bbf808e6395d9d15635c78e14ec613bc46d3c Mon Sep 17 00:00:00 2001
From: wg <247026287@qq.com>
Date: Wed, 21 Jun 2017 21:01:08 +0800
Subject: [PATCH] =?UTF-8?q?PopupPicker=EF=BC=9Apopup-picker-header=20add?=
 =?UTF-8?q?=20touchmove.prevent=20event=20#1596?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/popup-picker/index.vue | 2 +-
 src/components/popup-picker/metas.yml | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/components/popup-picker/index.vue b/src/components/popup-picker/index.vue
index e100d3a29..62113e152 100755
--- a/src/components/popup-picker/index.vue
+++ b/src/components/popup-picker/index.vue
@@ -27,7 +27,7 @@
       @on-hide="onPopupHide"
       @on-show="onPopupShow">
         <div class="vux-popup-picker-container">
-          <div class="vux-popup-picker-header">
+          <div class="vux-popup-picker-header" @touchmove.prevent>
             <flexbox>
               <flexbox-item class="vux-popup-picker-header-menu vux-popup-picker-cancel" @click.native="onHide(false)">{{ cancelText || $t('cancel_text') }}</flexbox-item>
               <flexbox-item class="vux-popup-picker-header-menu vux-popup-picker-header-menu-right" @click.native="onHide(true)">{{ confirmText || $t('confirm_text') }}</flexbox-item>
diff --git a/src/components/popup-picker/metas.yml b/src/components/popup-picker/metas.yml
index 0e94c67ac..c4444709e 100644
--- a/src/components/popup-picker/metas.yml
+++ b/src/components/popup-picker/metas.yml
@@ -71,6 +71,11 @@ events:
     en: emits when popup is closed
     zh-CN: 弹窗关闭时触发
 changes:
+  next:
+    en:
+      - '[fix] popup-picker-header add touchmove.prevent event #1596'
+    zh-CN:
+      - '[fix] popup-picker头部区域屏蔽滑动事件 #1596'
   v2.3.8:
     en:
       - '[fix] Fix placeholder missing on iOS9 and iOS8 #1293'