ytj

src/components/vue-load-more/index.vue

@@ -1,5 +1,11 @@
 <template>
-  <div class="yo-scroll" :class="{'down':(state===0),'up':(state==1),refresh:(state===2),touch:touching}" @touchstart="touchStart($event)" @touchmove="touchMove($event)" @touchend="touchEnd($event)">
+  <div
+    class="yo-scroll"
+    :class="{'down':(state===0),'up':(state==1),refresh:(state===2),touch:touching}"
+    @touchstart="touchStart($event)"
+    @touchmove="touchMove($event)"
+    @touchend="touchEnd($event)"
+  >
     <section class="inner" :style="{ transform: 'translate3d(0, 0px, 0)' }">
       <header class="pull-refresh">
         <slot name="pull-refresh">
@@ -8,8 +14,7 @@
           <span class="refresh-tip">加载中……</span>
         </slot>
       </header>
-      <slot>
-      </slot>
+      <slot></slot>
       <footer class="load-more">
         <slot name="load-more">
           <span v-show="downFlag === false">上拉加载更多</span>
@@ -34,10 +39,10 @@ export default {
     },
     enableRefresh: { // 下拉刷新
       type: Boolean,
-      default: true
+      default: false
     },
     dataList: { // 数据列表
-      default: false,
+      default: undefined,
       required: false
     },
     onRefresh: { // 加载方法
@@ -63,7 +68,7 @@ export default {
     }
   },
   created () {
-
+    console.log(this.dataList)
   },
   methods: {
     touchStart (e) {
@@ -76,7 +81,7 @@ export default {
       this.$el.querySelector('.load-more').style.display = 'block'
     },
     touchMove (e) {
-      if (!this.enableRefresh || this.dataList.noFlag || !this.touching) {
+      if (this.dataList.noFlag || !this.touching) {
         return
       }
       let diff = e.targetTouches[0].pageY - this.startY - this.startScroll
@@ -99,9 +104,9 @@ export default {
       }
     },
     touchEnd (e) {
-      if (!this.enableRefresh) {
-        return
-      }
+      // if (!this.enableRefresh) {
+      //   return
+      // }
       this.touching = false
       if (this.state === 2) { // in refreshing
         this.state = 2
@@ -128,9 +133,9 @@ export default {
       }
       // --------end--------
 
-      if (!this.enableInfinite || this.infiniteLoading) {
-        return
-      }
+      // if (!this.enableInfinite || this.infiniteLoading) {
+      //   return
+      // }
 
       let outerHeight = this.$el.clientHeight
       let innerHeight = this.$el.querySelector('.inner').clientHeight
@@ -170,6 +175,7 @@ export default {
 
     infiniteDone () {
       this.infiniteLoading = false
+      this.downFlag = false
     }
   }
 }
@@ -228,7 +234,7 @@ export default {
     }
     .up-tip:before,
     .refresh-tip:before {
-      content: "";
+      content: '';
       display: inline-block;
       width: 1.6rem;
       height: 0.7rem;

src/pages/user/mainPage/libraryIndex/index.vue

@@ -86,7 +86,7 @@ export default {
       cases: [],
       indexSearchKey: '',
       page: 0,
-      pagesize: 4,
+      pagesize: 8,
       scrollData: {
         noFlag: false // 暂无更多数据显示
       },
@@ -178,13 +178,12 @@ export default {
         pagesize: this.pagesize,
       }).then((res) => {
         console.log(res)
+        res.list = res.list || []
         if (res.list.length < res.pageSize) {
-          console.log(more.style.display)
           more.style.display='none'// 隐藏加载条
+          this.scrollData.noFlag = true
         } else {
-          console.log(more.style.display)
           more.style.display='none'// 隐藏加载条
-          this.scrollData.noFlag = true
         }
       })
       this.getMineBook({

src/store/book/index.js

@@ -16,7 +16,7 @@ export default {
       state.types = payload
     },
     updateRecommendBooks (state, payload) {
-      state.recommends.list = state.recommends.list.concat(payload.list)
+      payload.list ? state.recommends.list = state.recommends.list.concat(payload.list) : null
     },
     updateBookList (state, payload) {
       state.books = payload
@@ -105,7 +105,7 @@ export default {
         }).catch((err) => {
           reject(err)
         })
-      }) 
+      })
     }
   }
 }