mobile / YH_RNComponent · Commits

Go to a project

Authored by 孙凯
Commit 2ab322c6f503f1bd22c3d8eba4db9bb34deeeef6 1 parent 284e4bca

Merge branch ‘7.1.8-0.49’ into 7.1.8

Inline Side-by-side
Showing 3 changed files with 9 additions and 28 deletions
@@ -36,22 +36,6 @@ export default class BankCard extends Component { @@ -36,22 +36,6 @@ export default class BankCard extends Component {
36 this.subscription.remove(); 36 this.subscription.remove();
37 } 37 }
38 38
39 - getCardNo(){  
40 - let cardNo = this.props.bankCardInfo.bankCardNo;  
41 - if (cardNo && cardNo.length > 11){  
42 - let sub = cardNo.substring(11);  
43 - let cardNoNew = sub.substring(0, 1) + " ";  
44 - for (var i = 1; i < sub.length; i++) {  
45 - cardNoNew += sub[i];  
46 - if (i%4 === 0){  
47 - cardNoNew += " ";  
48 - }  
49 - }  
50 - cardNo = cardNoNew;  
51 - }  
52 - return cardNo;  
53 - }  
54 -  
55 checkInfo(){ 39 checkInfo(){
56 40
57 let name = this.state.name; 41 let name = this.state.name;
@@ -94,7 +78,6 @@ export default class BankCard extends Component { @@ -94,7 +78,6 @@ export default class BankCard extends Component {
94 <TextInput 78 <TextInput
95 ref="nameInput" 79 ref="nameInput"
96 style={[styles.wordText, {width: 200, color: '#444444'}]} 80 style={[styles.wordText, {width: 200, color: '#444444'}]}
97 - maxLength={4}  
98 placeholder="请输入持卡人姓名" 81 placeholder="请输入持卡人姓名"
99 placeholderTextColor='#b0b0b0' 82 placeholderTextColor='#b0b0b0'
100 underlineColorAndroid='transparent' 83 underlineColorAndroid='transparent'
@@ -104,7 +87,7 @@ export default class BankCard extends Component { @@ -104,7 +87,7 @@ export default class BankCard extends Component {
104 <View style={styles.inputView}> 87 <View style={styles.inputView}>
105 <Text style={[styles.wordText, {width: 76, color: '#444444'}]}>身份证号</Text> 88 <Text style={[styles.wordText, {width: 76, color: '#444444'}]}>身份证号</Text>
106 <TextInput 89 <TextInput
107 - ref="nameInput" 90 + ref="idInput"
108 style={[styles.wordText, {width: 200, color: '#444444'}]} 91 style={[styles.wordText, {width: 200, color: '#444444'}]}
109 maxLength={18} 92 maxLength={18}
110 placeholder="请输入身份证号" 93 placeholder="请输入身份证号"
@@ -130,7 +113,7 @@ export default class BankCard extends Component { @@ -130,7 +113,7 @@ export default class BankCard extends Component {
130 <View style={styles.inputView}> 113 <View style={styles.inputView}>
131 <Text style={[styles.wordText, {width: 76, color: '#444444'}]}>银行卡号</Text> 114 <Text style={[styles.wordText, {width: 76, color: '#444444'}]}>银行卡号</Text>
132 <TextInput 115 <TextInput
133 - ref="nameInput" 116 + ref="cardInput"
134 style={[styles.wordText, {width: 200, color: '#444444'}]} 117 style={[styles.wordText, {width: 200, color: '#444444'}]}
135 maxLength={19} 118 maxLength={19}
136 placeholder="请输入银行卡号" 119 placeholder="请输入银行卡号"
@@ -187,10 +170,10 @@ export default class BankCard extends Component { @@ -187,10 +170,10 @@ export default class BankCard extends Component {
187 <View style={styles.contentContainer}> 170 <View style={styles.contentContainer}>
188 <Text style={[styles.bankText, {marginTop: 20, marginLeft: 20}]}>{bankCardInfo.bankName}</Text> 171 <Text style={[styles.bankText, {marginTop: 20, marginLeft: 20}]}>{bankCardInfo.bankName}</Text>
189 <View style={styles.infoView}> 172 <View style={styles.infoView}>
190 - <Text style={[styles.bankText, {height: 29, paddingTop: 2, fontSize: 24, textAlign: 'center'}]}>**** </Text>  
191 - <Text style={[styles.bankText, {height: 29, paddingTop: 2, fontSize: 24, textAlign: 'center'}]}>**** </Text>  
192 - <Text style={[styles.bankText, {height: 29, paddingTop: 2, fontSize: 24, textAlign: 'center'}]}>***</Text>  
193 - <Text style={[styles.bankText, {fontSize: 24, textAlign: 'center'}]}>{this.getCardNo()}</Text> 173 + <Text style={[styles.bankText, {height: 29, paddingTop: 2, marginRight: 20, fontSize: 24, textAlign: 'center'}]}>****</Text>
  174 + <Text style={[styles.bankText, {height: 29, paddingTop: 2, marginRight: 20, fontSize: 24, textAlign: 'center'}]}>****</Text>
  175 + <Text style={[styles.bankText, {height: 29, paddingTop: 2, marginRight: 20, fontSize: 24, textAlign: 'center'}]}>****</Text>
  176 + <Text style={[styles.bankText, {fontSize: 24, textAlign: 'center'}]}>{bankCardInfo.bankCardNo}</Text>
194 </View> 177 </View>
195 <Text style={[styles.wordText, {marginTop: 20, marginLeft: 20}]}>持卡人：{bankCardInfo.name}</Text> 178 <Text style={[styles.wordText, {marginTop: 20, marginLeft: 20}]}>持卡人：{bankCardInfo.name}</Text>
196 </View> 179 </View>
@@ -198,8 +181,7 @@ export default class BankCard extends Component { @@ -198,8 +181,7 @@ export default class BankCard extends Component {
198 <TouchableOpacity activeOpacity={0.5} onPress={() => { 181 <TouchableOpacity activeOpacity={0.5} onPress={() => {
199 Linking.openURL('tel:400-889-9646') 182 Linking.openURL('tel:400-889-9646')
200 }}> 183 }}>
201 - <Text style={[styles.wordText, {color: '#D0021B', marginTop: 7}]}>400-889-9646</Text>  
202 - <View style={{height: 1, backgroundColor: '#D0021B', width: 89, marginTop: -4}}/> 184 + <Text style={[styles.wordText, {color: '#D0021B', marginTop: 7, textDecorationLine: 'underline'}]}>400-889-9646</Text>
203 </TouchableOpacity> 185 </TouchableOpacity>
204 </View> 186 </View>
205 : this.renderUnBind() 187 : this.renderUnBind()
@@ -31,7 +31,7 @@ export default class SureBankCardModal extends React.Component { @@ -31,7 +31,7 @@ export default class SureBankCardModal extends React.Component {
31 <View style={styles.modalView}> 31 <View style={styles.modalView}>
32 <View style={styles.confirmTitleContainer}> 32 <View style={styles.confirmTitleContainer}>
33 <Text style={[styles.sure, {marginTop: 20}]}>提示</Text> 33 <Text style={[styles.sure, {marginTop: 20}]}>提示</Text>
34 - <Text style={styles.confirmContent}>请确认您填写的银行信息，提交后只能致电客服修改</Text> 34 + <Text style={[styles.confirmContent, {marginTop: 8}]}>请确认您填写的银行信息，提交后只能致电客服修改</Text>
35 </View> 35 </View>
36 <Text style={styles.confirmInfo}>持卡人：{this.props.checkBankCardResult.name}</Text> 36 <Text style={styles.confirmInfo}>持卡人：{this.props.checkBankCardResult.name}</Text>
37 <Text style={styles.confirmInfo}>身份证号：{this.props.checkBankCardResult.idCardNo}</Text> 37 <Text style={styles.confirmInfo}>身份证号：{this.props.checkBankCardResult.idCardNo}</Text>
@@ -30,8 +30,7 @@ export default class WithdrawModal extends React.Component { @@ -30,8 +30,7 @@ export default class WithdrawModal extends React.Component {
30 <View style={styles.modalView}> 30 <View style={styles.modalView}>
31 <View style={styles.confirmTitleContainer}> 31 <View style={styles.confirmTitleContainer}>
32 <Text style={styles.confirmTitle}>申请提现成功</Text> 32 <Text style={styles.confirmTitle}>申请提现成功</Text>
33 - <Text style={styles.confirmContent}>提现金额到帐时间为提现申请日期后3-5个工作日，节假日顺延。{"\r\n"}  
34 - 重要：内测期间没有向客服提供过银行卡的用户，请致电400-889-9646提供银行卡信息，否则无法提现！</Text> 33 + <Text style={styles.confirmContent}>提现金额到帐时间为提现申请日期后3-5个工作日，节假日顺延。</Text>
35 </View> 34 </View>
36 <View style={{width: '100%', height: 0.5, backgroundColor: '#e0e0e0'}}/> 35 <View style={{width: '100%', height: 0.5, backgroundColor: '#e0e0e0'}}/>
37 <View style={styles.confirmBtnContainer}> 36 <View style={styles.confirmBtnContainer}>