Merge branch 'develop' into test

src/pages/Home/Home.tsx

@@ -342,9 +342,9 @@ class Home extends Component {
                   </View>
                 ) : null,
               )}
-            {serviceList && serviceList.length % 2 ? (
+            {serviceList && serviceList.length % 2 ? null : (
               <View className='Home-UserBox-BeanItem' />
-            ) : null}
+            )}
           </View>
 
           <View className='Home-UserBox-Order'>