Merge branch 'develop' into test

1414dbe7 · 姜雷 · 25cebe7f · deabef7d · 1414dbe7 · 1414dbe7
Commit 1414dbe7 authored Jan 14, 2020 by 姜雷
Showing with 1 addition and 1 deletion

EquipmentWarning.js ...ram/pages/components/EquipmentWarning/EquipmentWarning.js +0 -0

EquipmentWarning.ts ...ram/pages/components/EquipmentWarning/EquipmentWarning.ts +1 -1

No files found.
--- a/miniprogram/pages/components/EquipmentWarning/EquipmentWarning.js
+++ b/miniprogram/pages/components/EquipmentWarning/EquipmentWarning.js
--- a/miniprogram/pages/components/EquipmentWarning/EquipmentWarning.ts
+++ b/miniprogram/pages/components/EquipmentWarning/EquipmentWarning.ts
@@ -99,7 +99,7 @@ Component({
      wx.showLoading({
        title: '加载中',
      });
-      this.fetchList()
+      this.fetchList({})
        .then(res => {
          wx.hideLoading();
          console.log(res);