Merge branch 'develop' into test

src/hooks/useAllBeanCount.ts

@@ -47,7 +47,7 @@ const useAllBeanCount = (
         item.serviceId === '11' ||
         item.serviceId === '9',
     );
-    let commonItem = beanAccount.find(item => item.serviceId === '0');
+    let commonItem = beanAccount.find(item => item.serviceId === '1');
     let beanMap = {
       [BeanType.aimi]: aimiItem ? aimiItem.money : 0,
       [BeanType.common]: commonItem ? commonItem.money : 0,

src/pages/Order/OrderList/OrderList.tsx

@@ -209,7 +209,10 @@ class OrderList extends Component {
         updateRechargeOrders(res.data);
       })
       .catch(err => {
-        console.log(err);
+        Taro.showToast({
+          title: err.msg || '请求失败',
+          icon: 'none',
+        });
       });
   }
   appendRechargeOrders() {