update

Author: falstack

package.json

@@ -17,7 +17,7 @@
   "dependencies": {
     "h5-vue-scroller": "^1.0.1",
     "normalize.css": "^8.0.1",
-    "v-switcher": "^1.0.77",
+    "v-switcher": "^1.0.78",
     "vue": "^2.6.10",
     "vue-flow-render": "^1.0.5",
     "vue-mixin-store": "^1.1.64",
@@ -31,13 +31,13 @@
     "@vue/eslint-config-standard": "^4.0.0",
     "babel-eslint": "^10.0.1",
     "core-js": "2.6.9",
-    "eslint": "^6.2.0",
+    "eslint": "^6.2.1",
     "eslint-plugin-vue": "^5.0.0",
     "faker": "^4.1.0",
     "node-sass": "^4.12.0",
     "nuxt": "^2.8.1",
     "sass": "^1.22.10",
-    "sass-loader": "^7.2.0",
+    "sass-loader": "^7.3.1",
     "vue-template-compiler": "^2.6.10"
   }
 }

pages/index.vue

@@ -186,8 +186,10 @@
           @scroll-down="handlePullUp"
           @bottom="handleLoadMore"
           @refresh="handleRefresh"
+          @refresh-end="handleRefreshEnd"
         >
           <ul class="ul-wrap">
+            <Refresher ref="refresher" @refresh="getNewData" />
             <li class="hoz-wrap">
               <recommended ref="rec" />
             </li>
@@ -201,6 +203,7 @@
                 count: 10
               }"
               :use-first-loading="true"
+              :callback="handleDataCallback"
             >
               <waterfall ref="render" slot-scope="{ flow, count }" :total="count" :items="flow" />
               <!--
@@ -221,11 +224,13 @@
 import Waterfall from '../examples/components/Waterfall'
 import SingleList from '../examples/components/SingleList'
 import Recommended from '../examples/components/Recommended'
