Commit 0a44ce3a by 姜雷

Merge branch 'develop' into test

parents b386eb00 b6e820f0
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
"wxbarcode": "^1.0.2" "wxbarcode": "^1.0.2"
}, },
"devDependencies": { "devDependencies": {
"@tarojs/cli": "^1.2.13",
"@tarojs/plugin-babel": "1.2.13", "@tarojs/plugin-babel": "1.2.13",
"@tarojs/plugin-csso": "1.2.13", "@tarojs/plugin-csso": "1.2.13",
"@tarojs/plugin-sass": "1.2.13", "@tarojs/plugin-sass": "1.2.13",
......
...@@ -359,7 +359,7 @@ class Home extends Component { ...@@ -359,7 +359,7 @@ class Home extends Component {
beanItem.serviceId === BeanType.aimi ? ( beanItem.serviceId === BeanType.aimi ? (
<View className='Home-UserBox-BeanItem'> <View className='Home-UserBox-BeanItem'>
<Image className='Home-UserBox-BeanIcon' src={AimiIcon} /> <Image className='Home-UserBox-BeanIcon' src={AimiIcon} />
<Text>艾米</Text> <Text>艾米:</Text>
<Text className='Home-UserBox-BeanCount'> <Text className='Home-UserBox-BeanCount'>
{beanItem.money ? beanItem.money.toFixed(2) : '0.00'} {beanItem.money ? beanItem.money.toFixed(2) : '0.00'}
</Text> </Text>
......
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