Merge branch 'develop' into test

miniprogram/config/constants.js

@@ -22,7 +22,8 @@ exports.masterUrl = {
     CUSTOMER_SERVER_URL: 'https://dcxy-customer-manage.dcrym.com',
     BASE_SERVER_URL: 'https://dcxy-base-manage.dcrym.com',
     OPERATOR_SERVER_URL: 'https://op-man-serv.dcrym.com',
+    DEVICE_SERVEL_URL: 'https://device-management-api.dcrym.com',
 };
 exports.successCode = 1000;
 exports.logoutode = -2;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uc3RhbnRzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiY29uc3RhbnRzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQWEsUUFBQSxNQUFNLEdBQUc7SUFDcEIsaUJBQWlCLEVBQUUsOENBQThDO0lBQ2pFLHFCQUFxQixFQUFFLGtEQUFrRDtJQUN6RSxtQkFBbUIsRUFBRSwyQ0FBMkM7SUFDaEUsZUFBZSxFQUFFLDRDQUE0QztJQUM3RCxtQkFBbUIsRUFBRSxvQ0FBb0M7SUFDekQsaUJBQWlCLEVBQUUsaURBQWlEO0NBQ3JFLENBQUM7QUFDVyxRQUFBLE9BQU8sR0FBRztJQUNyQixpQkFBaUIsRUFBRSwrQ0FBK0M7SUFDbEUscUJBQXFCLEVBQUUsbURBQW1EO0lBQzFFLG1CQUFtQixFQUFFLDRDQUE0QztJQUNqRSxlQUFlLEVBQUUsNkNBQTZDO0lBQzlELG1CQUFtQixFQUFFLHFDQUFxQztJQUMxRCxpQkFBaUIsRUFBRSxrREFBa0Q7Q0FDdEUsQ0FBQztBQUNXLFFBQUEsU0FBUyxHQUFHO0lBQ3ZCLGlCQUFpQixFQUFFLHNDQUFzQztJQUN6RCxxQkFBcUIsRUFBRSwwQ0FBMEM7SUFDakUsbUJBQW1CLEVBQUUsd0NBQXdDO0lBQzdELGVBQWUsRUFBRSxvQ0FBb0M7SUFDckQsbUJBQW1CLEVBQUUsK0JBQStCO0NBQ3JELENBQUM7QUFFVyxRQUFBLFdBQVcsR0FBRyxJQUFJLENBQUM7QUFDbkIsUUFBQSxTQUFTLEdBQUcsQ0FBQyxDQUFDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQgY29uc3QgZGV2VXJsID0ge1xuICBTWVNURU1fU0VSVkVSX1VSTDogJ2h0dHBzOi8vZXgtZGV2LWRjeHktc3lzdGVtLW1hbmFnZS4xNjhjYWQudG9wJyxcbiAgU1RBVElTVElDU19TRVJWRVJfVVJMOiAnaHR0cHM6Ly9leC1kZXYtZGN4eS1zdGF0aXN0aWNzLW1hbmFnZS4xNjhjYWQudG9wJyxcbiAgQ1VTVE9NRVJfU0VSVkVSX1VSTDogJ2h0dHBzOi8vZXgtZGV2LWN1c3RvbWVyLW1hbmFnZS4xNjhjYWQudG9wJyxcbiAgQkFTRV9TRVJWRVJfVVJMOiAnaHR0cHM6Ly9leC1kZXYtZGN4eS1iYXNlLW1hbmFnZS4xNjhjYWQudG9wJyxcbiAgT1BFUkFUT1JfU0VSVkVSX1VSTDogJ2h0dHBzOi8vZGV2LW9wLW1hbi1zZXJ2LjE2OGNhZC50b3AnLFxuICBERVZJQ0VfU0VSVkVMX1VSTDogJ2h0dHBzOi8vaW4tZGV2LWRldmljZS1tYW5hZ2VtZW50LWFwaS4xNjhjYWQudG9wJyxcbn07XG5leHBvcnQgY29uc3QgdGVzdFVybCA9IHtcbiAgU1lTVEVNX1NFUlZFUl9VUkw6ICdodHRwczovL2V4LXRlc3QtZGN4eS1zeXN0ZW0tbWFuYWdlLjE2OGNhZC50b3AnLFxuICBTVEFUSVNUSUNTX1NFUlZFUl9VUkw6ICdodHRwczovL2V4LXRlc3QtZGN4eS1zdGF0aXN0aWNzLW1hbmFnZS4xNjhjYWQudG9wJyxcbiAgQ1VTVE9NRVJfU0VSVkVSX1VSTDogJ2h0dHBzOi8vZXgtdGVzdC1jdXN0b21lci1tYW5hZ2UuMTY4Y2FkLnRvcCcsXG4gIEJBU0VfU0VSVkVSX1VSTDogJ2h0dHBzOi8vZXgtdGVzdC1kY3h5LWJhc2UtbWFuYWdlLjE2OGNhZC50b3AnLFxuICBPUEVSQVRPUl9TRVJWRVJfVVJMOiAnaHR0cHM6Ly90ZXN0LW9wLW1hbi1zZXJ2LjE2OGNhZC50b3AnLFxuICBERVZJQ0VfU0VSVkVMX1VSTDogJ2h0dHBzOi8vaW4tdGVzdC1kZXZpY2UtbWFuYWdlbWVudC1hcGkuMTY4Y2FkLnRvcCcsXG59O1xuZXhwb3J0IGNvbnN0IG1hc3RlclVybCA9IHtcbiAgU1lTVEVNX1NFUlZFUl9VUkw6ICdodHRwczovL2RjeHktc3lzdGVtLW1hbmFnZS5kY3J5bS5jb20nLFxuICBTVEFUSVNUSUNTX1NFUlZFUl9VUkw6ICdodHRwczovL2RjeHktc3RhdGlzdGljcy1tYW5hZ2UuZGNyeW0uY29tJyxcbiAgQ1VTVE9NRVJfU0VSVkVSX1VSTDogJ2h0dHBzOi8vZGN4eS1jdXN0b21lci1tYW5hZ2UuZGNyeW0uY29tJyxcbiAgQkFTRV9TRVJWRVJfVVJMOiAnaHR0cHM6Ly9kY3h5LWJhc2UtbWFuYWdlLmRjcnltLmNvbScsXG4gIE9QRVJBVE9SX1NFUlZFUl9VUkw6ICdodHRwczovL29wLW1hbi1zZXJ2LmRjcnltLmNvbScsXG59O1xuXG5leHBvcnQgY29uc3Qgc3VjY2Vzc0NvZGUgPSAxMDAwO1xuZXhwb3J0IGNvbnN0IGxvZ291dG9kZSA9IC0yO1xuIl19
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uc3RhbnRzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiY29uc3RhbnRzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQWEsUUFBQSxNQUFNLEdBQUc7SUFDcEIsaUJBQWlCLEVBQUUsOENBQThDO0lBQ2pFLHFCQUFxQixFQUFFLGtEQUFrRDtJQUN6RSxtQkFBbUIsRUFBRSwyQ0FBMkM7SUFDaEUsZUFBZSxFQUFFLDRDQUE0QztJQUM3RCxtQkFBbUIsRUFBRSxvQ0FBb0M7SUFDekQsaUJBQWlCLEVBQUUsaURBQWlEO0NBQ3JFLENBQUM7QUFDVyxRQUFBLE9BQU8sR0FBRztJQUNyQixpQkFBaUIsRUFBRSwrQ0FBK0M7SUFDbEUscUJBQXFCLEVBQUUsbURBQW1EO0lBQzFFLG1CQUFtQixFQUFFLDRDQUE0QztJQUNqRSxlQUFlLEVBQUUsNkNBQTZDO0lBQzlELG1CQUFtQixFQUFFLHFDQUFxQztJQUMxRCxpQkFBaUIsRUFBRSxrREFBa0Q7Q0FDdEUsQ0FBQztBQUNXLFFBQUEsU0FBUyxHQUFHO0lBQ3ZCLGlCQUFpQixFQUFFLHNDQUFzQztJQUN6RCxxQkFBcUIsRUFBRSwwQ0FBMEM7SUFDakUsbUJBQW1CLEVBQUUsd0NBQXdDO0lBQzdELGVBQWUsRUFBRSxvQ0FBb0M7SUFDckQsbUJBQW1CLEVBQUUsK0JBQStCO0lBQ3BELGlCQUFpQixFQUFFLHlDQUF5QztDQUM3RCxDQUFDO0FBRVcsUUFBQSxXQUFXLEdBQUcsSUFBSSxDQUFDO0FBQ25CLFFBQUEsU0FBUyxHQUFHLENBQUMsQ0FBQyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0IGNvbnN0IGRldlVybCA9IHtcbiAgU1lTVEVNX1NFUlZFUl9VUkw6ICdodHRwczovL2V4LWRldi1kY3h5LXN5c3RlbS1tYW5hZ2UuMTY4Y2FkLnRvcCcsXG4gIFNUQVRJU1RJQ1NfU0VSVkVSX1VSTDogJ2h0dHBzOi8vZXgtZGV2LWRjeHktc3RhdGlzdGljcy1tYW5hZ2UuMTY4Y2FkLnRvcCcsXG4gIENVU1RPTUVSX1NFUlZFUl9VUkw6ICdodHRwczovL2V4LWRldi1jdXN0b21lci1tYW5hZ2UuMTY4Y2FkLnRvcCcsXG4gIEJBU0VfU0VSVkVSX1VSTDogJ2h0dHBzOi8vZXgtZGV2LWRjeHktYmFzZS1tYW5hZ2UuMTY4Y2FkLnRvcCcsXG4gIE9QRVJBVE9SX1NFUlZFUl9VUkw6ICdodHRwczovL2Rldi1vcC1tYW4tc2Vydi4xNjhjYWQudG9wJyxcbiAgREVWSUNFX1NFUlZFTF9VUkw6ICdodHRwczovL2luLWRldi1kZXZpY2UtbWFuYWdlbWVudC1hcGkuMTY4Y2FkLnRvcCcsXG59O1xuZXhwb3J0IGNvbnN0IHRlc3RVcmwgPSB7XG4gIFNZU1RFTV9TRVJWRVJfVVJMOiAnaHR0cHM6Ly9leC10ZXN0LWRjeHktc3lzdGVtLW1hbmFnZS4xNjhjYWQudG9wJyxcbiAgU1RBVElTVElDU19TRVJWRVJfVVJMOiAnaHR0cHM6Ly9leC10ZXN0LWRjeHktc3RhdGlzdGljcy1tYW5hZ2UuMTY4Y2FkLnRvcCcsXG4gIENVU1RPTUVSX1NFUlZFUl9VUkw6ICdodHRwczovL2V4LXRlc3QtY3VzdG9tZXItbWFuYWdlLjE2OGNhZC50b3AnLFxuICBCQVNFX1NFUlZFUl9VUkw6ICdodHRwczovL2V4LXRlc3QtZGN4eS1iYXNlLW1hbmFnZS4xNjhjYWQudG9wJyxcbiAgT1BFUkFUT1JfU0VSVkVSX1VSTDogJ2h0dHBzOi8vdGVzdC1vcC1tYW4tc2Vydi4xNjhjYWQudG9wJyxcbiAgREVWSUNFX1NFUlZFTF9VUkw6ICdodHRwczovL2luLXRlc3QtZGV2aWNlLW1hbmFnZW1lbnQtYXBpLjE2OGNhZC50b3AnLFxufTtcbmV4cG9ydCBjb25zdCBtYXN0ZXJVcmwgPSB7XG4gIFNZU1RFTV9TRVJWRVJfVVJMOiAnaHR0cHM6Ly9kY3h5LXN5c3RlbS1tYW5hZ2UuZGNyeW0uY29tJyxcbiAgU1RBVElTVElDU19TRVJWRVJfVVJMOiAnaHR0cHM6Ly9kY3h5LXN0YXRpc3RpY3MtbWFuYWdlLmRjcnltLmNvbScsXG4gIENVU1RPTUVSX1NFUlZFUl9VUkw6ICdodHRwczovL2RjeHktY3VzdG9tZXItbWFuYWdlLmRjcnltLmNvbScsXG4gIEJBU0VfU0VSVkVSX1VSTDogJ2h0dHBzOi8vZGN4eS1iYXNlLW1hbmFnZS5kY3J5bS5jb20nLFxuICBPUEVSQVRPUl9TRVJWRVJfVVJMOiAnaHR0cHM6Ly9vcC1tYW4tc2Vydi5kY3J5bS5jb20nLFxuICBERVZJQ0VfU0VSVkVMX1VSTDogJ2h0dHBzOi8vZGV2aWNlLW1hbmFnZW1lbnQtYXBpLmRjcnltLmNvbScsXG59O1xuXG5leHBvcnQgY29uc3Qgc3VjY2Vzc0NvZGUgPSAxMDAwO1xuZXhwb3J0IGNvbnN0IGxvZ291dG9kZSA9IC0yO1xuIl19
\ No newline at end of file

