Merge branch 'develop' into test

src/pages/Account/Account.tsx

@@ -62,9 +62,11 @@ export const AccountComponent = () => {
       });
       return;
     }
-    console.log('in recharge');
-    let preAimiItem = filterBeanList.find(item => item.serviceId === '0');
+    let preAimiItem = filterBeanList.find(
+      item => item.serviceId === BeanType.aimi,
+    );
     let preAimi = preAimiItem ? preAimiItem.money : 0;
+    console.log('in recharge: preAimi', preAimiItem, preAimi);
     rechargeOrder({
       id: payConfigId,
       customerId: userinfo.customerId,
@@ -99,10 +101,10 @@ export const AccountComponent = () => {
                   userinfo.customerPhone,
                 )
                   .then(beanAccount => {
-                    console.log(beanAccount);
                     let aimiItem = beanAccount.find(
                       item => item.serviceId === '0',
                     );
+                    console.log(aimiItem, preAimi);
                     if (aimiItem && aimiItem.money === preAimi) {
                       Taro.showModal({
                         title: '提示',