Commit 8d03e0b3 by Nguyễn Thị Thúy

Merge branch 'phase2_home' into 'dev_phase2'

Phase2 home

See merge request !11
parents dc328c41 f362a5d6
import React from 'react'; import React from 'react';
import { import {
View, View,
Text,
ImageBackground, ImageBackground,
StyleSheet, StyleSheet,
ScrollView, ScrollView,
} from 'react-native'; } from 'react-native';
import HeaderHome from '../../components/Header/HeaderHome'; import HeaderHome from '../../components/Header/HeaderHome';
import Footer from './Footer'; import {getFontXD} from '../../Config/Functions';
import {HEIGHT, HEIGHTXD, toPriceVnd, getFontXD} from '../../Config/Functions';
import R from '../../assets/R'; import R from '../../assets/R';
import AppText from '../../components/AppText';
import SwiperComponent from './SwiperComponent'; import SwiperComponent from './SwiperComponent';
import PriceListView from './PriceListView'; import PriceListView from './PriceListView';
......
...@@ -47,12 +47,12 @@ const ItemPrice = (props) => { ...@@ -47,12 +47,12 @@ const ItemPrice = (props) => {
justifyContent: 'space-between', justifyContent: 'space-between',
alignItems: 'center', alignItems: 'center',
}}> }}>
<Image source={item.isUp ? R.images.iconTriangleUp : R.images.iconTriangleDown} style={styles.imgIcon} /> <Image source={item.is_up ? R.images.iconTriangleUp : R.images.iconTriangleDown} style={styles.imgIcon} />
<Text style={[styles.txtBlack, {flexWrap: 'wrap', color: item.isUp ? R.colors.green : R.colors.red2}]}> <Text style={[styles.txtBlack, {flexWrap: 'wrap', color: item.is_up ? R.colors.green : R.colors.red2}]}>
{item.change} {item.change}
</Text> </Text>
</View> </View>
<Text style={[styles.txtMoney, {color: item.isUp ? R.colors.green : R.colors.red2}]}>{`${item.change}%`}</Text> <Text style={[styles.txtMoney, {color: item.is_up ? R.colors.green : R.colors.red2}]}>{`${item.change_percent}%`}</Text>
</View> </View>
</Block> </Block>
<Block padding={[0, 0]} space={'between'} flex={1}> <Block padding={[0, 0]} space={'between'} flex={1}>
...@@ -73,9 +73,9 @@ const ItemPrice = (props) => { ...@@ -73,9 +73,9 @@ const ItemPrice = (props) => {
<Text style={[styles.txtBlack, {flexWrap: 'wrap'}]} <Text style={[styles.txtBlack, {flexWrap: 'wrap'}]}
ellipsizeMode='tail'> ellipsizeMode='tail'>
{item.openPrice} {item.open_price}
</Text> </Text>
<Image source={item.isUp ? R.images.iconTriangleUp : R.images.iconTriangleDown} style={styles.imgIcon} /> <Image source={item.is_up ? R.images.iconTriangleUp : R.images.iconTriangleDown} style={styles.imgIcon} />
</View> </View>
<View <View
style={{ style={{
...@@ -84,7 +84,7 @@ const ItemPrice = (props) => { ...@@ -84,7 +84,7 @@ const ItemPrice = (props) => {
justifyContent: 'space-between', justifyContent: 'space-between',
alignItems: 'center', alignItems: 'center',
}}> }}>
<Text style={[styles.txtMoney, {color: R.colors.gray}]}>{item.closePrice}</Text> <Text style={[styles.txtMoney, {color: R.colors.gray}]}>{item.close_price}</Text>
<Image source={R.images.iconCheck2} style={styles.imgIcon} /> <Image source={R.images.iconCheck2} style={styles.imgIcon} />
</View> </View>
</View> </View>
...@@ -104,7 +104,7 @@ const ItemPrice = (props) => { ...@@ -104,7 +104,7 @@ const ItemPrice = (props) => {
justifyContent: 'center', justifyContent: 'center',
}}> }}>
<Text style={[styles.txtBlack, {flexWrap: 'wrap'}]}> <Text style={[styles.txtBlack, {flexWrap: 'wrap'}]}>
{item.highPrice} {item.high_price}
</Text> </Text>
<Text style={[styles.txtGray, {flexWrap: 'wrap'}]}> <Text style={[styles.txtGray, {flexWrap: 'wrap'}]}>
H H
...@@ -116,7 +116,7 @@ const ItemPrice = (props) => { ...@@ -116,7 +116,7 @@ const ItemPrice = (props) => {
flexDirection: 'row', flexDirection: 'row',
justifyContent: 'center', justifyContent: 'center',
}}> }}>
<Text style={styles.txtMoney}>{item.lowPrice}</Text> <Text style={styles.txtMoney}>{item.low_price}</Text>
<Text style={[styles.txtGray, {flexWrap: 'wrap'}]}> <Text style={[styles.txtGray, {flexWrap: 'wrap'}]}>
L L
</Text> </Text>
......
import React, {useState} from 'react'; import React, {useState, useEffect} from 'react';
import { import {
View, View,
Text, Text,
......
import {GetData} from '../helpers';
import url from '../url';
export const getPriceTable = async (body) =>
GetData(url.urlGetPriceTable, body)
.then((res) => res)
.catch((err) => err);
...@@ -25,6 +25,7 @@ export default { ...@@ -25,6 +25,7 @@ export default {
//Home //Home
urlGetTransaction: root + 'api/v1/customers/statistic-transaction', urlGetTransaction: root + 'api/v1/customers/statistic-transaction',
urlGetPriceTable: `${root}api/v1/customers/update-price-table`,
//History //History
urlGetListHistory: root + 'api/v1/customers/get-list-transaction-history', urlGetListHistory: root + 'api/v1/customers/get-list-transaction-history',
......
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