mobile / YH_RNComponent · Commits

Go to a project

Authored by chenl
Commit ac8828e84629857fe59377b306f491315b6f7fb9 1 parent c6ae7e9c

调整链接为原生链接，增加lineHeight取整。review by caomei。

Inline Side-by-side
Showing 13 changed files with 29 additions and 29 deletions
@@ -138,7 +138,7 @@ let styles = StyleSheet.create({ @@ -138,7 +138,7 @@ let styles = StyleSheet.create({
138 width: tabBtnWidth, 138 width: tabBtnWidth,
139 height: 44 * DEVICE_WIDTH_RATIO, 139 height: 44 * DEVICE_WIDTH_RATIO,
140 fontSize: 17 * DEVICE_WIDTH_RATIO, 140 fontSize: 17 * DEVICE_WIDTH_RATIO,
141 - lineHeight: 31 * DEVICE_WIDTH_RATIO, 141 + lineHeight: Math.ceil(31 * DEVICE_WIDTH_RATIO),
142 backgroundColor: 'transparent', 142 backgroundColor: 'transparent',
143 color: 'white', 143 color: 'white',
144 }, 144 },
@@ -147,7 +147,7 @@ let styles = StyleSheet.create({ @@ -147,7 +147,7 @@ let styles = StyleSheet.create({
147 width: tabBtnWidth, 147 width: tabBtnWidth,
148 height: 44 * DEVICE_WIDTH_RATIO, 148 height: 44 * DEVICE_WIDTH_RATIO,
149 fontSize: 17 * DEVICE_WIDTH_RATIO, 149 fontSize: 17 * DEVICE_WIDTH_RATIO,
150 - lineHeight: 31 * DEVICE_WIDTH_RATIO, 150 + lineHeight: Math.ceil(31 * DEVICE_WIDTH_RATIO),
151 backgroundColor: 'transparent', 151 backgroundColor: 'transparent',
152 color: '#b0b0b0', 152 color: '#b0b0b0',
153 }, 153 },
@@ -186,7 +186,7 @@ let styles = StyleSheet.create({ @@ -186,7 +186,7 @@ let styles = StyleSheet.create({
186 fontSize: 13 * DEVICE_WIDTH_RATIO, 186 fontSize: 13 * DEVICE_WIDTH_RATIO,
187 textAlign: 'center', 187 textAlign: 'center',
188 height: 44 * DEVICE_WIDTH_RATIO, 188 height: 44 * DEVICE_WIDTH_RATIO,
189 - lineHeight: 29 * DEVICE_WIDTH_RATIO, 189 + lineHeight: Math.ceil(29 * DEVICE_WIDTH_RATIO),
190 backgroundColor: 'transparent', 190 backgroundColor: 'transparent',
191 color: 'white', 191 color: 'white',
192 }, 192 },
@@ -199,7 +199,7 @@ let styles = StyleSheet.create({ @@ -199,7 +199,7 @@ let styles = StyleSheet.create({
199 cellTitle: { 199 cellTitle: {
200 marginLeft: 15 * DEVICE_WIDTH_RATIO, 200 marginLeft: 15 * DEVICE_WIDTH_RATIO,
201 fontSize: 12 * DEVICE_WIDTH_RATIO, 201 fontSize: 12 * DEVICE_WIDTH_RATIO,
202 - lineHeight: 26 * DEVICE_WIDTH_RATIO, 202 + lineHeight: Math.ceil(26 * DEVICE_WIDTH_RATIO),
203 }, 203 },
204 cellPrice: { 204 cellPrice: {
205 color: '#b0b0b0', 205 color: '#b0b0b0',
@@ -88,7 +88,7 @@ export default class AlreadyOpenedHeader extends React.Component { @@ -88,7 +88,7 @@ export default class AlreadyOpenedHeader extends React.Component {
88 } 88 }
89 <TouchableOpacity activeOpacity={0.5} onPress={() => {this.props.gotoRepayListPageWithDays &&this.props.gotoRepayListPageWithDays('7')}} > 89 <TouchableOpacity activeOpacity={0.5} onPress={() => {this.props.gotoRepayListPageWithDays &&this.props.gotoRepayListPageWithDays('7')}} >
90 <View style={{width:95*DEVICE_WIDTH_RATIO,height:30*DEVICE_WIDTH_RATIO,borderRadius:15*DEVICE_WIDTH_RATIO,alignItems:'center',backgroundColor:'rgba(69, 74, 76, 0.5)',marginTop:15*DEVICE_WIDTH_RATIO}}> 90 <View style={{width:95*DEVICE_WIDTH_RATIO,height:30*DEVICE_WIDTH_RATIO,borderRadius:15*DEVICE_WIDTH_RATIO,alignItems:'center',backgroundColor:'rgba(69, 74, 76, 0.5)',marginTop:15*DEVICE_WIDTH_RATIO}}>
91 - <Text style={[styles.imageText,{lineHeight:20*DEVICE_WIDTH_RATIO}]}>明细</Text> 91 + <Text style={[styles.imageText,{lineHeight:Math.ceil(20 * DEVICE_WIDTH_RATIO)}]}>明细</Text>
92 </View> 92 </View>
93 </TouchableOpacity> 93 </TouchableOpacity>
94 </View> 94 </View>
@@ -183,7 +183,7 @@ let styles = StyleSheet.create({ @@ -183,7 +183,7 @@ let styles = StyleSheet.create({
183 width: tabBtnWidth, 183 width: tabBtnWidth,
184 height: 44 * DEVICE_WIDTH_RATIO, 184 height: 44 * DEVICE_WIDTH_RATIO,
185 fontSize: 16 * DEVICE_WIDTH_RATIO, 185 fontSize: 16 * DEVICE_WIDTH_RATIO,
186 - lineHeight: 31 * DEVICE_WIDTH_RATIO, 186 + lineHeight: Math.ceil(31 * DEVICE_WIDTH_RATIO),
187 backgroundColor: 'transparent', 187 backgroundColor: 'transparent',
188 color: 'white', 188 color: 'white',
189 }, 189 },
@@ -192,7 +192,7 @@ let styles = StyleSheet.create({ @@ -192,7 +192,7 @@ let styles = StyleSheet.create({
192 width: tabBtnWidth, 192 width: tabBtnWidth,
193 height: 44 * DEVICE_WIDTH_RATIO, 193 height: 44 * DEVICE_WIDTH_RATIO,
194 fontSize: 16 * DEVICE_WIDTH_RATIO, 194 fontSize: 16 * DEVICE_WIDTH_RATIO,
195 - lineHeight: 30 * DEVICE_WIDTH_RATIO, 195 + lineHeight: Math.ceil(30 * DEVICE_WIDTH_RATIO),
196 backgroundColor: 'transparent', 196 backgroundColor: 'transparent',
197 color: '#b0b0b0', 197 color: '#b0b0b0',
198 }, 198 },
@@ -222,7 +222,7 @@ let styles = StyleSheet.create({ @@ -222,7 +222,7 @@ let styles = StyleSheet.create({
222 backgroundColor: 'transparent', 222 backgroundColor: 'transparent',
223 color: '#d4031a', 223 color: '#d4031a',
224 fontSize: 11 * DEVICE_WIDTH_RATIO, 224 fontSize: 11 * DEVICE_WIDTH_RATIO,
225 - lineHeight: 16 * DEVICE_WIDTH_RATIO, 225 + lineHeight: Math.ceil(16 * DEVICE_WIDTH_RATIO),
226 textAlign: 'right', 226 textAlign: 'right',
227 }, 227 },
228 imageText: { 228 imageText: {
@@ -251,7 +251,7 @@ let styles = StyleSheet.create({ @@ -251,7 +251,7 @@ let styles = StyleSheet.create({
251 justifyContent: 'center', 251 justifyContent: 'center',
252 height: 42 * DEVICE_WIDTH_RATIO, 252 height: 42 * DEVICE_WIDTH_RATIO,
253 fontSize: 16 * DEVICE_WIDTH_RATIO, 253 fontSize: 16 * DEVICE_WIDTH_RATIO,
254 - lineHeight: 29 * DEVICE_WIDTH_RATIO, 254 + lineHeight: Math.ceil(29 * DEVICE_WIDTH_RATIO),
255 textAlign:'center', 255 textAlign:'center',
256 textAlignVertical:'center', 256 textAlignVertical:'center',
257 backgroundColor: 'white', 257 backgroundColor: 'white',
@@ -24,7 +24,7 @@ export default class BankSafePay extends React.Component { @@ -24,7 +24,7 @@ export default class BankSafePay extends React.Component {
24 <View style={styles.container}> 24 <View style={styles.container}>
25 <View style={styles.safePayContainer}> 25 <View style={styles.safePayContainer}>
26 <View style={styles.titleContainer}> 26 <View style={styles.titleContainer}>
27 - <Text style={{fontSize:16*DEVICE_WIDTH_RATIO,lineHeight:30*DEVICE_WIDTH_RATIO,color:'#444444'}}> 27 + <Text style={{fontSize:16*DEVICE_WIDTH_RATIO,lineHeight:Math.ceil(30 * DEVICE_WIDTH_RATIO),color:'#444444'}}>
28 银行安全支付 28 银行安全支付
29 </Text> 29 </Text>
30 <TouchableOpacity style={styles.closeIcon} onPress={() => {this.props.closeBankSafePay && this.props.closeBankSafePay()}} > 30 <TouchableOpacity style={styles.closeIcon} onPress={() => {this.props.closeBankSafePay && this.props.closeBankSafePay()}} >
@@ -160,7 +160,7 @@ let styles = StyleSheet.create({ @@ -160,7 +160,7 @@ let styles = StyleSheet.create({
160 fontSize: 13 * DEVICE_WIDTH_RATIO, 160 fontSize: 13 * DEVICE_WIDTH_RATIO,
161 textAlign: 'center', 161 textAlign: 'center',
162 height: 44 * DEVICE_WIDTH_RATIO, 162 height: 44 * DEVICE_WIDTH_RATIO,
163 - lineHeight: 29 * DEVICE_WIDTH_RATIO, 163 + lineHeight: Math.ceil(29 * DEVICE_WIDTH_RATIO),
164 backgroundColor: 'transparent', 164 backgroundColor: 'transparent',
165 color: 'white', 165 color: 'white',
166 }, 166 },
@@ -103,7 +103,7 @@ export default class ConfirmPay extends React.Component { @@ -103,7 +103,7 @@ export default class ConfirmPay extends React.Component {
103 </View> 103 </View>
104 <TouchableOpacity onPress={() => {this._reSendConfirmPaySnsCode()}} > 104 <TouchableOpacity onPress={() => {this._reSendConfirmPaySnsCode()}} >
105 <View style={styles.reSendSnsCode}> 105 <View style={styles.reSendSnsCode}>
106 - <Text style={{fontSize:14 * DEVICE_WIDTH_RATIO,color:'white',lineHeight:29*DEVICE_WIDTH_RATIO,backgroundColor:'transparent',textAlign:'center'}}> 106 + <Text style={{fontSize:14 * DEVICE_WIDTH_RATIO,color:'white',lineHeight:Math.ceil(29 * DEVICE_WIDTH_RATIO),backgroundColor:'transparent',textAlign:'center'}}>
107 {this.state.resendBtnText} 107 {this.state.resendBtnText}
108 </Text> 108 </Text>
109 </View> 109 </View>
@@ -117,7 +117,7 @@ export default class InstallmentStatus extends React.Component { @@ -117,7 +117,7 @@ export default class InstallmentStatus extends React.Component {
117 width: width, 117 width: width,
118 height: 44 * DEVICE_WIDTH_RATIO, 118 height: 44 * DEVICE_WIDTH_RATIO,
119 textAlign: 'center', 119 textAlign: 'center',
120 - lineHeight: 29 *DEVICE_WIDTH_RATIO, 120 + lineHeight: Math.ceil(29 * DEVICE_WIDTH_RATIO),
121 }}> 121 }}>
122 分期专享 122 分期专享
123 </Text> 123 </Text>
@@ -197,7 +197,7 @@ let styles = StyleSheet.create({ @@ -197,7 +197,7 @@ let styles = StyleSheet.create({
197 fontSize: 12 * DEVICE_WIDTH_RATIO, 197 fontSize: 12 * DEVICE_WIDTH_RATIO,
198 color: '#b0b0b0', 198 color: '#b0b0b0',
199 textAlign: 'center', 199 textAlign: 'center',
200 - lineHeight: 20 * DEVICE_WIDTH_RATIO, 200 + lineHeight: Math.ceil(29 * DEVICE_WIDTH_RATIO),
201 }, 201 },
202 buttonContainer: { 202 buttonContainer: {
203 marginTop: 35 * DEVICE_WIDTH_RATIO, 203 marginTop: 35 * DEVICE_WIDTH_RATIO,
@@ -211,6 +211,6 @@ let styles = StyleSheet.create({ @@ -211,6 +211,6 @@ let styles = StyleSheet.create({
211 textAlign: 'center', 211 textAlign: 'center',
212 fontSize: 14 * DEVICE_WIDTH_RATIO, 212 fontSize: 14 * DEVICE_WIDTH_RATIO,
213 backgroundColor: 'transparent', 213 backgroundColor: 'transparent',
214 - lineHeight: 29 * DEVICE_WIDTH_RATIO, 214 + lineHeight: Math.ceil(29 * DEVICE_WIDTH_RATIO),
215 }, 215 },
216 }); 216 });
@@ -257,7 +257,7 @@ let styles = StyleSheet.create({ @@ -257,7 +257,7 @@ let styles = StyleSheet.create({
257 warningMessage: { 257 warningMessage: {
258 textAlign: 'left', 258 textAlign: 'left',
259 color: 'white', 259 color: 'white',
260 - lineHeight: 19, 260 + lineHeight: Math.ceil(19 * DEVICE_WIDTH_RATIO),
261 marginTop: 7, 261 marginTop: 7,
262 marginLeft: 20, 262 marginLeft: 20,
263 marginRight: 20, 263 marginRight: 20,
@@ -294,7 +294,7 @@ let styles = StyleSheet.create({ @@ -294,7 +294,7 @@ let styles = StyleSheet.create({
294 textAlign: 'center', 294 textAlign: 'center',
295 color: 'white', 295 color: 'white',
296 fontSize: 14 * DEVICE_WIDTH_RATIO, 296 fontSize: 14 * DEVICE_WIDTH_RATIO,
297 - lineHeight: 26 * DEVICE_WIDTH_RATIO, 297 + lineHeight: Math.ceil(26 * DEVICE_WIDTH_RATIO),
298 backgroundColor: 'transparent', 298 backgroundColor: 'transparent',
299 }, 299 },
300 bankCellContainer: { 300 bankCellContainer: {
@@ -184,7 +184,7 @@ let styles = StyleSheet.create({ @@ -184,7 +184,7 @@ let styles = StyleSheet.create({
184 open_text:{ 184 open_text:{
185 width: width - 70 * DEVICE_WIDTH_RATIO, 185 width: width - 70 * DEVICE_WIDTH_RATIO,
186 height: 44 * DEVICE_WIDTH_RATIO, 186 height: 44 * DEVICE_WIDTH_RATIO,
187 - lineHeight: 29 * DEVICE_WIDTH_RATIO, 187 + lineHeight: Math.ceil(29 * DEVICE_WIDTH_RATIO),
188 textAlign:'center', 188 textAlign:'center',
189 color:"white", 189 color:"white",
190 fontSize: 14 * DEVICE_WIDTH_RATIO, 190 fontSize: 14 * DEVICE_WIDTH_RATIO,
@@ -200,7 +200,7 @@ let styles = StyleSheet.create({ @@ -200,7 +200,7 @@ let styles = StyleSheet.create({
200 alignItems: 'center', 200 alignItems: 'center',
201 justifyContent: 'center', 201 justifyContent: 'center',
202 fontSize: 15 * DEVICE_WIDTH_RATIO, 202 fontSize: 15 * DEVICE_WIDTH_RATIO,
203 - lineHeight: 27 * DEVICE_WIDTH_RATIO, 203 + lineHeight: Math.ceil(27 * DEVICE_WIDTH_RATIO),
204 height: 40 * DEVICE_WIDTH_RATIO, 204 height: 40 * DEVICE_WIDTH_RATIO,
205 width: width, 205 width: width,
206 textAlign:'center', 206 textAlign:'center',
@@ -160,7 +160,7 @@ let styles = StyleSheet.create({ @@ -160,7 +160,7 @@ let styles = StyleSheet.create({
160 height: 44 * DEVICE_WIDTH_RATIO, 160 height: 44 * DEVICE_WIDTH_RATIO,
161 }, 161 },
162 title: { 162 title: {
163 - lineHeight: 28 * DEVICE_WIDTH_RATIO, 163 + lineHeight: Math.ceil(20 * DEVICE_WIDTH_RATIO),
164 fontSize: 12 * DEVICE_WIDTH_RATIO, 164 fontSize: 12 * DEVICE_WIDTH_RATIO,
165 marginLeft: 15 * DEVICE_WIDTH_RATIO, 165 marginLeft: 15 * DEVICE_WIDTH_RATIO,
166 }, 166 },
@@ -188,7 +188,7 @@ let styles = StyleSheet.create({ @@ -188,7 +188,7 @@ let styles = StyleSheet.create({
188 borderWidth: 0.5, 188 borderWidth: 0.5,
189 borderRadius: 14 * DEVICE_WIDTH_RATIO, 189 borderRadius: 14 * DEVICE_WIDTH_RATIO,
190 textAlign: 'center', 190 textAlign: 'center',
191 - lineHeight: 20 * DEVICE_WIDTH_RATIO, 191 + lineHeight: Math.ceil(20 * DEVICE_WIDTH_RATIO),
192 marginTop: 8 * DEVICE_WIDTH_RATIO, 192 marginTop: 8 * DEVICE_WIDTH_RATIO,
193 fontSize: 12 * DEVICE_WIDTH_RATIO, 193 fontSize: 12 * DEVICE_WIDTH_RATIO,
194 }, 194 },
@@ -105,7 +105,7 @@ let styles = StyleSheet.create({ @@ -105,7 +105,7 @@ let styles = StyleSheet.create({
105 flexDirection: 'row', 105 flexDirection: 'row',
106 }, 106 },
107 repayAmtText: { 107 repayAmtText: {
108 - lineHeight: 29 * DEVICE_WIDTH_RATIO, 108 + lineHeight: Math.ceil(29 * DEVICE_WIDTH_RATIO),
109 fontSize:15*DEVICE_WIDTH_RATIO, 109 fontSize:15*DEVICE_WIDTH_RATIO,
110 }, 110 },
111 repayStatusContianer: { 111 repayStatusContianer: {
@@ -144,7 +144,7 @@ let styles = StyleSheet.create({ @@ -144,7 +144,7 @@ let styles = StyleSheet.create({
144 marginTop: 40 * DEVICE_WIDTH_RATIO, 144 marginTop: 40 * DEVICE_WIDTH_RATIO,
145 color: '#b0b0b0', 145 color: '#b0b0b0',
146 fontSize: 12 * DEVICE_WIDTH_RATIO, 146 fontSize: 12 * DEVICE_WIDTH_RATIO,
147 - lineHeight: 15 * DEVICE_WIDTH_RATIO, 147 + lineHeight: Math.ceil(15 * DEVICE_WIDTH_RATIO),
148 }, 148 },
149 questionContianer: { 149 questionContianer: {
150 borderBottomWidth: 1*DEVICE_WIDTH_RATIO, 150 borderBottomWidth: 1*DEVICE_WIDTH_RATIO,
@@ -144,7 +144,7 @@ export default class RepayList extends React.Component { @@ -144,7 +144,7 @@ export default class RepayList extends React.Component {
144 144
145 <TouchableOpacity onPress={() => {this.props.onPressPayNow &&this.props.onPressPayNow()}} > 145 <TouchableOpacity onPress={() => {this.props.onPressPayNow &&this.props.onPressPayNow()}} >
146 <View style={styles.repaymentBtn}> 146 <View style={styles.repaymentBtn}>
147 - <Text style={{color:'white',fontSize:13*DEVICE_WIDTH_RATIO,lineHeight:29*DEVICE_WIDTH_RATIO}}>立即还款</Text> 147 + <Text style={{color:'white',fontSize:13*DEVICE_WIDTH_RATIO,lineHeight:Math.ceil(29 * DEVICE_WIDTH_RATIO)}}>立即还款</Text>
148 </View> 148 </View>
149 </TouchableOpacity> 149 </TouchableOpacity>
150 150
@@ -219,7 +219,7 @@ let styles = StyleSheet.create({ @@ -219,7 +219,7 @@ let styles = StyleSheet.create({
219 textAlign: 'center', 219 textAlign: 'center',
220 fontSize: 14 * DEVICE_WIDTH_RATIO, 220 fontSize: 14 * DEVICE_WIDTH_RATIO,
221 backgroundColor: 'transparent', 221 backgroundColor: 'transparent',
222 - lineHeight: 29 * DEVICE_WIDTH_RATIO, 222 + lineHeight: Math.ceil(29 * DEVICE_WIDTH_RATIO),
223 }, 223 },
224 contentContainer:{ 224 contentContainer:{
225 backgroundColor: 'white', 225 backgroundColor: 'white',
@@ -70,7 +70,7 @@ let styles = StyleSheet.create({ @@ -70,7 +70,7 @@ let styles = StyleSheet.create({
70 fontSize: 12 * DEVICE_WIDTH_RATIO, 70 fontSize: 12 * DEVICE_WIDTH_RATIO,
71 width: 175 * DEVICE_WIDTH_RATIO, 71 width: 175 * DEVICE_WIDTH_RATIO,
72 textAlign: 'center', 72 textAlign: 'center',
73 - lineHeight: 16 * DEVICE_WIDTH_RATIO, 73 + lineHeight: Math.ceil(16 * DEVICE_WIDTH_RATIO),
74 color: '#444444', 74 color: '#444444',
75 75
76 }, 76 },
@@ -79,7 +79,7 @@ let styles = StyleSheet.create({ @@ -79,7 +79,7 @@ let styles = StyleSheet.create({
79 fontSize: 12 * DEVICE_WIDTH_RATIO, 79 fontSize: 12 * DEVICE_WIDTH_RATIO,
80 color: '#b0b0b0', 80 color: '#b0b0b0',
81 textAlign: 'center', 81 textAlign: 'center',
82 - lineHeight: 20 * DEVICE_WIDTH_RATIO, 82 + lineHeight: Math.ceil(20 * DEVICE_WIDTH_RATIO),
83 }, 83 },
84 buttonContainer: { 84 buttonContainer: {
85 marginTop: 35 * DEVICE_WIDTH_RATIO, 85 marginTop: 35 * DEVICE_WIDTH_RATIO,
@@ -93,6 +93,6 @@ let styles = StyleSheet.create({ @@ -93,6 +93,6 @@ let styles = StyleSheet.create({
93 textAlign: 'center', 93 textAlign: 'center',
94 fontSize: 14 * DEVICE_WIDTH_RATIO, 94 fontSize: 14 * DEVICE_WIDTH_RATIO,
95 backgroundColor: 'transparent', 95 backgroundColor: 'transparent',
96 - lineHeight: 29 * DEVICE_WIDTH_RATIO, 96 + lineHeight: 29,
97 }, 97 },
98 }); 98 });
1 'use strict'; 1 'use strict';
2 2
3 -import Request from '../../common/services/Request'; 3 +import Request from '../../common/services/NativeRequest';
4 4
5 export default class InstallmentService { 5 export default class InstallmentService {
6 constructor (host) { 6 constructor (host) {