Merge branch 'v2-test' into 'v2-test'

src/components/Loading/index.tsx

@@ -123,7 +123,7 @@ const Loading: React.FC<LoadingProps> = (props: LoadingProps) => {
 Loading.defaultProps = {
   color: '#C0C4CC',
   size: 14,
-  text: '正在加载...',
+  text: 'loading',
   noMore: false,
   noMoreText: '没有更多啦~',
   textSize: 12,

src/locales/en_US/formInfo.ts

@@ -149,4 +149,5 @@ export default {
   'formInfo.Login.login': 'Login',
   'formInfo.Login.xieyi': 'agree on',
   'order.requireOrder.feedbackInformation': 'feedback information',
+  'formInfo.info.noMore': 'もう',
 };

src/locales/en_US/order.ts

@@ -103,6 +103,7 @@ export default {
   'order.detailInfo.purchaseRate': 'Purchase Exchange Rate',
   'order.detailInfo.etd': 'ETD',
   'order.detailInfo.eta': 'ETA',
+  'order.detailInfo.portOfDeparture': 'Port of departure',
   'order.detailInfo.portOfDepartment': 'Port of departure',
   'order.detailInfo.portOfDestination': 'Destination Port',
   'order.detailInfo.deliverPeriod': 'Planned shipment date',

src/locales/ja_JPN/order.ts

@@ -98,8 +98,8 @@ export default {
   'order.detailInfo.purchaseRate': '購買レート',
   'order.detailInfo.etd': 'ETD',
   'order.detailInfo.eta': 'ETA',
-  'order.detailInfo.portOfDeparture': '出港',
-  'order.detailInfo.portOfDestination': '目的港',
+  'order.detailInfo.portOfDeparture': 'こううん',
+  'order.detailInfo.portOfDestination': 'ですん',
   'order.detailInfo.deliverPeriod': '出荷予定日',
   'order.detailInfo.receivePeriod': '計画出荷日',
   'order.detailInfo.orderNo': '注文番号',

src/locales/zh_CN/formInfo.ts

@@ -135,4 +135,6 @@ export default {
   'formInfo.Login.login': '登录',
 
   'formInfo.Login.xieyi': '协议',
+
+  'formInfo.info.noMore': '没有更多啦~',
 };

src/views/CheckInquiryOrder/components/InquiryOrderItem/index.tsx

@@ -60,7 +60,7 @@ const InquiryOrderItem = props => {
                 <View style={{ marginRight: 4 }}>
                   <Text style={myStyle['box-bottome-content-left-text-label']}>
                     {/* <Icons name="user" size={14} color="#C0C4CC" /> */}
-                    {`${t('order.tip.CutOff', '截止时间')}\t`}
+                    {`${t('order.filterBar.CutOff', '截止时间')}\t`}
                   </Text>
                 </View>
                 <Text style={myStyle['box-bottome-content-left-text-value']}>

src/views/CheckInquiryOrder/components/InquiryOrderItem/styles.ts

@@ -117,7 +117,8 @@ export default (theme: ThemeStyle) =>
       backgroundColor: '#EBF9F6',
       borderRadius: 4,
       height: 24,
-      width: 72,
+      // width: 72,
+      paddingHorizontal: 6,
       justifyContent: 'center',
       alignItems: 'center',
       marginRight: 8,

src/views/CheckInquiryOrder/styles.ts

@@ -185,7 +185,8 @@ export default (theme: ThemeStyle) =>
       backgroundColor: '#EBF9F6',
       borderRadius: 4,
       height: 24,
-      width: 72,
+      // width: 72,
+      paddingHorizontal: 6,
       justifyContent: 'center',
       alignItems: 'center',
       marginRight: 8,

src/views/CheckQuotationOrder/components/CheckOrderItem/styles.ts

@@ -207,7 +207,8 @@ export default (theme: ThemeStyle) =>
       backgroundColor: '#EBF9F6',
       borderRadius: 4,
       height: 24,
-      width: 72,
+      // width: 72,
+      paddingHorizontal: 6,
       justifyContent: 'center',
       alignItems: 'center',
       marginRight: 8,

src/views/CheckQuotationOrder/styles.ts

@@ -184,7 +184,8 @@ export default (theme: ThemeStyle) =>
       backgroundColor: '#EBF9F6',
       borderRadius: 4,
       height: 24,
-      width: 72,
+      // width: 72,
+      paddingHorizontal: 6,
       justifyContent: 'center',
       alignItems: 'center',
       marginRight: 8,

src/views/CheckRequireOrder/components/CheckOrderItem/styles.ts

@@ -208,7 +208,8 @@ export default (theme: ThemeStyle) =>
       backgroundColor: '#EBF9F6',
       borderRadius: 4,
       height: 24,
-      width: 72,
+      // width: 72,
+      paddingHorizontal: 6,
       justifyContent: 'center',
       alignItems: 'center',
       marginRight: 8,

src/views/CheckRequireOrder/styles.ts

@@ -184,7 +184,8 @@ export default (theme: ThemeStyle) =>
       backgroundColor: '#EBF9F6',
       borderRadius: 4,
       height: 24,
-      width: 72,
+      // width: 72,
+      paddingHorizontal: 6,
       justifyContent: 'center',
       alignItems: 'center',
       marginRight: 8,

src/views/EnsureInquiryOrder/components/CheckOrderItem/styles.ts

@@ -218,7 +218,8 @@ export default (theme: ThemeStyle) =>
       backgroundColor: '#EBF9F6',
       borderRadius: 4,
       height: 24,
-      width: 72,
+      // width: 72,
+      paddingHorizontal: 6,
       justifyContent: 'center',
       alignItems: 'center',
       marginRight: 8,

src/views/EnsureInquiryOrder/styles.ts

@@ -182,7 +182,8 @@ export default (theme: ThemeStyle) =>
       backgroundColor: '#EBF9F6',
       borderRadius: 4,
       height: 24,
-      width: 72,
+      // width: 72,
+      paddingHorizontal: 6,
       justifyContent: 'center',
       alignItems: 'center',
       marginRight: 8,

src/views/RequireOrder/components/CommodityItem/styles.ts

@@ -181,7 +181,8 @@ export default (theme: ThemeStyle) =>
       backgroundColor: '#F5F6F7',
       borderRadius: 4,
       height: 24,
-      width: 72,
+      // width: 72,
+      paddingHorizontal: 6,
       justifyContent: 'center',
       alignItems: 'center',
       marginRight: 8,

src/views/RequireOrder/pages/RequirePriceOrder/components/OrderList/styles.ts

@@ -113,7 +113,7 @@ export default (theme: ThemeStyle) =>
     },
     'box-top-text': {
       color: '#252D37',
-      fontWeight:'bold',
+      fontWeight: 'bold',
       fontFamily: '',
     },
     'box-bottome': {
@@ -183,7 +183,8 @@ export default (theme: ThemeStyle) =>
       backgroundColor: '#EBF9F6',
       borderRadius: 4,
       height: 24,
-      width: 72,
+      // width: 72,
+      paddingHorizontal: 6,
       justifyContent: 'center',
       alignItems: 'center',
       marginRight: 8,

src/views/RequireOrder/pages/RequirePriceOrder/styles.ts

@@ -182,7 +182,8 @@ export default (theme: ThemeStyle) =>
       backgroundColor: '#EBF9F6',
       borderRadius: 4,
       height: 24,
-      width: 72,
+      // width: 72,
+      paddingHorizontal: 6,
       justifyContent: 'center',
       alignItems: 'center',
       marginRight: 8,

src/views/RequireOrder/styles.ts

@@ -182,7 +182,8 @@ export default (theme: ThemeStyle) =>
       backgroundColor: '#EBF9F6',
       borderRadius: 4,
       height: 24,
-      width: 72,
+      // width: 72,
+      paddingHorizontal: 6,
       justifyContent: 'center',
       alignItems: 'center',
       marginRight: 8,