Merge branch 'develop' into test

miniprogram/pages/components/EquipmentOperationDetails/EquipmentOperationDetails.ts

@@ -101,10 +101,15 @@ Component({
       });
     },
     refreshList() {
+      wx.showLoading({
+        title: '加载中',
+        mask: true,
+      });
       this.fetchList({
         pageNum: 1,
       })
         .then(res => {
+          wx.hideLoading();
           const { list } = res.data;
           this.setData({
             pageNum: 1,
@@ -112,14 +117,20 @@ Component({
           });
         })
         .catch(err => {
+          wx.hideLoading();
           console.log(err);
         });
     },
     getMoreListItem() {
+      wx.showLoading({
+        title: '加载中',
+        mask: true,
+      });
       this.fetchList({
         pageNum: this.data.pageNum + 1,
       })
         .then(res => {
+          wx.hideLoading();
           const { list } = res.data;
           if (list && list.length) {
             this.setData!({
@@ -129,6 +140,7 @@ Component({
           }
         })
         .catch(err => {
+          wx.hideLoading();
           console.log(err);
         });
     },

miniprogram/pages/components/EquipmentState/EquipmentState.ts

@@ -109,6 +109,7 @@ Component({
     refreshList() {
       wx.showLoading({
         title: '加载中',
+        mask: true,
       });
       this.fetchList()
         .then(res => {
@@ -132,6 +133,7 @@ Component({
     getMoreListItem() {
       wx.showLoading({
         title: '加载中',
+        mask: true,
       });
       let nextPage = this.data.pagination[this.data.status].pageNum + 1;
       this.fetchList({

miniprogram/pages/components/EquipmentWarning/EquipmentWarning.ts

@@ -98,6 +98,7 @@ Component({
     refreshList() {
       wx.showLoading({
         title: '加载中',
+        mask: true,
       });
       this.fetchList({})
         .then(res => {
@@ -122,6 +123,7 @@ Component({
     getMoreListItem() {
       wx.showLoading({
         title: '加载中',
+        mask: true,
       });
       let nextPage = this.data.pageNum + 1;
       this.fetchList({