From 733c9a2acf830e663ad7431e85b395f954cbdc62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E7=90=AA?= <572962673@qq.com>
Date: Wed, 16 May 2018 10:27:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9pullrefresh=20=E7=BB=93?=
 =?UTF-8?q?=E6=9D=9F=E5=9B=9E=E8=B0=83=E6=A8=A1=E5=BC=8F=E5=90=8C=E6=97=B6?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81callback=E5=92=8Cpromise?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .babelrc                                      |   5 +-
 example/main.js                               |   2 +
 example/routers/index.vue                     |   1 +
 example/routers/pullRefresh.vue               | 134 ++++++++++++++++++
 package.json                                  |   3 +
 .../pullrefresh/src/pullrefresh.vue           |  10 +-
 6 files changed, 151 insertions(+), 4 deletions(-)
 create mode 100644 example/routers/pullRefresh.vue

diff --git a/.babelrc b/.babelrc
index e027e954..fb53b482 100644
--- a/.babelrc
+++ b/.babelrc
@@ -1,5 +1,6 @@
 {
   "presets": [
-    ["es2015"]
-  ]
+    ["env","stage-2"]
+  ],
+  "plugins": ["transform-runtime"]
 }
diff --git a/example/main.js b/example/main.js
index ef017787..10ca0547 100644
--- a/example/main.js
+++ b/example/main.js
@@ -49,6 +49,7 @@ import CheckList from './routers/checklist.vue';
 import Search from './routers/search.vue';
 import ScrollNav from './routers/scrollnav.vue';
 import Preview from './routers/preview.vue';
+import PullRefresh from './routers/pullRefresh.vue';
 
 import App from './app.vue';
 
@@ -107,6 +108,7 @@ const router = new VueRouter({
         {path: '/search', name: 'search', component: Search},
         {path: '/scrollnav', name: 'scrollnav', component: ScrollNav},
         {path: '/preview', name: 'preview', component: Preview},
+        {path: '/pullRefresh', name: 'pullRefresh', component: PullRefresh},
     ]
 });
 
diff --git a/example/routers/index.vue b/example/routers/index.vue
index 33f51222..fac056e4 100644
--- a/example/routers/index.vue
+++ b/example/routers/index.vue
@@ -52,6 +52,7 @@
                     {icon: 'demo-icons-scrollnav', name: 'ScrollNav', link: '/scrollnav'},
                     {icon: 'demo-icons-scrolltab', name: 'ScrollTab', link: '/scrolltab'},
                     {icon: 'demo-icons-preview', name: 'Preview', link: '/preview'},
+                    {icon: 'demo-icons-preview', name: 'PullRefresh', link: '/pullRefresh'},
                 ]
             }
         }