miniprogram/config/constants.ts

@@ -20,6 +20,7 @@ export const masterUrl = {
   CUSTOMER_SERVER_URL: 'https://dcxy-customer-manage.dcrym.com',
   BASE_SERVER_URL: 'https://dcxy-base-manage.dcrym.com',
   OPERATOR_SERVER_URL: 'https://op-man-serv.dcrym.com',
+  DEVICE_SERVEL_URL: 'https://device-management-api.dcrym.com',
 };
 
 export const successCode = 1000;

miniprogram/pages/equipment/equipment.js

@@ -25,17 +25,19 @@ 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 || JSON.stringify(err) || '网络错误',
+                title: err.msg || err.errMsg || '网络错误',
                 icon: 'none',
                 duration: 4000,
             });
@@ -52,4 +54,4 @@ Page({
         });
     },
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXF1aXBtZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiZXF1aXBtZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEseUNBQThDO0FBRzlDLElBQUksQ0FBQztJQUlILElBQUksRUFBRTtRQUNKLE1BQU0sRUFBRSxDQUFDLFNBQVMsRUFBRSxTQUFTLEVBQUUsU0FBUyxFQUFFLFNBQVMsQ0FBQztRQUNwRCxnQkFBZ0IsRUFBRSxFQUFFO1FBQ3BCLFlBQVksRUFBRSxFQUFFO1FBQ2hCLFdBQVcsRUFBRSxFQUFFO1FBQ2YsS0FBSyxFQUFFLENBQUM7S0FDVDtJQUtELE1BQU07UUFDSixPQUFPLENBQUMsR0FBRyxDQUFDLFdBQVcsQ0FBQyxDQUFDO1FBQ3pCLElBQUksQ0FBQyxTQUFTLEVBQUUsQ0FBQztJQUNuQixDQUFDO0lBRUQsU0FBUztRQUFULGlCQStCQztRQTlCQyxFQUFFLENBQUMsV0FBVyxDQUFDO1lBQ2IsS0FBSyxFQUFFLEtBQUs7U0FDYixDQUFDLENBQUM7UUFDSCxtQkFBVyxDQUFDO1lBQ1YsR0FBRyxFQUFFLHlCQUF5QjtTQUMvQixDQUFDO2FBQ0MsSUFBSSxDQUFDLFVBQUEsR0FBRztZQUNQLEVBQUUsQ0FBQyxXQUFXLEVBQUUsQ0FBQztZQUNqQixPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1lBQ1gsSUFBQSxhQUEwRCxFQUF4RCxzQ0FBZ0IsRUFBRSw4QkFBWSxFQUFFLDRCQUFXLENBQWM7WUFLakUsS0FBSSxDQUFDLE9BQVEsQ0FBQztnQkFDWixnQkFBZ0Isa0JBQUE7Z0JBQ2hCLFlBQVksY0FBQTtnQkFDWixXQUFXLGFBQUE7YUFFWixDQUFDLENBQUM7UUFDTCxDQUFDLENBQUM7YUFDRCxLQUFLLENBQUMsVUFBQSxHQUFHO1lBQ1IsT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQztZQUNqQixFQUFFLENBQUMsV0FBVyxFQUFFLENBQUM7WUFDakIsRUFBRSxDQUFDLFNBQVMsQ0FBQztnQkFDWCxLQUFLLEVBQUUsR0FBRyxDQUFDLEdBQUcsSUFBSSxJQUFJLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxJQUFJLE1BQU07Z0JBQy9DLElBQUksRUFBRSxNQUFNO2dCQUNaLFFBQVEsRUFBRSxJQUFJO2FBQ2YsQ0FBQyxDQUFDO1FBQ0wsQ0FBQyxDQUFDLENBQUM7SUFDUCxDQUFDO0lBQ0QsWUFBWSxZQUFDLENBQUM7UUFDSixJQUFBLHFDQUFLLENBQTZCO1FBQzFDLElBQU0sSUFBSSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDL0MsRUFBRSxDQUFDLFVBQVUsQ0FBQztZQUNaLEdBQUcsRUFBRSxtREFBaUQsSUFBSSxDQUFDLE1BQU0sa0JBQWEsSUFBSSxDQUFDLFFBQVU7WUFDN0YsT0FBTyxFQUFFLFVBQVMsR0FBRztnQkFFbkIsR0FBRyxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsMEJBQTBCLEVBQUUsRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztZQUNwRSxDQUFDO1NBQ0YsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztDQUNGLENBQUMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IGRldmljZUZldGNoIH0gZnJvbSAnLi4vLi4vYXBpL2ZldGNoJztcblxuLy8gbWluaXByb2dyYW0vcGFnZXMvZXF1aXBtZW50L2VxdWlwbWVudC5qc1xuUGFnZSh7XG4gIC8qKlxuICAgKiDpobXpnaLnmoTliJ3lp4vmlbDmja5cbiAgICovXG4gIGRhdGE6IHtcbiAgICBjb2xvcnM6IFsnIzY4OTVmZScsICcjZmU2ODY4JywgJyM2ZWUxOGYnLCAnI2ZlYWU2OCddLFxuICAgIGFyZWFEZXZpY2VBbW91bnQ6IFtdLFxuICAgIHN0YXR1c0Ftb3VudDogW10sXG4gICAgdG90YWxBbW91bnQ6IFtdLFxuICAgIHRvdGFsOiAwLFxuICB9LFxuXG4gIC8qKlxuICAgKiDnlJ/lkb3lkajmnJ/lh73mlbAtLeebkeWQrOmhtemdouWKoOi9vVxuICAgKi9cbiAgb25Mb2FkKCkge1xuICAgIGNvbnNvbGUubG9nKCdpbiBvbkxvYWQnKTtcbiAgICB0aGlzLmZldGNoTGlzdCgpO1xuICB9LFxuXG4gIGZldGNoTGlzdCgpIHtcbiAgICB3eC5zaG93TG9hZGluZyh7XG4gICAgICB0aXRsZTogJ+WKoOi9veS4rScsXG4gICAgfSk7XG4gICAgZGV2aWNlRmV0Y2goe1xuICAgICAgdXJsOiAnL2RldmljZS9yZXBvcnQvbWFpblBhZ2UnLFxuICAgIH0pXG4gICAgICAudGhlbihyZXMgPT4ge1xuICAgICAgICB3eC5oaWRlTG9hZGluZygpO1xuICAgICAgICBjb25zb2xlLmxvZyhyZXMpO1xuICAgICAgICBjb25zdCB7IGFyZWFEZXZpY2VBbW91bnQsIHN0YXR1c0Ftb3VudCwgdG90YWxBbW91bnQgfSA9IHJlcy5kYXRhO1xuICAgICAgICAvLyBsZXQgdG90YWwgPSB0b3RhbEFtb3VudC5yZWR1Y2UoXG4gICAgICAgIC8vICAgKGNvdW50OiBOdW1iZXIsIGl0ZW0pID0+IGNvdW50ICsgaXRlbS52YWx1ZSxcbiAgICAgICAgLy8gICAwLFxuICAgICAgICAvLyApO1xuICAgICAgICB0aGlzLnNldERhdGEhKHtcbiAgICAgICAgICBhcmVhRGV2aWNlQW1vdW50LFxuICAgICAgICAgIHN0YXR1c0Ftb3VudCxcbiAgICAgICAgICB0b3RhbEFtb3VudCxcbiAgICAgICAgICAvLyB0b3RhbCxcbiAgICAgICAgfSk7XG4gICAgICB9KVxuICAgICAgLmNhdGNoKGVyciA9PiB7XG4gICAgICAgIGNvbnNvbGUubG9nKGVycik7XG4gICAgICAgIHd4LmhpZGVMb2FkaW5nKCk7XG4gICAgICAgIHd4LnNob3dUb2FzdCh7XG4gICAgICAgICAgdGl0bGU6IGVyci5tc2cgfHwgSlNPTi5zdHJpbmdpZnkoZXJyKSB8fCAn572R57uc6ZSZ6K+vJyxcbiAgICAgICAgICBpY29uOiAnbm9uZScsXG4gICAgICAgICAgZHVyYXRpb246IDQwMDAsXG4gICAgICAgIH0pO1xuICAgICAgfSk7XG4gIH0sXG4gIGdvUmVwb3J0UGFnZShlKSB7XG4gICAgY29uc3QgeyBpbmRleCB9ID0gZS5jdXJyZW50VGFyZ2V0LmRhdGFzZXQ7XG4gICAgY29uc3QgaXRlbSA9IHRoaXMuZGF0YS5hcmVhRGV2aWNlQW1vdW50W2luZGV4XTtcbiAgICB3eC5uYXZpZ2F0ZVRvKHtcbiAgICAgIHVybDogYC9wYWdlcy9lcXVpcG1lbnRSZXBvcnQvZXF1aXBtZW50UmVwb3J0P2FyZWFJZD0ke2l0ZW0uYXJlYUlkfSZhcmVhTmFtZT0ke2l0ZW0uYXJlYU5hbWV9YCxcbiAgICAgIHN1Y2Nlc3M6IGZ1bmN0aW9uKHJlcykge1xuICAgICAgICAvLyDpgJrov4dldmVudENoYW5uZWzlkJHooqvmiZPlvIDpobXpnaLkvKDpgIHmlbDmja5cbiAgICAgICAgcmVzLmV2ZW50Q2hhbm5lbC5lbWl0KCdhY2NlcHREYXRhRnJvbU9wZW5lclBhZ2UnLCB7IGRhdGE6IGl0ZW0gfSk7XG4gICAgICB9LFxuICAgIH0pO1xuICB9LFxufSk7XG4iXX0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXF1aXBtZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiZXF1aXBtZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEseUNBQThDO0FBRzlDLElBQUksQ0FBQztJQUlILElBQUksRUFBRTtRQUNKLE1BQU0sRUFBRSxDQUFDLFNBQVMsRUFBRSxTQUFTLEVBQUUsU0FBUyxFQUFFLFNBQVMsQ0FBQztRQUNwRCxnQkFBZ0IsRUFBRSxFQUFFO1FBQ3BCLFlBQVksRUFBRSxFQUFFO1FBQ2hCLFdBQVcsRUFBRSxFQUFFO1FBQ2YsS0FBSyxFQUFFLENBQUM7S0FDVDtJQUtELE1BQU07UUFDSixPQUFPLENBQUMsR0FBRyxDQUFDLFdBQVcsQ0FBQyxDQUFDO1FBQ3pCLElBQUksQ0FBQyxTQUFTLEVBQUUsQ0FBQztJQUNuQixDQUFDO0lBRUQsU0FBUztRQUFULGlCQStCQztRQTlCQyxFQUFFLENBQUMsV0FBVyxDQUFDO1lBQ2IsS0FBSyxFQUFFLEtBQUs7U0FDYixDQUFDLENBQUM7UUFDSCxtQkFBVyxDQUFDO1lBQ1YsR0FBRyxFQUFFLHlCQUF5QjtTQUMvQixDQUFDO2FBQ0MsSUFBSSxDQUFDLFVBQUEsR0FBRztZQUNQLEVBQUUsQ0FBQyxXQUFXLEVBQUUsQ0FBQztZQUNqQixPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1lBQ1gsSUFBQSxhQUEwRCxFQUF4RCxzQ0FBZ0IsRUFBRSw4QkFBWSxFQUFFLDRCQUFXLENBQWM7WUFDakUsSUFBSSxLQUFLLEdBQUcsV0FBVyxDQUFDLE1BQU0sQ0FDNUIsVUFBQyxLQUFhLEVBQUUsSUFBSSxJQUFLLE9BQUEsS0FBSyxHQUFHLElBQUksQ0FBQyxLQUFLLEVBQWxCLENBQWtCLEVBQzNDLENBQUMsQ0FDRixDQUFDO1lBQ0YsS0FBSSxDQUFDLE9BQVEsQ0FBQztnQkFDWixnQkFBZ0Isa0JBQUE7Z0JBQ2hCLFlBQVksY0FBQTtnQkFDWixXQUFXLGFBQUE7Z0JBQ1gsS0FBSyxPQUFBO2FBQ04sQ0FBQyxDQUFDO1FBQ0wsQ0FBQyxDQUFDO2FBQ0QsS0FBSyxDQUFDLFVBQUEsR0FBRztZQUNSLE9BQU8sQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUM7WUFDakIsRUFBRSxDQUFDLFdBQVcsRUFBRSxDQUFDO1lBQ2pCLEVBQUUsQ0FBQyxTQUFTLENBQUM7Z0JBQ1gsS0FBSyxFQUFFLEdBQUcsQ0FBQyxHQUFHLElBQUksR0FBRyxDQUFDLE1BQU0sSUFBSSxNQUFNO2dCQUN0QyxJQUFJLEVBQUUsTUFBTTtnQkFDWixRQUFRLEVBQUUsSUFBSTthQUNmLENBQUMsQ0FBQztRQUNMLENBQUMsQ0FBQyxDQUFDO0lBQ1AsQ0FBQztJQUNELFlBQVksWUFBQyxDQUFDO1FBQ0osSUFBQSxxQ0FBSyxDQUE2QjtRQUMxQyxJQUFNLElBQUksR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLGdCQUFnQixDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQy9DLEVBQUUsQ0FBQyxVQUFVLENBQUM7WUFDWixHQUFHLEVBQUUsbURBQWlELElBQUksQ0FBQyxNQUFNLGtCQUFhLElBQUksQ0FBQyxRQUFVO1lBQzdGLE9BQU8sRUFBRSxVQUFTLEdBQUc7Z0JBRW5CLEdBQUcsQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLDBCQUEwQixFQUFFLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7WUFDcEUsQ0FBQztTQUNGLENBQUMsQ0FBQztJQUNMLENBQUM7Q0FDRixDQUFDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBkZXZpY2VGZXRjaCB9IGZyb20gJy4uLy4uL2FwaS9mZXRjaCc7XG5cbi8vIG1pbmlwcm9ncmFtL3BhZ2VzL2VxdWlwbWVudC9lcXVpcG1lbnQuanNcblBhZ2Uoe1xuICAvKipcbiAgICog6aG16Z2i55qE5Yid5aeL5pWw5o2uXG4gICAqL1xuICBkYXRhOiB7XG4gICAgY29sb3JzOiBbJyM2ODk1ZmUnLCAnI2ZlNjg2OCcsICcjNmVlMThmJywgJyNmZWFlNjgnXSxcbiAgICBhcmVhRGV2aWNlQW1vdW50OiBbXSxcbiAgICBzdGF0dXNBbW91bnQ6IFtdLFxuICAgIHRvdGFsQW1vdW50OiBbXSxcbiAgICB0b3RhbDogMCxcbiAgfSxcblxuICAvKipcbiAgICog55Sf5ZG95ZGo5pyf5Ye95pWwLS3nm5HlkKzpobXpnaLliqDovb1cbiAgICovXG4gIG9uTG9hZCgpIHtcbiAgICBjb25zb2xlLmxvZygnaW4gb25Mb2FkJyk7XG4gICAgdGhpcy5mZXRjaExpc3QoKTtcbiAgfSxcblxuICBmZXRjaExpc3QoKSB7XG4gICAgd3guc2hvd0xvYWRpbmcoe1xuICAgICAgdGl0bGU6ICfliqDovb3kuK0nLFxuICAgIH0pO1xuICAgIGRldmljZUZldGNoKHtcbiAgICAgIHVybDogJy9kZXZpY2UvcmVwb3J0L21haW5QYWdlJyxcbiAgICB9KVxuICAgICAgLnRoZW4ocmVzID0+IHtcbiAgICAgICAgd3guaGlkZUxvYWRpbmcoKTtcbiAgICAgICAgY29uc29sZS5sb2cocmVzKTtcbiAgICAgICAgY29uc3QgeyBhcmVhRGV2aWNlQW1vdW50LCBzdGF0dXNBbW91bnQsIHRvdGFsQW1vdW50IH0gPSByZXMuZGF0YTtcbiAgICAgICAgbGV0IHRvdGFsID0gdG90YWxBbW91bnQucmVkdWNlKFxuICAgICAgICAgIChjb3VudDogTnVtYmVyLCBpdGVtKSA9PiBjb3VudCArIGl0ZW0udmFsdWUsXG4gICAgICAgICAgMCxcbiAgICAgICAgKTtcbiAgICAgICAgdGhpcy5zZXREYXRhISh7XG4gICAgICAgICAgYXJlYURldmljZUFtb3VudCxcbiAgICAgICAgICBzdGF0dXNBbW91bnQsXG4gICAgICAgICAgdG90YWxBbW91bnQsXG4gICAgICAgICAgdG90YWwsXG4gICAgICAgIH0pO1xuICAgICAgfSlcbiAgICAgIC5jYXRjaChlcnIgPT4ge1xuICAgICAgICBjb25zb2xlLmxvZyhlcnIpO1xuICAgICAgICB3eC5oaWRlTG9hZGluZygpO1xuICAgICAgICB3eC5zaG93VG9hc3Qoe1xuICAgICAgICAgIHRpdGxlOiBlcnIubXNnIHx8IGVyci5lcnJNc2cgfHwgJ+e9kee7nOmUmeivrycsXG4gICAgICAgICAgaWNvbjogJ25vbmUnLFxuICAgICAgICAgIGR1cmF0aW9uOiA0MDAwLFxuICAgICAgICB9KTtcbiAgICAgIH0pO1xuICB9LFxuICBnb1JlcG9ydFBhZ2UoZSkge1xuICAgIGNvbnN0IHsgaW5kZXggfSA9IGUuY3VycmVudFRhcmdldC5kYXRhc2V0O1xuICAgIGNvbnN0IGl0ZW0gPSB0aGlzLmRhdGEuYXJlYURldmljZUFtb3VudFtpbmRleF07XG4gICAgd3gubmF2aWdhdGVUbyh7XG4gICAgICB1cmw6IGAvcGFnZXMvZXF1aXBtZW50UmVwb3J0L2VxdWlwbWVudFJlcG9ydD9hcmVhSWQ9JHtpdGVtLmFyZWFJZH0mYXJlYU5hbWU9JHtpdGVtLmFyZWFOYW1lfWAsXG4gICAgICBzdWNjZXNzOiBmdW5jdGlvbihyZXMpIHtcbiAgICAgICAgLy8g6YCa6L+HZXZlbnRDaGFubmVs5ZCR6KKr5omT5byA6aG16Z2i5Lyg6YCB5pWw5o2uXG4gICAgICAgIHJlcy5ldmVudENoYW5uZWwuZW1pdCgnYWNjZXB0RGF0YUZyb21PcGVuZXJQYWdlJywgeyBkYXRhOiBpdGVtIH0pO1xuICAgICAgfSxcbiAgICB9KTtcbiAgfSxcbn0pO1xuIl19
\ No newline at end of file

miniprogram/pages/equipment/equipment.ts

@@ -32,22 +32,22 @@ Page({
         wx.hideLoading();
         console.log(res);
         const { areaDeviceAmount, statusAmount, totalAmount } = res.data;
-        // let total = totalAmount.reduce(
-        //   (count: Number, 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 || JSON.stringify(err) || '网络错误',
+          title: err.msg || err.errMsg || '网络错误',
           icon: 'none',
           duration: 4000,
         });