Merge branch 'develop' into test

miniprogram/pages/equipment/equipment.js

@@ -25,7 +25,7 @@ Page({
             wx.hideLoading();
             console.log(res);
             var _a = res.data, areaDeviceAmount = _a.areaDeviceAmount, statusAmount = _a.statusAmount, totalAmount = _a.totalAmount;
-            var total = 12;
+            var total = totalAmount.reduce(function (count, item) { return count + item.value; }, 0);
             _this.setData({
                 areaDeviceAmount: areaDeviceAmount,
                 statusAmount: statusAmount,
@@ -37,7 +37,7 @@ Page({
             console.log(err);
             wx.hideLoading();
             wx.showToast({
-                title: err.msg || err.toString(),
+                title: err.msg || err.message || '网络错误',
                 icon: 'none',
                 duration: 4000,
             });
@@ -54,4 +54,4 @@ Page({
         });
     },
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXF1aXBtZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiZXF1aXBtZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEseUNBQThDO0FBRzlDLElBQUksQ0FBQztJQUlILElBQUksRUFBRTtRQUNKLE1BQU0sRUFBRSxDQUFDLFNBQVMsRUFBRSxTQUFTLEVBQUUsU0FBUyxFQUFFLFNBQVMsQ0FBQztRQUNwRCxnQkFBZ0IsRUFBRSxFQUFFO1FBQ3BCLFlBQVksRUFBRSxFQUFFO1FBQ2hCLFdBQVcsRUFBRSxFQUFFO1FBQ2YsS0FBSyxFQUFFLENBQUM7S0FDVDtJQUtELE1BQU0sWUFBQyxPQUFPO1FBQ1osT0FBTyxDQUFDLEdBQUcsQ0FBQyxXQUFXLENBQUMsQ0FBQztRQUN6QixJQUFJLENBQUMsU0FBUyxFQUFFLENBQUM7SUFDbkIsQ0FBQztJQUVELFNBQVM7UUFBVCxpQkE2QkM7UUE1QkMsRUFBRSxDQUFDLFdBQVcsQ0FBQztZQUNiLEtBQUssRUFBRSxLQUFLO1NBQ2IsQ0FBQyxDQUFDO1FBQ0gsbUJBQVcsQ0FBQztZQUNWLEdBQUcsRUFBRSx5QkFBeUI7U0FDL0IsQ0FBQzthQUNDLElBQUksQ0FBQyxVQUFBLEdBQUc7WUFDUCxFQUFFLENBQUMsV0FBVyxFQUFFLENBQUM7WUFDakIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQztZQUNYLElBQUEsYUFBMEQsRUFBeEQsc0NBQWdCLEVBQUUsOEJBQVksRUFBRSw0QkFBVyxDQUFjO1lBRWpFLElBQUksS0FBSyxHQUFHLEVBQUUsQ0FBQztZQUNmLEtBQUksQ0FBQyxPQUFRLENBQUM7Z0JBQ1osZ0JBQWdCLGtCQUFBO2dCQUNoQixZQUFZLGNBQUE7Z0JBQ1osV0FBVyxhQUFBO2dCQUNYLEtBQUssT0FBQTthQUNOLENBQUMsQ0FBQztRQUNMLENBQUMsQ0FBQzthQUNELEtBQUssQ0FBQyxVQUFBLEdBQUc7WUFDUixPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1lBQ2pCLEVBQUUsQ0FBQyxXQUFXLEVBQUUsQ0FBQztZQUNqQixFQUFFLENBQUMsU0FBUyxDQUFDO2dCQUNYLEtBQUssRUFBRSxHQUFHLENBQUMsR0FBRyxJQUFJLEdBQUcsQ0FBQyxRQUFRLEVBQUU7Z0JBQ2hDLElBQUksRUFBRSxNQUFNO2dCQUNaLFFBQVEsRUFBRSxJQUFJO2FBQ2YsQ0FBQyxDQUFDO1FBQ0wsQ0FBQyxDQUFDLENBQUM7SUFDUCxDQUFDO0lBQ0QsWUFBWSxZQUFDLENBQUM7UUFDSixJQUFBLHFDQUFLLENBQTZCO1FBQzFDLElBQU0sSUFBSSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDL0MsRUFBRSxDQUFDLFVBQVUsQ0FBQztZQUNaLEdBQUcsRUFBRSxtREFBaUQsSUFBSSxDQUFDLE1BQU0sa0JBQWEsSUFBSSxDQUFDLFFBQVU7WUFDN0YsT0FBTyxFQUFFLFVBQVMsR0FBRztnQkFFbkIsR0FBRyxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsMEJBQTBCLEVBQUUsRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztZQUNwRSxDQUFDO1NBQ0YsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztDQUNGLENBQUMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IGRldmljZUZldGNoIH0gZnJvbSAnLi4vLi4vYXBpL2ZldGNoJztcblxuLy8gbWluaXByb2dyYW0vcGFnZXMvZXF1aXBtZW50L2VxdWlwbWVudC5qc1xuUGFnZSh7XG4gIC8qKlxuICAgKiDpobXpnaLnmoTliJ3lp4vmlbDmja5cbiAgICovXG4gIGRhdGE6IHtcbiAgICBjb2xvcnM6IFsnIzY4OTVmZScsICcjZmU2ODY4JywgJyM2ZWUxOGYnLCAnI2ZlYWU2OCddLFxuICAgIGFyZWFEZXZpY2VBbW91bnQ6IFtdLFxuICAgIHN0YXR1c0Ftb3VudDogW10sXG4gICAgdG90YWxBbW91bnQ6IFtdLFxuICAgIHRvdGFsOiAwLFxuICB9LFxuXG4gIC8qKlxuICAgKiDnlJ/lkb3lkajmnJ/lh73mlbAtLeebkeWQrOmhtemdouWKoOi9vVxuICAgKi9cbiAgb25Mb2FkKG9wdGlvbnMpIHtcbiAgICBjb25zb2xlLmxvZygnaW4gb25Mb2FkJyk7XG4gICAgdGhpcy5mZXRjaExpc3QoKTtcbiAgfSxcblxuICBmZXRjaExpc3QoKSB7XG4gICAgd3guc2hvd0xvYWRpbmcoe1xuICAgICAgdGl0bGU6ICfliqDovb3kuK0nLFxuICAgIH0pO1xuICAgIGRldmljZUZldGNoKHtcbiAgICAgIHVybDogJy9kZXZpY2UvcmVwb3J0L21haW5QYWdlJyxcbiAgICB9KVxuICAgICAgLnRoZW4ocmVzID0+IHtcbiAgICAgICAgd3guaGlkZUxvYWRpbmcoKTtcbiAgICAgICAgY29uc29sZS5sb2cocmVzKTtcbiAgICAgICAgY29uc3QgeyBhcmVhRGV2aWNlQW1vdW50LCBzdGF0dXNBbW91bnQsIHRvdGFsQW1vdW50IH0gPSByZXMuZGF0YTtcbiAgICAgICAgLy8gbGV0IHRvdGFsID0gdG90YWxBbW91bnQucmVkdWNlKChjb3VudCwgaXRlbSkgPT4gY291bnQgKyBpdGVtLnZhbHVlLCAwKTtcbiAgICAgICAgbGV0IHRvdGFsID0gMTI7XG4gICAgICAgIHRoaXMuc2V0RGF0YSEoe1xuICAgICAgICAgIGFyZWFEZXZpY2VBbW91bnQsXG4gICAgICAgICAgc3RhdHVzQW1vdW50LFxuICAgICAgICAgIHRvdGFsQW1vdW50LFxuICAgICAgICAgIHRvdGFsLFxuICAgICAgICB9KTtcbiAgICAgIH0pXG4gICAgICAuY2F0Y2goZXJyID0+IHtcbiAgICAgICAgY29uc29sZS5sb2coZXJyKTtcbiAgICAgICAgd3guaGlkZUxvYWRpbmcoKTtcbiAgICAgICAgd3guc2hvd1RvYXN0KHtcbiAgICAgICAgICB0aXRsZTogZXJyLm1zZyB8fCBlcnIudG9TdHJpbmcoKSxcbiAgICAgICAgICBpY29uOiAnbm9uZScsXG4gICAgICAgICAgZHVyYXRpb246IDQwMDAsXG4gICAgICAgIH0pO1xuICAgICAgfSk7XG4gIH0sXG4gIGdvUmVwb3J0UGFnZShlKSB7XG4gICAgY29uc3QgeyBpbmRleCB9ID0gZS5jdXJyZW50VGFyZ2V0LmRhdGFzZXQ7XG4gICAgY29uc3QgaXRlbSA9IHRoaXMuZGF0YS5hcmVhRGV2aWNlQW1vdW50W2luZGV4XTtcbiAgICB3eC5uYXZpZ2F0ZVRvKHtcbiAgICAgIHVybDogYC9wYWdlcy9lcXVpcG1lbnRSZXBvcnQvZXF1aXBtZW50UmVwb3J0P2FyZWFJZD0ke2l0ZW0uYXJlYUlkfSZhcmVhTmFtZT0ke2l0ZW0uYXJlYU5hbWV9YCxcbiAgICAgIHN1Y2Nlc3M6IGZ1bmN0aW9uKHJlcykge1xuICAgICAgICAvLyDpgJrov4dldmVudENoYW5uZWzlkJHooqvmiZPlvIDpobXpnaLkvKDpgIHmlbDmja5cbiAgICAgICAgcmVzLmV2ZW50Q2hhbm5lbC5lbWl0KCdhY2NlcHREYXRhRnJvbU9wZW5lclBhZ2UnLCB7IGRhdGE6IGl0ZW0gfSk7XG4gICAgICB9LFxuICAgIH0pO1xuICB9LFxufSk7XG4iXX0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXF1aXBtZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiZXF1aXBtZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEseUNBQThDO0FBRzlDLElBQUksQ0FBQztJQUlILElBQUksRUFBRTtRQUNKLE1BQU0sRUFBRSxDQUFDLFNBQVMsRUFBRSxTQUFTLEVBQUUsU0FBUyxFQUFFLFNBQVMsQ0FBQztRQUNwRCxnQkFBZ0IsRUFBRSxFQUFFO1FBQ3BCLFlBQVksRUFBRSxFQUFFO1FBQ2hCLFdBQVcsRUFBRSxFQUFFO1FBQ2YsS0FBSyxFQUFFLENBQUM7S0FDVDtJQUtELE1BQU0sWUFBQyxPQUFPO1FBQ1osT0FBTyxDQUFDLEdBQUcsQ0FBQyxXQUFXLENBQUMsQ0FBQztRQUN6QixJQUFJLENBQUMsU0FBUyxFQUFFLENBQUM7SUFDbkIsQ0FBQztJQUVELFNBQVM7UUFBVCxpQkE0QkM7UUEzQkMsRUFBRSxDQUFDLFdBQVcsQ0FBQztZQUNiLEtBQUssRUFBRSxLQUFLO1NBQ2IsQ0FBQyxDQUFDO1FBQ0gsbUJBQVcsQ0FBQztZQUNWLEdBQUcsRUFBRSx5QkFBeUI7U0FDL0IsQ0FBQzthQUNDLElBQUksQ0FBQyxVQUFBLEdBQUc7WUFDUCxFQUFFLENBQUMsV0FBVyxFQUFFLENBQUM7WUFDakIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQztZQUNYLElBQUEsYUFBMEQsRUFBeEQsc0NBQWdCLEVBQUUsOEJBQVksRUFBRSw0QkFBVyxDQUFjO1lBQ2pFLElBQUksS0FBSyxHQUFHLFdBQVcsQ0FBQyxNQUFNLENBQUMsVUFBQyxLQUFLLEVBQUUsSUFBSSxJQUFLLE9BQUEsS0FBSyxHQUFHLElBQUksQ0FBQyxLQUFLLEVBQWxCLENBQWtCLEVBQUUsQ0FBQyxDQUFDLENBQUM7WUFDdkUsS0FBSSxDQUFDLE9BQVEsQ0FBQztnQkFDWixnQkFBZ0Isa0JBQUE7Z0JBQ2hCLFlBQVksY0FBQTtnQkFDWixXQUFXLGFBQUE7Z0JBQ1gsS0FBSyxPQUFBO2FBQ04sQ0FBQyxDQUFDO1FBQ0wsQ0FBQyxDQUFDO2FBQ0QsS0FBSyxDQUFDLFVBQUEsR0FBRztZQUNSLE9BQU8sQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUM7WUFDakIsRUFBRSxDQUFDLFdBQVcsRUFBRSxDQUFDO1lBQ2pCLEVBQUUsQ0FBQyxTQUFTLENBQUM7Z0JBQ1gsS0FBSyxFQUFFLEdBQUcsQ0FBQyxHQUFHLElBQUksR0FBRyxDQUFDLE9BQU8sSUFBSSxNQUFNO2dCQUN2QyxJQUFJLEVBQUUsTUFBTTtnQkFDWixRQUFRLEVBQUUsSUFBSTthQUNmLENBQUMsQ0FBQztRQUNMLENBQUMsQ0FBQyxDQUFDO0lBQ1AsQ0FBQztJQUNELFlBQVksWUFBQyxDQUFDO1FBQ0osSUFBQSxxQ0FBSyxDQUE2QjtRQUMxQyxJQUFNLElBQUksR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLGdCQUFnQixDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQy9DLEVBQUUsQ0FBQyxVQUFVLENBQUM7WUFDWixHQUFHLEVBQUUsbURBQWlELElBQUksQ0FBQyxNQUFNLGtCQUFhLElBQUksQ0FBQyxRQUFVO1lBQzdGLE9BQU8sRUFBRSxVQUFTLEdBQUc7Z0JBRW5CLEdBQUcsQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLDBCQUEwQixFQUFFLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7WUFDcEUsQ0FBQztTQUNGLENBQUMsQ0FBQztJQUNMLENBQUM7Q0FDRixDQUFDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBkZXZpY2VGZXRjaCB9IGZyb20gJy4uLy4uL2FwaS9mZXRjaCc7XG5cbi8vIG1pbmlwcm9ncmFtL3BhZ2VzL2VxdWlwbWVudC9lcXVpcG1lbnQuanNcblBhZ2Uoe1xuICAvKipcbiAgICog6aG16Z2i55qE5Yid5aeL5pWw5o2uXG4gICAqL1xuICBkYXRhOiB7XG4gICAgY29sb3JzOiBbJyM2ODk1ZmUnLCAnI2ZlNjg2OCcsICcjNmVlMThmJywgJyNmZWFlNjgnXSxcbiAgICBhcmVhRGV2aWNlQW1vdW50OiBbXSxcbiAgICBzdGF0dXNBbW91bnQ6IFtdLFxuICAgIHRvdGFsQW1vdW50OiBbXSxcbiAgICB0b3RhbDogMCxcbiAgfSxcblxuICAvKipcbiAgICog55Sf5ZG95ZGo5pyf5Ye95pWwLS3nm5HlkKzpobXpnaLliqDovb1cbiAgICovXG4gIG9uTG9hZChvcHRpb25zKSB7XG4gICAgY29uc29sZS5sb2coJ2luIG9uTG9hZCcpO1xuICAgIHRoaXMuZmV0Y2hMaXN0KCk7XG4gIH0sXG5cbiAgZmV0Y2hMaXN0KCkge1xuICAgIHd4LnNob3dMb2FkaW5nKHtcbiAgICAgIHRpdGxlOiAn5Yqg6L295LitJyxcbiAgICB9KTtcbiAgICBkZXZpY2VGZXRjaCh7XG4gICAgICB1cmw6ICcvZGV2aWNlL3JlcG9ydC9tYWluUGFnZScsXG4gICAgfSlcbiAgICAgIC50aGVuKHJlcyA9PiB7XG4gICAgICAgIHd4LmhpZGVMb2FkaW5nKCk7XG4gICAgICAgIGNvbnNvbGUubG9nKHJlcyk7XG4gICAgICAgIGNvbnN0IHsgYXJlYURldmljZUFtb3VudCwgc3RhdHVzQW1vdW50LCB0b3RhbEFtb3VudCB9ID0gcmVzLmRhdGE7XG4gICAgICAgIGxldCB0b3RhbCA9IHRvdGFsQW1vdW50LnJlZHVjZSgoY291bnQsIGl0ZW0pID0+IGNvdW50ICsgaXRlbS52YWx1ZSwgMCk7XG4gICAgICAgIHRoaXMuc2V0RGF0YSEoe1xuICAgICAgICAgIGFyZWFEZXZpY2VBbW91bnQsXG4gICAgICAgICAgc3RhdHVzQW1vdW50LFxuICAgICAgICAgIHRvdGFsQW1vdW50LFxuICAgICAgICAgIHRvdGFsLFxuICAgICAgICB9KTtcbiAgICAgIH0pXG4gICAgICAuY2F0Y2goZXJyID0+IHtcbiAgICAgICAgY29uc29sZS5sb2coZXJyKTtcbiAgICAgICAgd3guaGlkZUxvYWRpbmcoKTtcbiAgICAgICAgd3guc2hvd1RvYXN0KHtcbiAgICAgICAgICB0aXRsZTogZXJyLm1zZyB8fCBlcnIubWVzc2FnZSB8fCAn572R57uc6ZSZ6K+vJyxcbiAgICAgICAgICBpY29uOiAnbm9uZScsXG4gICAgICAgICAgZHVyYXRpb246IDQwMDAsXG4gICAgICAgIH0pO1xuICAgICAgfSk7XG4gIH0sXG4gIGdvUmVwb3J0UGFnZShlKSB7XG4gICAgY29uc3QgeyBpbmRleCB9ID0gZS5jdXJyZW50VGFyZ2V0LmRhdGFzZXQ7XG4gICAgY29uc3QgaXRlbSA9IHRoaXMuZGF0YS5hcmVhRGV2aWNlQW1vdW50W2luZGV4XTtcbiAgICB3eC5uYXZpZ2F0ZVRvKHtcbiAgICAgIHVybDogYC9wYWdlcy9lcXVpcG1lbnRSZXBvcnQvZXF1aXBtZW50UmVwb3J0P2FyZWFJZD0ke2l0ZW0uYXJlYUlkfSZhcmVhTmFtZT0ke2l0ZW0uYXJlYU5hbWV9YCxcbiAgICAgIHN1Y2Nlc3M6IGZ1bmN0aW9uKHJlcykge1xuICAgICAgICAvLyDpgJrov4dldmVudENoYW5uZWzlkJHooqvmiZPlvIDpobXpnaLkvKDpgIHmlbDmja5cbiAgICAgICAgcmVzLmV2ZW50Q2hhbm5lbC5lbWl0KCdhY2NlcHREYXRhRnJvbU9wZW5lclBhZ2UnLCB7IGRhdGE6IGl0ZW0gfSk7XG4gICAgICB9LFxuICAgIH0pO1xuICB9LFxufSk7XG4iXX0=
\ No newline at end of file

miniprogram/pages/equipment/equipment.ts

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