Merge branch 'spp' into 'master'

Spp

See merge request !12

src/views/tabbar/admin_home.vue

@@ -36,6 +36,12 @@
     </div>
 
     <van-pull-refresh v-model="isloading" @refresh="onRefresh">
+      <van-list
+        v-model="loading"
+        :finished="finished"
+        finished-text="没有更多了~"
+        @load="onmore"
+      >
       <div class="order-item" v-for="(item, index) in list" :key="index">
         <div class="title">{{item.order_status_display }}</div>
         <div class="item flex-h flex-vc">
@@ -103,6 +109,7 @@
       </div>
       <!-- 空数据 -->
       <van-empty class="custom-image" description="暂无工单哦~" v-if="!list.length && !more" />
+      </van-list>
     </van-pull-refresh>
     <div class="blank"></div>
     <!-- 取消工单原因弹窗 -->
@@ -216,6 +223,9 @@ export default {
             more: true,
             locked: false,
             limit: 10,
+            // 上拉加载
+            loading: false,
+            finished: false,
 
             imgList: [],
             // 转单
@@ -228,6 +238,9 @@ export default {
         this.getWorkers()
     },
     methods: {
+      onmore(){
+        this.getList()
+      },
       preview(img, index){
             let temp = img.map(item=>{
                 return item.url
@@ -369,6 +382,8 @@ export default {
             this.more = true
             this.locked = false
             this.isloading = false
+            this.loading = false
+            this.finished = false
         },
         // 获取工单列表
         getList () {
@@ -402,6 +417,8 @@ export default {
                         this.locked = false
                         this.isloading = false
                         this.count = data.count
+                        this.loading = false
+                        this.finished = !data.more;
                         if(data.worker){
                           this.worker_id = data.worker.id
                           this.workerName = data.worker.name