Merge branch 'develop' into test

src/pages/Account/Account.tsx

@@ -64,6 +64,7 @@ export const AccountComponent = () => {
     }
     console.log('in recharge');
     let preAimiItem = filterBeanList.find(item => item.serviceId === '0');
+    let preAimi = preAimiItem ? preAimiItem.money : 0;
     rechargeOrder({
       id: payConfigId,
       customerId: userinfo.customerId,
@@ -102,13 +103,7 @@ export const AccountComponent = () => {
                     let aimiItem = beanAccount.find(
                       item => item.serviceId === '0',
                     );
-                    if (
-                      aimiItem &&
-                      aimiItem.money &&
-                      preAimiItem &&
-                      preAimiItem.money &&
-                      aimiItem.money === preAimiItem.money
-                    ) {
+                    if (aimiItem && aimiItem.money === preAimi) {
                       Taro.showModal({
                         title: '提示',
                         content:
@@ -162,7 +157,9 @@ export const AccountComponent = () => {
                 <View className='Account-Card-label'>
                   {creditInfo.showType == '1' ? '我的授信' : '我的保证金'}
                 </View>
-                <View className='Account-Card-num'>{creditInfo.amount}</View>
+                <View className='Account-Card-num'>
+                  {creditInfo.amount.toFixed(2)}
+                </View>
               </View>
             )}
           </View>

src/pages/BarCode/BarCode.tsx

-import Taro, { Component } from '@tarojs/taro';
+import Taro, { Component, useEffect } from '@tarojs/taro';
 import { ComponentClass } from 'react';
 import { View, Canvas, Image, Text } from '@tarojs/components';
 
@@ -164,6 +164,12 @@ class BarCode extends Component {
         state.orderState.waitPayOrderState,
     );
 
+    useEffect(() => {
+      if (!payOrderState) {
+        this.drawBarCode();
+      }
+    }, [payOrderState]);
+
     return (
       <View className='BarCode'>
         <WaitPayOrderComponent />
@@ -180,16 +186,19 @@ class BarCode extends Component {
               src={RefreshIcon}
               onClick={this.refreshCodeBar}
             />
-            <View className={`BarCodeImg ${showBig ? 'BarCodeImgBig' : ''}`}>
-              <Canvas
-                className={`BarCodeCav ${showBig ? 'show' : ''}`}
-                canvasId='BarCodeBig'
-              />
-              <Canvas
-                className={`BarCodeCav ${showBig ? '' : 'show'}`}
-                canvasId='BarCode'
-              />
-            </View>
+            {payOrderState ? null : (
+              <View className={`BarCodeImg ${showBig ? 'BarCodeImgBig' : ''}`}>
+                <Canvas
+                  className={`BarCodeCav ${showBig ? 'show' : ''}`}
+                  canvasId='BarCodeBig'
+                />
+                <Canvas
+                  className={`BarCodeCav ${showBig ? '' : 'show'}`}
+                  canvasId='BarCode'
+                />
+              </View>
+            )}
+
             <View className='toggleBtn' onClick={this.toggleBigBarCode}>
               <Image
                 className={`arricon ${showBig ? 'rever' : ''}`}