Merge branch 'develop' into test

miniprogram/pages/equipment/equipment.js

@@ -25,19 +25,17 @@ Page({
             wx.hideLoading();
             console.log(res);
             var _a = res.data, areaDeviceAmount = _a.areaDeviceAmount, statusAmount = _a.statusAmount, totalAmount = _a.totalAmount;
-            var total = totalAmount.reduce(function (count, item) { return count + item.value; }, 0);
             _this.setData({
                 areaDeviceAmount: areaDeviceAmount,
                 statusAmount: statusAmount,
                 totalAmount: totalAmount,
-                total: total,
             });
         })
             .catch(function (err) {
             console.log(err);
             wx.hideLoading();
             wx.showToast({
-                title: err.msg || err || '网络错误',
+                title: err.msg || err.message || '网络错误',
                 icon: 'none',
                 duration: 4000,
             });
@@ -54,4 +52,4 @@ Page({
         });
     },
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXF1aXBtZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiZXF1aXBtZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEseUNBQThDO0FBRzlDLElBQUksQ0FBQztJQUlILElBQUksRUFBRTtRQUNKLE1BQU0sRUFBRSxDQUFDLFNBQVMsRUFBRSxTQUFTLEVBQUUsU0FBUyxFQUFFLFNBQVMsQ0FBQztRQUNwRCxnQkFBZ0IsRUFBRSxFQUFFO1FBQ3BCLFlBQVksRUFBRSxFQUFFO1FBQ2hCLFdBQVcsRUFBRSxFQUFFO1FBQ2YsS0FBSyxFQUFFLENBQUM7S0FDVDtJQUtELE1BQU07UUFDSixPQUFPLENBQUMsR0FBRyxDQUFDLFdBQVcsQ0FBQyxDQUFDO1FBQ3pCLElBQUksQ0FBQyxTQUFTLEVBQUUsQ0FBQztJQUNuQixDQUFDO0lBRUQsU0FBUztRQUFULGlCQTRCQztRQTNCQyxFQUFFLENBQUMsV0FBVyxDQUFDO1lBQ2IsS0FBSyxFQUFFLEtBQUs7U0FDYixDQUFDLENBQUM7UUFDSCxtQkFBVyxDQUFDO1lBQ1YsR0FBRyxFQUFFLHlCQUF5QjtTQUMvQixDQUFDO2FBQ0MsSUFBSSxDQUFDLFVBQUEsR0FBRztZQUNQLEVBQUUsQ0FBQyxXQUFXLEVBQUUsQ0FBQztZQUNqQixPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1lBQ1gsSUFBQSxhQUEwRCxFQUF4RCxzQ0FBZ0IsRUFBRSw4QkFBWSxFQUFFLDRCQUFXLENBQWM7WUFDakUsSUFBSSxLQUFLLEdBQUcsV0FBVyxDQUFDLE1BQU0sQ0FBQyxVQUFDLEtBQUssRUFBRSxJQUFJLElBQUssT0FBQSxLQUFLLEdBQUcsSUFBSSxDQUFDLEtBQUssRUFBbEIsQ0FBa0IsRUFBRSxDQUFDLENBQUMsQ0FBQztZQUN2RSxLQUFJLENBQUMsT0FBUSxDQUFDO2dCQUNaLGdCQUFnQixrQkFBQTtnQkFDaEIsWUFBWSxjQUFBO2dCQUNaLFdBQVcsYUFBQTtnQkFDWCxLQUFLLE9BQUE7YUFDTixDQUFDLENBQUM7UUFDTCxDQUFDLENBQUM7YUFDRCxLQUFLLENBQUMsVUFBQSxHQUFHO1lBQ1IsT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQztZQUNqQixFQUFFLENBQUMsV0FBVyxFQUFFLENBQUM7WUFDakIsRUFBRSxDQUFDLFNBQVMsQ0FBQztnQkFDWCxLQUFLLEVBQUUsR0FBRyxDQUFDLEdBQUcsSUFBSSxHQUFHLElBQUksTUFBTTtnQkFDL0IsSUFBSSxFQUFFLE1BQU07Z0JBQ1osUUFBUSxFQUFFLElBQUk7YUFDZixDQUFDLENBQUM7UUFDTCxDQUFDLENBQUMsQ0FBQztJQUNQLENBQUM7SUFDRCxZQUFZLFlBQUMsQ0FBQztRQUNKLElBQUEscUNBQUssQ0FBNkI7UUFDMUMsSUFBTSxJQUFJLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUMvQyxFQUFFLENBQUMsVUFBVSxDQUFDO1lBQ1osR0FBRyxFQUFFLG1EQUFpRCxJQUFJLENBQUMsTUFBTSxrQkFBYSxJQUFJLENBQUMsUUFBVTtZQUM3RixPQUFPLEVBQUUsVUFBUyxHQUFHO2dCQUVuQixHQUFHLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQywwQkFBMEIsRUFBRSxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDO1lBQ3BFLENBQUM7U0FDRixDQUFDLENBQUM7SUFDTCxDQUFDO0NBQ0YsQ0FBQyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgZGV2aWNlRmV0Y2ggfSBmcm9tICcuLi8uLi9hcGkvZmV0Y2gnO1xuXG4vLyBtaW5pcHJvZ3JhbS9wYWdlcy9lcXVpcG1lbnQvZXF1aXBtZW50LmpzXG5QYWdlKHtcbiAgLyoqXG4gICAqIOmhtemdoueahOWIneWni+aVsOaNrlxuICAgKi9cbiAgZGF0YToge1xuICAgIGNvbG9yczogWycjNjg5NWZlJywgJyNmZTY4NjgnLCAnIzZlZTE4ZicsICcjZmVhZTY4J10sXG4gICAgYXJlYURldmljZUFtb3VudDogW10sXG4gICAgc3RhdHVzQW1vdW50OiBbXSxcbiAgICB0b3RhbEFtb3VudDogW10sXG4gICAgdG90YWw6IDAsXG4gIH0sXG5cbiAgLyoqXG4gICAqIOeUn+WRveWRqOacn+WHveaVsC0t55uR5ZCs6aG16Z2i5Yqg6L29XG4gICAqL1xuICBvbkxvYWQoKSB7XG4gICAgY29uc29sZS5sb2coJ2luIG9uTG9hZCcpO1xuICAgIHRoaXMuZmV0Y2hMaXN0KCk7XG4gIH0sXG5cbiAgZmV0Y2hMaXN0KCkge1xuICAgIHd4LnNob3dMb2FkaW5nKHtcbiAgICAgIHRpdGxlOiAn5Yqg6L295LitJyxcbiAgICB9KTtcbiAgICBkZXZpY2VGZXRjaCh7XG4gICAgICB1cmw6ICcvZGV2aWNlL3JlcG9ydC9tYWluUGFnZScsXG4gICAgfSlcbiAgICAgIC50aGVuKHJlcyA9PiB7XG4gICAgICAgIHd4LmhpZGVMb2FkaW5nKCk7XG4gICAgICAgIGNvbnNvbGUubG9nKHJlcyk7XG4gICAgICAgIGNvbnN0IHsgYXJlYURldmljZUFtb3VudCwgc3RhdHVzQW1vdW50LCB0b3RhbEFtb3VudCB9ID0gcmVzLmRhdGE7XG4gICAgICAgIGxldCB0b3RhbCA9IHRvdGFsQW1vdW50LnJlZHVjZSgoY291bnQsIGl0ZW0pID0+IGNvdW50ICsgaXRlbS52YWx1ZSwgMCk7XG4gICAgICAgIHRoaXMuc2V0RGF0YSEoe1xuICAgICAgICAgIGFyZWFEZXZpY2VBbW91bnQsXG4gICAgICAgICAgc3RhdHVzQW1vdW50LFxuICAgICAgICAgIHRvdGFsQW1vdW50LFxuICAgICAgICAgIHRvdGFsLFxuICAgICAgICB9KTtcbiAgICAgIH0pXG4gICAgICAuY2F0Y2goZXJyID0+IHtcbiAgICAgICAgY29uc29sZS5sb2coZXJyKTtcbiAgICAgICAgd3guaGlkZUxvYWRpbmcoKTtcbiAgICAgICAgd3guc2hvd1RvYXN0KHtcbiAgICAgICAgICB0aXRsZTogZXJyLm1zZyB8fCBlcnIgfHwgJ+e9kee7nOmUmeivrycsXG4gICAgICAgICAgaWNvbjogJ25vbmUnLFxuICAgICAgICAgIGR1cmF0aW9uOiA0MDAwLFxuICAgICAgICB9KTtcbiAgICAgIH0pO1xuICB9LFxuICBnb1JlcG9ydFBhZ2UoZSkge1xuICAgIGNvbnN0IHsgaW5kZXggfSA9IGUuY3VycmVudFRhcmdldC5kYXRhc2V0O1xuICAgIGNvbnN0IGl0ZW0gPSB0aGlzLmRhdGEuYXJlYURldmljZUFtb3VudFtpbmRleF07XG4gICAgd3gubmF2aWdhdGVUbyh7XG4gICAgICB1cmw6IGAvcGFnZXMvZXF1aXBtZW50UmVwb3J0L2VxdWlwbWVudFJlcG9ydD9hcmVhSWQ9JHtpdGVtLmFyZWFJZH0mYXJlYU5hbWU9JHtpdGVtLmFyZWFOYW1lfWAsXG4gICAgICBzdWNjZXNzOiBmdW5jdGlvbihyZXMpIHtcbiAgICAgICAgLy8g6YCa6L+HZXZlbnRDaGFubmVs5ZCR6KKr5omT5byA6aG16Z2i5Lyg6YCB5pWw5o2uXG4gICAgICAgIHJlcy5ldmVudENoYW5uZWwuZW1pdCgnYWNjZXB0RGF0YUZyb21PcGVuZXJQYWdlJywgeyBkYXRhOiBpdGVtIH0pO1xuICAgICAgfSxcbiAgICB9KTtcbiAgfSxcbn0pO1xuIl19
\ No newline at end of file
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXF1aXBtZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiZXF1aXBtZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEseUNBQThDO0FBRzlDLElBQUksQ0FBQztJQUlILElBQUksRUFBRTtRQUNKLE1BQU0sRUFBRSxDQUFDLFNBQVMsRUFBRSxTQUFTLEVBQUUsU0FBUyxFQUFFLFNBQVMsQ0FBQztRQUNwRCxnQkFBZ0IsRUFBRSxFQUFFO1FBQ3BCLFlBQVksRUFBRSxFQUFFO1FBQ2hCLFdBQVcsRUFBRSxFQUFFO1FBQ2YsS0FBSyxFQUFFLENBQUM7S0FDVDtJQUtELE1BQU07UUFDSixPQUFPLENBQUMsR0FBRyxDQUFDLFdBQVcsQ0FBQyxDQUFDO1FBQ3pCLElBQUksQ0FBQyxTQUFTLEVBQUUsQ0FBQztJQUNuQixDQUFDO0lBRUQsU0FBUztRQUFULGlCQStCQztRQTlCQyxFQUFFLENBQUMsV0FBVyxDQUFDO1lBQ2IsS0FBSyxFQUFFLEtBQUs7U0FDYixDQUFDLENBQUM7UUFDSCxtQkFBVyxDQUFDO1lBQ1YsR0FBRyxFQUFFLHlCQUF5QjtTQUMvQixDQUFDO2FBQ0MsSUFBSSxDQUFDLFVBQUEsR0FBRztZQUNQLEVBQUUsQ0FBQyxXQUFXLEVBQUUsQ0FBQztZQUNqQixPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1lBQ1gsSUFBQSxhQUEwRCxFQUF4RCxzQ0FBZ0IsRUFBRSw4QkFBWSxFQUFFLDRCQUFXLENBQWM7WUFLakUsS0FBSSxDQUFDLE9BQVEsQ0FBQztnQkFDWixnQkFBZ0Isa0JBQUE7Z0JBQ2hCLFlBQVksY0FBQTtnQkFDWixXQUFXLGFBQUE7YUFFWixDQUFDLENBQUM7UUFDTCxDQUFDLENBQUM7YUFDRCxLQUFLLENBQUMsVUFBQSxHQUFHO1lBQ1IsT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQztZQUNqQixFQUFFLENBQUMsV0FBVyxFQUFFLENBQUM7WUFDakIsRUFBRSxDQUFDLFNBQVMsQ0FBQztnQkFDWCxLQUFLLEVBQUUsR0FBRyxDQUFDLEdBQUcsSUFBSSxHQUFHLENBQUMsT0FBTyxJQUFJLE1BQU07Z0JBQ3ZDLElBQUksRUFBRSxNQUFNO2dCQUNaLFFBQVEsRUFBRSxJQUFJO2FBQ2YsQ0FBQyxDQUFDO1FBQ0wsQ0FBQyxDQUFDLENBQUM7SUFDUCxDQUFDO0lBQ0QsWUFBWSxZQUFDLENBQUM7UUFDSixJQUFBLHFDQUFLLENBQTZCO1FBQzFDLElBQU0sSUFBSSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDL0MsRUFBRSxDQUFDLFVBQVUsQ0FBQztZQUNaLEdBQUcsRUFBRSxtREFBaUQsSUFBSSxDQUFDLE1BQU0sa0JBQWEsSUFBSSxDQUFDLFFBQVU7WUFDN0YsT0FBTyxFQUFFLFVBQVMsR0FBRztnQkFFbkIsR0FBRyxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsMEJBQTBCLEVBQUUsRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztZQUNwRSxDQUFDO1NBQ0YsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztDQUNGLENBQUMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IGRldmljZUZldGNoIH0gZnJvbSAnLi4vLi4vYXBpL2ZldGNoJztcblxuLy8gbWluaXByb2dyYW0vcGFnZXMvZXF1aXBtZW50L2VxdWlwbWVudC5qc1xuUGFnZSh7XG4gIC8qKlxuICAgKiDpobXpnaLnmoTliJ3lp4vmlbDmja5cbiAgICovXG4gIGRhdGE6IHtcbiAgICBjb2xvcnM6IFsnIzY4OTVmZScsICcjZmU2ODY4JywgJyM2ZWUxOGYnLCAnI2ZlYWU2OCddLFxuICAgIGFyZWFEZXZpY2VBbW91bnQ6IFtdLFxuICAgIHN0YXR1c0Ftb3VudDogW10sXG4gICAgdG90YWxBbW91bnQ6IFtdLFxuICAgIHRvdGFsOiAwLFxuICB9LFxuXG4gIC8qKlxuICAgKiDnlJ/lkb3lkajmnJ/lh73mlbAtLeebkeWQrOmhtemdouWKoOi9vVxuICAgKi9cbiAgb25Mb2FkKCkge1xuICAgIGNvbnNvbGUubG9nKCdpbiBvbkxvYWQnKTtcbiAgICB0aGlzLmZldGNoTGlzdCgpO1xuICB9LFxuXG4gIGZldGNoTGlzdCgpIHtcbiAgICB3eC5zaG93TG9hZGluZyh7XG4gICAgICB0aXRsZTogJ+WKoOi9veS4rScsXG4gICAgfSk7XG4gICAgZGV2aWNlRmV0Y2goe1xuICAgICAgdXJsOiAnL2RldmljZS9yZXBvcnQvbWFpblBhZ2UnLFxuICAgIH0pXG4gICAgICAudGhlbihyZXMgPT4ge1xuICAgICAgICB3eC5oaWRlTG9hZGluZygpO1xuICAgICAgICBjb25zb2xlLmxvZyhyZXMpO1xuICAgICAgICBjb25zdCB7IGFyZWFEZXZpY2VBbW91bnQsIHN0YXR1c0Ftb3VudCwgdG90YWxBbW91bnQgfSA9IHJlcy5kYXRhO1xuICAgICAgICAvLyBsZXQgdG90YWwgPSB0b3RhbEFtb3VudC5yZWR1Y2UoXG4gICAgICAgIC8vICAgKGNvdW50OiBOdW1iZXIsIGl0ZW0pID0+IGNvdW50ICsgaXRlbS52YWx1ZSxcbiAgICAgICAgLy8gICAwLFxuICAgICAgICAvLyApO1xuICAgICAgICB0aGlzLnNldERhdGEhKHtcbiAgICAgICAgICBhcmVhRGV2aWNlQW1vdW50LFxuICAgICAgICAgIHN0YXR1c0Ftb3VudCxcbiAgICAgICAgICB0b3RhbEFtb3VudCxcbiAgICAgICAgICAvLyB0b3RhbCxcbiAgICAgICAgfSk7XG4gICAgICB9KVxuICAgICAgLmNhdGNoKGVyciA9PiB7XG4gICAgICAgIGNvbnNvbGUubG9nKGVycik7XG4gICAgICAgIHd4LmhpZGVMb2FkaW5nKCk7XG4gICAgICAgIHd4LnNob3dUb2FzdCh7XG4gICAgICAgICAgdGl0bGU6IGVyci5tc2cgfHwgZXJyLm1lc3NhZ2UgfHwgJ+e9kee7nOmUmeivrycsXG4gICAgICAgICAgaWNvbjogJ25vbmUnLFxuICAgICAgICAgIGR1cmF0aW9uOiA0MDAwLFxuICAgICAgICB9KTtcbiAgICAgIH0pO1xuICB9LFxuICBnb1JlcG9ydFBhZ2UoZSkge1xuICAgIGNvbnN0IHsgaW5kZXggfSA9IGUuY3VycmVudFRhcmdldC5kYXRhc2V0O1xuICAgIGNvbnN0IGl0ZW0gPSB0aGlzLmRhdGEuYXJlYURldmljZUFtb3VudFtpbmRleF07XG4gICAgd3gubmF2aWdhdGVUbyh7XG4gICAgICB1cmw6IGAvcGFnZXMvZXF1aXBtZW50UmVwb3J0L2VxdWlwbWVudFJlcG9ydD9hcmVhSWQ9JHtpdGVtLmFyZWFJZH0mYXJlYU5hbWU9JHtpdGVtLmFyZWFOYW1lfWAsXG4gICAgICBzdWNjZXNzOiBmdW5jdGlvbihyZXMpIHtcbiAgICAgICAgLy8g6YCa6L+HZXZlbnRDaGFubmVs5ZCR6KKr5omT5byA6aG16Z2i5Lyg6YCB5pWw5o2uXG4gICAgICAgIHJlcy5ldmVudENoYW5uZWwuZW1pdCgnYWNjZXB0RGF0YUZyb21PcGVuZXJQYWdlJywgeyBkYXRhOiBpdGVtIH0pO1xuICAgICAgfSxcbiAgICB9KTtcbiAgfSxcbn0pO1xuIl19
\ No newline at end of file

miniprogram/pages/equipment/equipment.ts

@@ -32,19 +32,22 @@ Page({
         wx.hideLoading();
         console.log(res);
         const { areaDeviceAmount, statusAmount, totalAmount } = res.data;
-        let total = totalAmount.reduce((count, item) => count + item.value, 0);
+        // let total = totalAmount.reduce(
+        //   (count: Number, item) => count + item.value,
+        //   0,
+        // );
         this.setData!({
           areaDeviceAmount,
           statusAmount,
           totalAmount,
-          total,
+          // total,
         });
       })
       .catch(err => {
         console.log(err);
         wx.hideLoading();
         wx.showToast({
-          title: err.msg || err || '网络错误',
+          title: err.msg || err.message || '网络错误',
           icon: 'none',
           duration: 4000,
         });