Commit 2a4834bf by Giang Tran

update newfeed

parent 02523d78
...@@ -893,7 +893,7 @@ ...@@ -893,7 +893,7 @@
CODE_SIGN_ENTITLEMENTS = Invest/Invest.entitlements; CODE_SIGN_ENTITLEMENTS = Invest/Invest.entitlements;
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 11; CURRENT_PROJECT_VERSION = 12;
DEVELOPMENT_TEAM = MXZ24GRH48; DEVELOPMENT_TEAM = MXZ24GRH48;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
GCC_PREPROCESSOR_DEFINITIONS = ( GCC_PREPROCESSOR_DEFINITIONS = (
...@@ -926,7 +926,7 @@ ...@@ -926,7 +926,7 @@
CODE_SIGN_ENTITLEMENTS = Invest/Invest.entitlements; CODE_SIGN_ENTITLEMENTS = Invest/Invest.entitlements;
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 11; CURRENT_PROJECT_VERSION = 12;
DEVELOPMENT_TEAM = MXZ24GRH48; DEVELOPMENT_TEAM = MXZ24GRH48;
INFOPLIST_FILE = Invest/Info.plist; INFOPLIST_FILE = Invest/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
......
...@@ -93,6 +93,7 @@ const Profile = (props) => { ...@@ -93,6 +93,7 @@ const Profile = (props) => {
]; ];
const index = checkFormatArray([type, urlFont, urlBack, urlSign]); const index = checkFormatArray([type, urlFont, urlBack, urlSign]);
if (index === true) { if (index === true) {
console.log('Data date', props.route.params);
const data = createFormData(urlFont, urlBack, urlSign, { const data = createFormData(urlFont, urlBack, urlSign, {
card_type: type.value, card_type: type.value,
uid: props.user.uid, uid: props.user.uid,
......
...@@ -10,9 +10,19 @@ const TransferView = (props) => { ...@@ -10,9 +10,19 @@ const TransferView = (props) => {
<View style={{flex: 1}}> <View style={{flex: 1}}>
<HeaderBack title={'Chuyển khoản'} /> <HeaderBack title={'Chuyển khoản'} />
<View style={{flex: 1, paddingHorizontal: 10, paddingTop: 10}}> <View style={{flex: 1, paddingHorizontal: 10, paddingTop: 10}}>
<TextField title={'Số tiền'} /> <TextField
<TextField title={'Phương thức nạp'} /> onChangeText={(val) => consoele.log(val)}
<TextMulti numberLines={3} title={'Ghi chú'} /> title={'Số tiền'}
/>
<TextField
onChangeText={(val) => consoele.log(val)}
title={'Phương thức nạp'}
/>
<TextMulti
onChangeText={(val) => consoele.log(val)}
numberLines={3}
title={'Ghi chú'}
/>
</View> </View>
<View style={styles.containerBtn}> <View style={styles.containerBtn}>
<Button title={'Chuyển tiền'} /> <Button title={'Chuyển tiền'} />
......
...@@ -28,7 +28,10 @@ const WalletDeposit = (props) => { ...@@ -28,7 +28,10 @@ const WalletDeposit = (props) => {
<View style={styles.wrapBody}> <View style={styles.wrapBody}>
<TextDisable value={'10010101'} title={'Số tài khoản CQG'} /> <TextDisable value={'10010101'} title={'Số tài khoản CQG'} />
<TextField title={'Số tiền'} isNumber={true} /> <TextField title={'Số tiền'} isNumber={true} />
<TextMulti title={'Ghi chú'} /> <TextMulti
onChangeText={(val) => consoele.log(val)}
title={'Ghi chú'}
/>
</View> </View>
</View> </View>
<View style={styles.btnSend}> <View style={styles.btnSend}>
......
...@@ -88,8 +88,15 @@ const WalletDeposit = (props) => { ...@@ -88,8 +88,15 @@ const WalletDeposit = (props) => {
}} }}
/> />
<TextField title={'Số tiền'} isNumber={true} /> <TextField
<TextMulti title={'Ghi chú'} /> onChangeText={(val) => consoele.log(val)}
title={'Số tiền'}
isNumber={true}
/>
<TextMulti
onChangeText={(val) => consoele.log(val)}
title={'Ghi chú'}
/>
</View> </View>
</View> </View>
<View style={styles.btnSend}> <View style={styles.btnSend}>
......
...@@ -94,7 +94,11 @@ const GeneralInfor = (props) => { ...@@ -94,7 +94,11 @@ const GeneralInfor = (props) => {
title={'Ngày sinh'} title={'Ngày sinh'}
/> />
<TextMulti value={props.user.address} title={'Địa chỉ'} /> <TextMulti
onChangeText={(val) => consoele.log(val)}
value={props.user.address}
title={'Địa chỉ'}
/>
<View style={{height: 40}} /> <View style={{height: 40}} />
<View style={{justifyContent: 'center', alignItems: 'center'}}> <View style={{justifyContent: 'center', alignItems: 'center'}}>
......
...@@ -42,9 +42,19 @@ const AddMethodPay = (props) => { ...@@ -42,9 +42,19 @@ const AddMethodPay = (props) => {
}} }}
/> />
<TextField title={'Chi nhánh'} /> <TextField
<TextField title={'Tên chủ tài khoản'} /> onChangeText={(val) => consoele.log(val)}
<TextField title={'Số tài khoản ngân hàng'} isNumber={true} /> title={'Chi nhánh'}
/>
<TextField
onChangeText={(val) => consoele.log(val)}
title={'Tên chủ tài khoản'}
/>
<TextField
onChangeText={(val) => consoele.log(val)}
title={'Số tài khoản ngân hàng'}
isNumber={true}
/>
</View> </View>
<TouchableOpacity style={styles.btn}> <TouchableOpacity style={styles.btn}>
<Text style={styles.txtAdd}>Thêm</Text> <Text style={styles.txtAdd}>Thêm</Text>
......
...@@ -13,10 +13,11 @@ const NewFeed = (props) => { ...@@ -13,10 +13,11 @@ const NewFeed = (props) => {
<View style={{flex: 1}}> <View style={{flex: 1}}>
<HeaderDrawer title={'Tin tức'} isWhite={true} /> <HeaderDrawer title={'Tin tức'} isWhite={true} />
<View style={{flex: 1, backgroundColor: 'white'}}> <View style={{flex: 1, backgroundColor: 'white'}}>
<Tab1 /> {/* <Tab1 /> */}
{/* <Tab.Navigator <Tab.Navigator
initialRouteName="GeneralInfor" initialRouteName="GeneralInfor"
swipeEnabled={true}
tabBarOptions={{ tabBarOptions={{
inactiveTintColor: '#929292', inactiveTintColor: '#929292',
activeTintColor: '#1473E6', activeTintColor: '#1473E6',
...@@ -26,14 +27,24 @@ const NewFeed = (props) => { ...@@ -26,14 +27,24 @@ const NewFeed = (props) => {
<Tab.Screen <Tab.Screen
name="Tab1" name="Tab1"
component={Tab1} component={Tab1}
options={{tabBarLabel: 'Chiến lược'}} options={{tabBarLabel: 'Tin tức'}}
/> />
<Tab.Screen <Tab.Screen
name="Tab2" name="Tab2"
component={Tab2} component={Tab2}
options={{tabBarLabel: 'Tin tức'}} options={{tabBarLabel: 'Media'}}
/>
<Tab.Screen
name="Tab3"
component={Tab2}
options={{tabBarLabel: 'Bảng giá'}}
/>
<Tab.Screen
name="Tab4"
component={Tab2}
options={{tabBarLabel: 'Biểu đồ'}}
/> />
</Tab.Navigator> */} </Tab.Navigator>
</View> </View>
</View> </View>
); );
......
...@@ -77,7 +77,7 @@ const NewFeed = (props) => { ...@@ -77,7 +77,7 @@ const NewFeed = (props) => {
setisRefresh(true); setisRefresh(true);
const res = await getListNew({ const res = await getListNew({
keyword: '', keyword: '',
category_id: '', category_id: selected,
platform: Platform.OS, platform: Platform.OS,
page_size: 10, page_size: 10,
page_index: page + 1, page_index: page + 1,
...@@ -94,6 +94,19 @@ const NewFeed = (props) => { ...@@ -94,6 +94,19 @@ const NewFeed = (props) => {
<View style={{flex: 1, backgroundColor: 'white'}}> <View style={{flex: 1, backgroundColor: 'white'}}>
<View style={styles.fillterView}> <View style={styles.fillterView}>
<ScrollView horizontal showsHorizontalScrollIndicator={false}> <ScrollView horizontal showsHorizontalScrollIndicator={false}>
<TouchableOpacity
onPress={() => {
setSelected('');
}}
style={[
styles.item,
selected == '' ? {backgroundColor: '#BCD7F8'} : {},
]}>
<Text
style={[styles.txt, selected == '' ? {color: '#1C6AF6'} : {}]}>
Tt c
</Text>
</TouchableOpacity>
{fillters.map((e) => ( {fillters.map((e) => (
<TouchableOpacity <TouchableOpacity
onPress={() => { onPress={() => {
...@@ -143,14 +156,15 @@ const styles = StyleSheet.create({ ...@@ -143,14 +156,15 @@ const styles = StyleSheet.create({
}, },
item: { item: {
backgroundColor: '#EBEBEB', backgroundColor: '#EBEBEB',
marginRight: 10, marginRight: 5,
paddingHorizontal: 10, paddingHorizontal: 10,
paddingVertical: 6, paddingVertical: 6,
marginLeft: 20, marginLeft: 5,
borderRadius: 10, borderRadius: 10,
}, },
txt: { txt: {
fontSize: getFontXD(42), fontSize: getFontXD(42),
color: R.colors.black, color: R.colors.black,
fontWeight: 'bold',
}, },
}); });
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