Merge branch 'develop' into product

app/containers/login/module/FillDomainModel.js

@@ -15,7 +15,6 @@ import {
   second_text_size,
   title_text_color,
   pxSize,
-  scale,
 } from '../../../base/BaseStyle'
 import { show } from '../../../utils/Utils'
 
@@ -153,12 +152,12 @@ const styles = StyleSheet.create({
   cont_inner: {
     position: 'absolute',
     left: 0,
-    top: scale(196),
+    top: pxSize(196),
     width: Width() - 60,
     flex: 1,
     flexDirection: 'column',
     backgroundColor: foundation_color,
-    height: scale(360),
+    height: pxSize(360),
     borderRadius: 10,
     marginHorizontal: 30,
     marginVertical: 20,