Commit caf61a03 by 姜雷

Merge branch 'develop' into test

parents eb6a9505 bd262fef
...@@ -47,10 +47,10 @@ const useAllBeanCount = ( ...@@ -47,10 +47,10 @@ const useAllBeanCount = (
item.serviceId === '11' || item.serviceId === '11' ||
item.serviceId === '9', item.serviceId === '9',
); );
let commonItem = beanAccount.find(item => item.serviceId === '1'); // let commonItem = beanAccount.find(item => item.serviceId === '1');
let beanMap = { let beanMap = {
[BeanType.aimi]: aimiItem ? aimiItem.money : 0, [BeanType.aimi]: aimiItem ? aimiItem.money : 0,
[BeanType.common]: commonItem ? commonItem.money : 0, // [BeanType.common]: commonItem ? commonItem.money : 0,
}; };
for (let index = 0; index < serviceList.length; index++) { for (let index = 0; index < serviceList.length; index++) {
const service = serviceList[index]; const service = serviceList[index];
......
...@@ -83,7 +83,7 @@ class OrderItem extends Component { ...@@ -83,7 +83,7 @@ class OrderItem extends Component {
</View> </View>
<View <View
className={`OrderItem-price ${orderState === '1' ? 'topay' : ''}`}> className={`OrderItem-price ${orderState === '1' ? 'topay' : ''}`}>
{payableMoney} {payableMoney.toFixed(2)}
</View> </View>
</View> </View>
); );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment