Merge branch 'test'

e0d3213d · 姜雷 · 92d579d2 · 63bc7339 · e0d3213d · e0d3213d
Commit e0d3213d authored Jan 15, 2020 by 姜雷
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

equipment.js miniprogram/pages/equipment/equipment.js +0 -0

equipment.ts miniprogram/pages/equipment/equipment.ts +7 -3

No files found.
--- a/miniprogram/pages/equipment/equipment.js
+++ b/miniprogram/pages/equipment/equipment.js
--- a/miniprogram/pages/equipment/equipment.ts
+++ b/miniprogram/pages/equipment/equipment.ts
@@ -58,11 +58,15 @@ Page({
      });
  },
  fetchWarningCount() {
+    let data =
+      app.globalData.userInfo.operateId === 3
+        ? undefined
+        : {
+            operatorId: app.globalData.userInfo.operateId,
+          };
    deviceFetch({
      url: '/device/warning/count',
-      data: {
-        operatorId: app.globalData.userInfo.operateId,
-      },
+      data: data,
    })
      .then(res => {
        this.setData!({