+import Refresher from '../examples/components/Refresher'
 import { getCarousel } from '../examples/utils/api'
 
 export default {
   name: 'Index',
   components: {
+    Refresher,
     Waterfall,
     SingleList,
     Recommended
@@ -280,8 +285,18 @@ export default {
     handleBtnClick () {
       alert('排序')
     },
-    handleRefresh () {
+    handleRefresh ({ offset }) {
       this.hiddenCarousel = false
+      this.$refs.refresher[this.activeIndex].pull(offset)
+    },
+    handleRefreshEnd() {
+      this.$refs.refresher[this.activeIndex].close()
+    },
+    getNewData() {
+      this.$refs.loader[this.activeIndex].refresh(true)
+    },
+    handleDataCallback({ refresh }) {
+      refresh && this.$refs.refresher[this.activeIndex].finish()
     }
   }
 }

yarn.lock

@@ -3991,13 +3991,20 @@ eslint-scope@^5.0.0:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
-eslint-utils@^1.3.0, eslint-utils@^1.3.1, eslint-utils@^1.4.0:
+eslint-utils@^1.3.0, eslint-utils@^1.3.1:
   version "1.4.0"
   resolved "https://registry.npm.taobao.org/eslint-utils/download/eslint-utils-1.4.0.tgz#e2c3c8dba768425f897cf0f9e51fe2e241485d4c"
   integrity sha1-4sPI26doQl+JfPD55R/i4kFIXUw=
   dependencies:
     eslint-visitor-keys "^1.0.0"
 
+eslint-utils@^1.4.2:
+  version "1.4.2"
+  resolved "https://registry.npm.taobao.org/eslint-utils/download/eslint-utils-1.4.2.tgz?cache=0&sync_timestamp=1566297013046&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Feslint-utils%2Fdownload%2Feslint-utils-1.4.2.tgz#166a5180ef6ab7eb462f162fd0e6f2463d7309ab"
+  integrity sha1-FmpRgO9qt+tGLxYv0ObyRj1zCas=
+  dependencies:
+    eslint-visitor-keys "^1.0.0"
+
 eslint-visitor-keys@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npm.taobao.org/eslint-visitor-keys/download/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d"
@@ -4052,10 +4059,10 @@ eslint@^4.19.1:
     table "4.0.2"
     text-table "~0.2.0"
 
-eslint@^6.2.0:
-  version "6.2.0"
-  resolved "https://registry.npm.taobao.org/eslint/download/eslint-6.2.0.tgz#4c42c20e3fc03f28db25f34ccba621a9a47e8b56"
-  integrity sha1-TELCDj/APyjbJfNMy6YhqaR+i1Y=
+eslint@^6.2.1:
+  version "6.2.1"
+  resolved "https://registry.npm.taobao.org/eslint/download/eslint-6.2.1.tgz?cache=0&sync_timestamp=1566300526377&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Feslint%2Fdownload%2Feslint-6.2.1.tgz#66c2e4fe8b6356b9f01e828adc3ad04030122df1"
+  integrity sha1-ZsLk/otjVrnwHoKK3DrQQDASLfE=
   dependencies:
     "@babel/code-frame" "^7.0.0"
     ajv "^6.10.0"
@@ -4064,7 +4071,7 @@ eslint@^6.2.0:
     debug "^4.0.1"
     doctrine "^3.0.0"
     eslint-scope "^5.0.0"
-    eslint-utils "^1.4.0"
+    eslint-utils "^1.4.2"
     eslint-visitor-keys "^1.1.0"
     espree "^6.1.0"
     esquery "^1.0.1"
@@ -8655,16 +8662,16 @@ sass-graph@^2.2.4:
     scss-tokenizer "^0.2.3"
     yargs "^7.0.0"
 
-sass-loader@^7.2.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-7.2.0.tgz#e34115239309d15b2527cb62b5dfefb62a96ff7f"
-  integrity sha512-h8yUWaWtsbuIiOCgR9fd9c2lRXZ2uG+h8Dzg/AGNj+Hg/3TO8+BBAW9mEP+mh8ei+qBKqSJ0F1FLlYjNBc61OA==
+sass-loader@^7.3.1:
+  version "7.3.1"
+  resolved "https://registry.npm.taobao.org/sass-loader/download/sass-loader-7.3.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsass-loader%2Fdownload%2Fsass-loader-7.3.1.tgz#a5bf68a04bcea1c13ff842d747150f7ab7d0d23f"
+  integrity sha1-pb9ooEvOocE/+ELXRxUPerfQ0j8=
   dependencies:
     clone-deep "^4.0.1"
     loader-utils "^1.0.1"
     neo-async "^2.5.0"
     pify "^4.0.1"
-    semver "^5.5.0"
+    semver "^6.3.0"
 
 sass@^1.22.10:
   version "1.22.10"
@@ -8725,7 +8732,7 @@ selfsigned@^1.10.4:
   resolved "https://registry.npm.taobao.org/semver/download/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
   integrity sha1-eQp89v6lRZuslhELKbYEEtyP+Ws=
 
-semver@^6.0.0, semver@^6.1.1, semver@^6.1.2:
+semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
   version "6.3.0"
   resolved "https://registry.npm.taobao.org/semver/download/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha1-7gpkyK9ejO6mdoexM3YeG+y9HT0=
@@ -9908,10 +9915,10 @@ uuid@^3.0.1, uuid@^3.3.2:
   resolved "https://registry.npm.taobao.org/uuid/download/uuid-3.3.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fuuid%2Fdownload%2Fuuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
   integrity sha1-G0r0lV6zB3xQHCOHL8ZROBFYcTE=
 
-v-switcher@^1.0.77:
-  version "1.0.77"
-  resolved "https://registry.yarnpkg.com/v-switcher/-/v-switcher-1.0.77.tgz#be7c214fcdb82ebfce24c8de17be39b042cd6301"
-  integrity sha512-ve5LBTeK3HaAhqBu0cCMDqWZjX2rsBp8L4kvZQaZiC4D9LvcLbcyRZze/q9QMn1eaKV48Boq8xeart05D2lQvA==
+v-switcher@^1.0.78:
+  version "1.0.78"
+  resolved "https://registry.npm.taobao.org/v-switcher/download/v-switcher-1.0.78.tgz#a87593d944f0b3a25c5c81b52eeb9e382a7a0bf2"
+  integrity sha1-qHWT2UTws6JcXIG1LuueOCp6C/I=
   dependencies:
     vue "^2.6.6"