Merge remote-tracking branch 'origin/dev_cd' into dev_cd

pages/shop.vue

@@ -25,7 +25,7 @@
                 </div>
                 <div class="shop__list__one">
                     <div class="view__title">车主精选 养车必备</div>
-                    <scroll-list ref="list" :option="option" @load="load">
+                    <scroll-list ref="list" :option="option" @load="load" @refresh="refresh">
                         <div class="list__one__items" v-if="boutiqueMallList.length>0">
                             <div class="one__item" v-for="(vo,inx) in boutiqueMallList" :key="inx" @click="goDetail(vo.id)">
                                 <div class="one__item__img">
@@ -103,8 +103,36 @@ export default {
                             list: this.boutiqueMallList,
                             total: res.data.data.total
                         });
+                    } else {
+                        // 加载失败
+                        this.$refs.list.loadFail()
+                    }
+                })
+            }, this.$u.random(100, 1000));
+        },
+        // 刷新
+        refresh(paging) {
+            setTimeout(() => {
+                let opts = {
+                    url: '/app/index/mall/list?pageSize=' + paging.size + '&pageNum=' + paging.page,
+                    method: 'get'
+                };
+                this.http.httpRequest(opts, {
+                    classification: "2"
+                }).then(res => {
+                    if (res.data.code == 200) {
+                        let list = res.data.data.rows
+                        this.boutiqueMallList = list;
+                
+                        // 加载成功  参数对象{list: 当前列表,total: 数据总长度(后端查询的total)}
+                        this.$refs.list.refreshSuccess({
+                            list: this.boutiqueMallList,
+                            total: res.data.data.total
+                        });
                         // 加载失败
                         // this.$refs.list.loadFail()
+                    } else {
+                         this.$refs.list.refreshFail()
                     }
                 })
             }, this.$u.random(100, 1000));

pagesB/pages/move-car/myCall.vue

@@ -5,7 +5,7 @@
 <template>
 <view class="appCotent">
 <div class="myRecord">
-  <scroll-list ref="list" :option="option" @load="load">
+  <scroll-list ref="list" :option="option" @load="load" @refresh="refresh">
     <div class="record__item" v-for="(vo,inx) in items" :key="inx">
         <div class="item__top">
             <div class="top__time">
@@ -65,11 +65,33 @@ export default {
                 list: this.items,
                 total: res.data.total
               });
+            } else {
               // 加载失败
-              // this.$refs.list.loadFail()
+              this.$refs.list.loadFail()
             }
           })
+        }, this.$u.random(100, 1000));
+      },
+      // 刷新
+      refresh(paging) {
+        setTimeout(() => {
+          let list = [];
+          let opts = { url: '/app/moveLog/apply/list?pageSize='+paging.size+'&pageNum='+paging.page, method: 'get' };
+          this.http.httpTokenRequest(opts, {}).then(res => {
+            if (res.data.code == 200) {
+              list = res.data.rows
+              this.items = list
 
+              // 加载成功  参数对象{list: 当前列表,total: 数据总长度(后端查询的total)}
+              this.$refs.list.refreshSuccess({
+                list: this.items,
+                total: res.data.total
+              });
+            } else {
+              // 加载失败
+              this.$refs.list.refreshFail()
+            }
+          })
         }, this.$u.random(100, 1000));
       },
       goDetail(id){

pagesB/pages/move-car/myRecord.vue

@@ -5,7 +5,7 @@
 <template>
 <view class="appCotent">
     <div class="myRecord">
-        <scroll-list ref="list" :option="option" @load="load">
+        <scroll-list ref="list" :option="option" @load="load" @refresh="refresh">
             <div class="record__item" v-for="(vo,inx) in items" :key="inx">
                 <div class="item__top">
                     <div class="top__time">
@@ -67,11 +67,35 @@ export default {
                             list: this.items,
                             total: res.data.total
                         });
+                    } else {
+                      // 加载失败
+                      this.$refs.list.loadFail()
                     }
                 })
-
+            }, this.$u.random(100, 1000));
+        },
+        // 刷新
+        refresh(paging) {
+          setTimeout(() => {
+            let list = [];
+            let opts = {
+              url: '/app/moveLog/my/list?pageSize=' + paging.size + '&pageNum=' + paging.page,
+              method: 'get'
+            };
+            this.http.httpTokenRequest(opts, {}).then(res => {
+              if (res.data.code == 200) {
+                list = res.data.rows
+                this.items = [...this.items, ...list]
+                // 加载成功  参数对象{list: 当前列表,total: 数据总长度(后端查询的total)}
+                this.$refs.list.refreshSuccess({
+                  list: this.items,
+                  total: res.data.total
+                });
+              } else {
                 // 加载失败
-                // this.$refs.list.loadFail()
+                this.$refs.list.refreshFail()
+              }
+            })
           }, this.$u.random(100, 1000));
         },
         goDetail(id) {

pagesD/pages/personal/myOrder.vue

@@ -366,12 +366,6 @@ export default {
     onShow() {
         //this.load()
     },
-    onLoad(e) {
-        if (e.current) {
-            this.current = parseInt(e.current)
-        }
-
-    },
 }
 </script>