diff --git a/example/routers/pullRefresh.vue b/example/routers/pullRefresh.vue
new file mode 100644
index 00000000..41b44692
--- /dev/null
+++ b/example/routers/pullRefresh.vue
@@ -0,0 +1,134 @@
+<template>
+    <yd-pullrefresh :callback="type==0?loadListCallback:loadList" ref="pullrefreshDemo">
+
+        <yd-list theme="4">
+            <yd-list-item v-for="item, key in list" :key="key">
+                <img slot="img" :src="item.img">
+                <span slot="title">{{item.title}}</span>
+                <yd-list-other slot="other">
+                    <div>
+                        <span class="list-price"><em>¥</em>{{item.marketprice}}</span>
+                        <span class="list-del-price">¥{{item.productprice}}</span>
+                    </div>
+                    <div>content</div>
+                </yd-list-other>
+            </yd-list-item>
+        </yd-list>
+        <div class="tab-btn">
+            <button :class='{active:type==1}' @click="typeChange(1)">Promise</button>
+            <button :class='{active:type==0}' @click="typeChange(0)">Callback</button>
+        </div>
+    </yd-pullrefresh>
+</template>
+<style>
+    .tab-btn{
+        position: fixed;
+        bottom: 10px;
+        right:10px;
+        z-index: 100;
+    }
+    .tab-btn>button{
+        padding: 10px 15px;
+        border: none;
+        background-color:#7cc9ff ;
+        color:#ffffff;
+        box-shadow:0 0 5px 2px #B7D0E1;
+    }
+    .tab-btn>button.active{
+        background-color: #e95a4e;
+    }
+</style>
+<script type="text/babel">
+    export default {
+        data() {
+            return {
+                type:0,
+                page: 1,
+                list: []
+            }
+        },
+        mounted(){
+            this.init();
+        },
+        methods: {
+            init(){
+                this.$set(this,'page',1);
+                this.$set(this,'list',[
+                    {
+                        img: "http://img1.shikee.com/try/2016/06/23/14381920926024616259.jpg",
+                        title: "标题标题标题标题标题",
+                        marketprice: 56.23,
+                        productprice: 89.36
+                    },
+                    {
+                        img: "http://img1.shikee.com/try/2016/06/21/10172020923917672923.jpg",
+                        title: "骆驼男装2016夏装男士短袖T恤 圆领衣服 印花男装体恤 半袖打底衫",
+                        marketprice: 56.23,
+                        productprice: 89.36
+                    },
+                    {
+                        img: "http://img1.shikee.com/try/2016/06/23/15395220917905380014.jpg",
+                        title: "条纹短袖T恤男士韩版衣服大码潮流男装夏季圆领体恤2016新款半袖",
+                        marketprice: 56.23,
+                        productprice: 89.36
+                    },
+                    {
+                        img: "http://img1.shikee.com/try/2016/06/25/14244120933639105658.jpg",
+                        title: "夏季青少年衣服男生潮牌t恤 男士 夏秋学生 日系棉短袖半袖男小衫",
+                        marketprice: 56.23,
+                        productprice: 89.36
+                    },
+                    {
+                        img: "http://img1.shikee.com/try/2016/06/26/12365720933909085511.jpg",
+                        title: "2016夏装新款时尚潮流短袖T恤男纯棉V领日系青少年韩版夏季上衣服",
+                        marketprice: 56.23,
+                        productprice: 89.36
+                    },
+                    {
+                        img: "http://img1.shikee.com/try/2016/06/19/09430120929215230041.jpg",
+                        title: "男装衣服男夏t恤 男士短袖t恤圆领夏季潮牌宽松原宿风半截袖男",
+                        marketprice: 56.23,
+                        productprice: 89.36
+                    }
+                ])
+            },
+            typeChange(type){
+                this.init();
+                this.$set(this,'type',type);
+            },
+            async loadList() {
+                const url = 'http://list.ydui.org/getdata.php';
+                console.log(this.page);
+                let response = await this.$http.jsonp(url, {params: {type: 'pulldown', page: this.page}});
+                const _list = response.body;
+
+                this.list = [..._list, ...this.list];
+
+                this.$dialog.toast({
+                    mes: _list.length > 0 ? '为您更新了' + _list.length + '条内容' : '已是最新内容'
+                });
+
+                this.page++;
+
+                return true
+            },
+            loadListCallback() {
+                const url = 'http://list.ydui.org/getdata.php';
+                console.log(this.page);
+                this.$http.jsonp(url, {params: {type: 'pulldown', page: this.page}}).then((response)=>{
+                    const _list = response.body;
+
+                    this.list = [..._list, ...this.list];
+
+                    this.$dialog.toast({
+                        mes: _list.length > 0 ? '为您更新了' + _list.length + '条内容' : '已是最新内容'
+                    });
+
+                    this.page++;
+
+                    this.$refs.pullrefreshDemo.$emit('ydui.pullrefresh.finishLoad');
+                });
+            }
+        }
+    }
+</script>
diff --git a/package.json b/package.json
index 9a9d5c3e..9fd6ac91 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,10 @@
     "autoprefixer": "^6.6.1",
     "babel-core": "^6.21.0",
     "babel-loader": "^6.2.10",
+    "babel-plugin-transform-runtime": "^6.23.0",
+    "babel-preset-env": "^1.7.0",
     "babel-preset-es2015": "^6.18.0",
+    "babel-preset-stage-2": "^6.24.1",
     "css-loader": "^0.26.1",
     "extract-text-webpack-plugin": "^1.0.1",
     "file-loader": "^0.10.1",
diff --git a/src/components/pullrefresh/src/pullrefresh.vue b/src/components/pullrefresh/src/pullrefresh.vue
index 1b7198b0..bf3facd2 100644
--- a/src/components/pullrefresh/src/pullrefresh.vue
+++ b/src/components/pullrefresh/src/pullrefresh.vue
@@ -218,9 +218,15 @@
 
                 this.resetParams();
             },
-            triggerLoad() {
+            async triggerLoad() {
                 this.touches.loading = true;
-                this.callback && this.callback();
+                var fn = this.callback&&this.callback();
+                if(fn&&fn.then&&typeof fn.then =='function'){
+                    let ser = await fn;
+                    if(ser){
+                        this.resetParams();
+                    }
+                }
             },
             resetParams() {
                 this.dragTip.translate = 0;