mobile / YH_RNComponent · Commits

Go to a project

Authored by huangyCode
Commit a57fd0728dbaa051fb055c465cb910fb655f3878 2 parents a819e723 72257be5

Merge branch 'V6.9.7' of http://git.yoho.cn/mobile/YH_RNComponent into V6.9.7

Inline Side-by-side
Showing 8 changed files with 105 additions and 51 deletions
... ... @@ -115,7 +115,7 @@ let styles = StyleSheet.create({
confirmContent: {
color: '#444444',
fontSize: 14,
lineHeight: 23,
lineHeight: 24,
textAlign: 'left',
letterSpacing: -0.09,
fontFamily: 'PingFang-SC-Regular',
... ... @@ -125,7 +125,7 @@ let styles = StyleSheet.create({
color: '#444444',
fontSize: 14,
fontWeight:'bold',
lineHeight: 23,
lineHeight: 24,
textAlign: 'left',
letterSpacing: -0.09,
fontFamily: 'PingFang-SC-Regular',
... ...
... ... @@ -86,7 +86,7 @@ export default class BankCard extends Component {
if (this.state.isShow) {
return (
<View>
<Text style={[styles.wordText, {color: '#444444', marginTop: 24, marginLeft: 15, marginBottom: 10}]}>请添加持卡人本人的银行卡</Text>
<Text style={[styles.tipTextText, {marginTop: 10, marginLeft: 15, marginBottom: 10}]}>请添加持卡人本人的银行卡</Text>
<View style={styles.inputView}>
<Text style={[styles.wordText, {width: 76, color: '#444444'}]}>持卡人</Text>
<TextInput
... ... @@ -155,7 +155,7 @@ export default class BankCard extends Component {
underlineColorAndroid='transparent'
onChangeText={(cardNo) => {this.setState({cardNo});}}/>
</View>
<Text style={[styles.wordText, {color: '#D0021B', marginTop: 16, marginLeft: 15, marginBottom: 10}]}>{checkMessage}</Text>
<Text style={[styles.wordText, {color: '#D0021B', marginTop: 10, marginLeft: 15, marginBottom: 10}]}>{checkMessage}</Text>
<TouchableOpacity style={styles.submitBtn} activeOpacity={0.8} onPress={() => {
this.checkInfo();
}}>
... ... @@ -250,6 +250,12 @@ let styles = StyleSheet.create({
height: 0.5,
backgroundColor: '#e0e0e0'
},
tipTextText: {
fontFamily: 'PingFang-SC-Regular',
fontSize: 12,
color: '#B0B0B0',
letterSpacing: -0.19,
},
wordText: {
fontFamily: 'PingFang-SC-Regular',
fontSize: 14,
... ... @@ -286,15 +292,15 @@ let styles = StyleSheet.create({
},
inputView: {
width: width,
height: 44,
height: 50,
paddingLeft: 15,
flexDirection: 'row',
backgroundColor: 'white',
alignItems: 'center',
},
arrowImage: {
width: 16,
height: 16,
width: 11,
height: 11,
marginLeft: 2,
},
markImage: {
... ... @@ -306,7 +312,7 @@ let styles = StyleSheet.create({
width: width - 30,
marginLeft: 15,
marginRight: 15,
height: 50,
height: 44,
borderRadius: 4,
alignItems: 'center',
justifyContent: 'center',
... ...
... ... @@ -35,15 +35,23 @@ export default class CheckSettleModal extends React.Component {
<Text style={styles.allPriceText}>{data.afterTaxAmountStr}</Text>
</Text>
<Text style={styles.priceText}>提现总金额：{data.settlementAmountStr}</Text>
<Text style={styles.priceText}>扣税总金额：{data.taxAmountStr}</Text>
<Text>
<Text style={styles.priceText}>提现总金额：</Text>
<Text style={styles.otherText}>{data.settlementAmountStr}</Text>
</Text>
<Text>
<Text style={styles.priceText}>扣税总金额：</Text>
<Text style={styles.otherText}>{data.taxAmountStr}</Text>
</Text>
<TouchableOpacity onPress={() => {
<TouchableOpacity activeOpacity={1} onPress={() => {
this.props.hiddenCheckSettleDialog && this.props.hiddenCheckSettleDialog();
this.props.jumpWithActivityUrl && this.props.jumpWithActivityUrl();
}}>
<Text style={{marginTop: 15}}>
<Text style={styles.tipText}>结算收益时需按照国家规定预扣个税，点击查看</Text>
<Text style={[styles.tipText, {color:'blue'}]}>《提现扣税规则说明》</Text>
<Text style={[styles.tipText, {color:'#4a90e2'}]}>《提现扣税规则说明》</Text>
</Text>
</TouchableOpacity>
</View>
... ... @@ -127,11 +135,22 @@ let styles = StyleSheet.create({
fontFamily: 'PingFang-SC-Medium',
fontSize: 14,
color: '#D0021B',
lineHeight: 23,
letterSpacing: -0.09,
},
priceText: {
otherText:{
fontFamily: 'PingFang-SC-Regular',
fontSize: 14,
color: '#444444',
lineHeight: 23,
letterSpacing: -0.09,
},
priceText: {
fontFamily: 'PingFang-SC-Regular',
fontSize: 14,
color: '#B0B0B0',
lineHeight: 23,
letterSpacing: -0.09,
},
tipText: {
fontFamily: 'PingFang-SC-Regular',
... ...
... ... @@ -227,8 +227,8 @@ let styles = StyleSheet.create({
color: '#444444',
},
arrowImage: {
width: 16,
height: 16,
width: 11,
height: 11,
marginLeft: 2,
},
contentContainer: {
... ...
... ... @@ -39,6 +39,7 @@ export default class NameAuthen extends Component {
renderHeader(title) {
return <View style={styles.headerDetailContainer}>
<View style={{width: width, height: 0.5, backgroundColor: '#e0e0e0'}}/>
<Text style={styles.headerTitle} numberOfLines={1}>{title}</Text>
</View>
}
... ... @@ -77,9 +78,9 @@ export default class NameAuthen extends Component {
}
}}>
{hasImage ?
<YH_Image resizeMode="contain" url={imageUrl} style={[styles.viewImage, {backgroundColor: 'transparent', borderWidth: 0,}]}/>
<YH_Image resizeMode="contain" url={imageUrl} style={styles.leftViewImage}/>
:
<Image style={styles.viewImage} resizeMode={'contain'} source={addImage}/>
<Image resizeMode={'contain'} source={addImage} style={isBack ? styles.rightViewImage : styles.leftViewImage}/>
}
</TouchableOpacity>
<TouchableOpacity hitSlop={{top: 3, left: 3, bottom: 3, right: 3}} activeOpacity={1.0} style={styles.addImageClose}
... ... @@ -199,18 +200,19 @@ export default class NameAuthen extends Component {
{this.renderMeritCell('身份证信息需与提现银行卡信息匹配，否则无法正常提现成功。')}
{this.renderIDCardAddDetailCell()}
</ScrollView>
<TouchableOpacity style={[styles.submitButton, buttonDisabled ? styles.disabledButton : {}]}
disabled={buttonDisabled}
onPress={()=> {
if (this.state.backIDCardImageUri.length > 0 && this.state.frontIDCardImageUri.length > 0) {
this.props.bindIdentityCard && this.props.bindIdentityCard(this.state.frontIDCardImageUri, this.state.backIDCardImageUri);
<TouchableOpacity style={[styles.submitButton, buttonDisabled ? styles.disabledButton : {}]}
disabled={buttonDisabled}
onPress={()=> {
if (this.state.backIDCardImageUri.length > 0 && this.state.frontIDCardImageUri.length > 0) {
this.props.bindIdentityCard && this.props.bindIdentityCard(this.state.frontIDCardImageUri, this.state.backIDCardImageUri);
}
}}>
<Text style={styles.buttonText}>{'提交'}</Text>
</TouchableOpacity>
}
}}>
<Text style={styles.buttonText}>{'提交'}</Text>
</TouchableOpacity>
</ScrollView>
{isShowToast ? <Prompt
text={toastMessage}
... ... @@ -247,6 +249,7 @@ let styles = StyleSheet.create({
fontSize: 17,
color: '#444444',
letterSpacing: 0,
fontWeight: 'bold',
},
meritCell: {
marginTop: 10,
... ... @@ -300,9 +303,10 @@ let styles = StyleSheet.create({
submitButton: {
marginLeft: 15,
marginRight: 15,
marginBottom: 33,
marginTop: 44,
height: 44,
backgroundColor: '#002B47',
borderRadius: 4,
backgroundColor: '#444444',
alignItems: 'center',
justifyContent: 'center',
},
... ... @@ -321,12 +325,20 @@ let styles = StyleSheet.create({
},
renderIDCardAddCellImage: {
width: (width-30)/2,
alignItems: 'center'
},
viewImage: {
leftViewImage: {
width: (width-50)/2,
height: 101,
marginTop: 5,
marginLeft: 0,
backgroundColor: 'transparent',
},
rightViewImage: {
width: (width-50)/2,
height: 101,
marginTop: 5,
marginLeft: 10,
backgroundColor: 'transparent'
},
addImage: {
height: 30,
... ... @@ -340,8 +352,9 @@ let styles = StyleSheet.create({
left: (width-50)/2-6,
},
renderIDCardSampleCellImage: {
width: 80,
width: (width-30)/2,
marginTop: 30,
alignItems: 'center'
},
cardImage: {
width: 80,
... ...
... ... @@ -30,6 +30,8 @@ export default class WithdrawalRecord extends Component {
let uploadStatus = this.props.identityCardInfo.data;
return (<View>
<View style={{width: width, height: 0.5, backgroundColor: '#e0e0e0'}}/>
{ uploadStatus ?
null
:
... ... @@ -43,15 +45,30 @@ export default class WithdrawalRecord extends Component {
</View>
}
<View style={styles.withdrawContainer}>
<Text style={styles.tipStyle}>{'每月20日结算上个月预估佣金并预扣个税'}</Text>
<TouchableOpacity style={{flexDirection: 'row', alignItems: 'center'}} onPress={()=> {
this.props.jumpWithActivityUrl && this.props.jumpWithActivityUrl();
}}>
<Text style={styles.tipStyle}>{'结算说明 '}</Text>
<Image source={require('../images/more.png')}/>
</TouchableOpacity>
</View>
{ uploadStatus ?
<View style={styles.withdrawContainer}>
<Text style={[styles.tipStyle, {lineHeight: 40}]}>{'每月20日结算上个月预估佣金并预扣个税'}</Text>
<TouchableOpacity activeOpacity={1} style={{flexDirection: 'row', alignItems: 'center'}} onPress={()=> {
this.props.jumpWithActivityUrl && this.props.jumpWithActivityUrl();
}}>
<Text style={styles.tipStyle}>{'结算说明 '}</Text>
<Image source={require('../images/more.png')}/>
</TouchableOpacity>
</View>
:
<View style={styles.withdrawContainer}>
<Text style={[styles.tipStyle, {marginTop: 15, height: 17}]}>{'每月20日结算上个月预估佣金并预扣个税'}</Text>
<TouchableOpacity activeOpacity={1} style={{flexDirection: 'row', alignItems: 'center', height: 17, marginTop: 15}} onPress={()=> {
this.props.jumpWithActivityUrl && this.props.jumpWithActivityUrl();
}}>
<Text style={styles.tipStyle}>{'结算说明 '}</Text>
<Image style={{width: 11, height: 11}} source={require('../images/more.png')}/>
</TouchableOpacity>
</View>
}
</View>
)
... ... @@ -65,7 +82,7 @@ export default class WithdrawalRecord extends Component {
<Text style={styles.numberText}>处理编号：{rowData.get("settlementCode")}</Text>
<Text style={styles.statusText}>{rowData.get("settlementStatus")}</Text>
</View>
<View style={{width: width, height: 0.5, backgroundColor: '#f0f0f0'}}></View>
<View style={{width: width, height: 0.5, backgroundColor: '#e0e0e0'}}></View>
<View style={styles.detailView}>
<Text>
<Text style={styles.priceText}>税后总收益：</Text>
... ... @@ -136,7 +153,7 @@ let styles = StyleSheet.create({
},
detailView: {
width: width,
paddingTop: 9,
paddingTop: 15,
paddingLeft: 15,
paddingRight: 15,
paddingBottom: 20,
... ... @@ -168,12 +185,10 @@ let styles = StyleSheet.create({
},
statusText: {
fontFamily: 'PingFang-SC-Regular',
fontSize: 12,
fontSize: 14,
color: '#D0021B',
letterSpacing: -0.29,
},
uploadContainer: {
width: width,
backgroundColor: 'transparent',
... ... @@ -195,7 +210,7 @@ let styles = StyleSheet.create({
width: 80,
height: 30,
marginTop: 10,
borderRadius: 5,
borderRadius: 4,
backgroundColor: '#D0021B',
alignItems: 'center',
justifyContent: 'center',
... ... @@ -220,6 +235,5 @@ let styles = StyleSheet.create({
color: '#B0B0B0',
backgroundColor: 'transparent',
textAlign: 'center',
lineHeight: 40,
},
});
... ...
... ... @@ -162,8 +162,8 @@ export function fetchActivityGroupDetail(FP_NAME, FP_PARAM, callback) {
// } catch (e) {
// console.log(e);
// }
callback && callback(json.lackNum)
dispatch(activityGroupDetailSuccess(json));
callback && callback(json.lackNum);
})
.catch(error => {
dispatch(activityGroupDetailFailure(error));
... ... @@ -245,7 +245,7 @@ export function fetchResourceInfo() {
export function fetchCouponInfo(orderCode, lackNum) {
return (dispatch, getState) => {
let {app: {host}, groupPurchaseDetail: {}} = getState();
let {app: {host}} = getState();
let fetchCouponInfo = (orderCode ,uid) => {
dispatch(couponInfoRequest());
... ... @@ -259,7 +259,9 @@ export function fetchCouponInfo(orderCode, lackNum) {
}
})
.catch(error => {
if (lackNum != 0) {
dispatch(showShareView(true));
}
dispatch(couponInfoFailure(error));
});
};
... ...
... ... @@ -129,7 +129,7 @@ let styles = StyleSheet.create({
},
detail:{
marginLeft: 10,
marginTop: 4,
marginTop: 10,
fontSize: 12,
color: '#686868',
maxWidth: width-15-50-10-22,
... ...