有赚ui修改

张文文
Commit e3c88510d0b78858fb11a191cf3afdbc6072e3b4 1 parent 6fb22e2f
Showing 5 changed files with 57 additions and 35 deletions
js/alliance/components/BankCard.js
js/alliance/components/CheckSettleModal.js
js/alliance/components/Mine.js
js/alliance/components/NameAuthen.js
js/alliance/components/WithdrawalRecord.js
--- a/js/alliance/components/BankCard.js
View file @e3c8851
+++ b/js/alliance/components/BankCard.js
View file @e3c8851
@@ -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',
--- a/js/alliance/components/CheckSettleModal.js
View file @e3c8851
+++ b/js/alliance/components/CheckSettleModal.js
View file @e3c8851
@@ -43,7 +43,7 @@ export default class CheckSettleModal extends React.Component {
                             }}>
                                 <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 +127,15 @@ let styles = StyleSheet.create({
         fontFamily: 'PingFang-SC-Medium',
         fontSize: 14,
         color: '#D0021B',
+        lineHeight: 23,
+        letterSpacing: -0.09,
     },
     priceText: {
         fontFamily: 'PingFang-SC-Regular',
         fontSize: 14,
-        color: '#444444',
+        color: '#B0B0B0',
+        lineHeight: 23,
+        letterSpacing: -0.09,
     },
     tipText: {
         fontFamily: 'PingFang-SC-Regular',
--- a/js/alliance/components/Mine.js
View file @e3c8851
+++ b/js/alliance/components/Mine.js
View file @e3c8851
@@ -227,8 +227,8 @@ let styles = StyleSheet.create({
             color: '#444444',
         },
         arrowImage: {
-            width: 16,
-            height: 16,
+            width: 11,
+            height: 11,
             marginLeft: 2,
         },
         contentContainer: {
--- a/js/alliance/components/NameAuthen.js
View file @e3c8851
+++ b/js/alliance/components/NameAuthen.js
View file @e3c8851
@@ -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,8 +303,9 @@ let styles = StyleSheet.create({
     submitButton: {
       marginLeft: 15,
       marginRight: 15,
-      marginBottom: 33,
+      marginTop: 44,
       height: 44,
+      borderRadius: 4,
       backgroundColor: '#002B47',
       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,
--- a/js/alliance/components/WithdrawalRecord.js
View file @e3c8851
+++ b/js/alliance/components/WithdrawalRecord.js
View file @e3c8851
@@ -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
                     :
@@ -44,8 +46,8 @@ export default class WithdrawalRecord extends Component {
                   }
                   <View style={styles.withdrawContainer}>
-                      <Text style={styles.tipStyle}>{'每月20日结算上个月预估佣金并预扣个税'}</Text>
-                      <TouchableOpacity style={{flexDirection: 'row', alignItems: 'center'}} onPress={()=> {
+                      <Text style={[styles.tipStyle, {marginTop: 15}]}>{'每月20日结算上个月预估佣金并预扣个税'}</Text>
+                      <TouchableOpacity style={{flexDirection: 'row', alignItems: 'center', marginTop: 8}} onPress={()=> {
                           this.props.jumpWithActivityUrl && this.props.jumpWithActivityUrl();
                       }}>
                           <Text style={styles.tipStyle}>{'结算说明 '}</Text>
@@ -65,7 +67,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 +138,7 @@ let styles = StyleSheet.create({
     },
     detailView: {
       width: width,
-      paddingTop: 9,
+      paddingTop: 15,
       paddingLeft: 15,
       paddingRight: 15,
       paddingBottom: 20,
@@ -168,12 +170,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 +195,7 @@ let styles = StyleSheet.create({
       width: 80,
       height: 30,
       marginTop: 10,
-      borderRadius: 5,
+      borderRadius: 4,
       backgroundColor: '#D0021B',
       alignItems: 'center',
       justifyContent: 'center',
@@ -220,6 +220,5 @@ let styles = StyleSheet.create({
       color: '#B0B0B0',
       backgroundColor: 'transparent',
       textAlign: 'center',
-      lineHeight: 40,
     },
 });