注销账号Android适配 --review by 张丽霞

王海元
Commit 59f33d049600fb14b40dc5262b645818a29a2b09 1 parent 519d8ce7
Showing 3 changed files with 17 additions and 15 deletions
js/userLogout/components/userLogout/LogoutClause.js
js/userLogout/components/userLogout/UserLogout.js
js/userLogout/components/userLogout/UserLogoutReason.js
--- a/js/userLogout/components/userLogout/LogoutClause.js
View file @59f33d0
+++ b/js/userLogout/components/userLogout/LogoutClause.js
View file @59f33d0
@@ -35,7 +35,7 @@ export default class LogoutClause extends Component {
                         在您注销您的YOHO!BUY账户之前，请您充分阅读、理解并同意下列事项，当您按照注销页面提示填写信息、阅读并同意本《注销须知》及相关条款与条件且完成全部注销程序后，即表示您已充分阅读、理解并接受本《注销须知》的全部内容。阅读本《注销须知》的过程中，如果您不同意相关任何条款和条件约定，请您立即停止账户注销程序。
                     </Text>
                     <Text style={styles.content}>
-                        我们在此善意的提醒您，您注销帐号的行为会给您的售后维权带来诸多的不便，且注销YOHO!BUY账户后，您的个人信息我们只会在有货商城的前台系统中去除，使其保持不可被检索、访问的状态，或对其进行匿名化处理。您知晓并理解，根据相关法律规定相关交易记录须在有货后台保存2年甚至更长时间。
+                        我们在此善意的提醒您，您注销账号的行为会给您的售后维权带来诸多的不便，且注销YOHO!BUY账户后，您的个人信息我们只会在有货商城的前台系统中去除，使其保持不可被检索、访问的状态，或对其进行匿名化处理。您知晓并理解，根据相关法律规定相关交易记录须在有货后台保存2年甚至更长时间。
                     </Text>
                     <Text style={styles.content}>
                         1.您所申请注销等YOHO!BUY账户应该是您依照用户服务协议注册并由本公司提供给您本人的账户。您应当按照本公司规定的程序或网站上的提示进行YOHO!BUY账户注销。
--- a/js/userLogout/components/userLogout/UserLogout.js
View file @59f33d0
+++ b/js/userLogout/components/userLogout/UserLogout.js
View file @59f33d0
@@ -45,7 +45,7 @@ export default class UserLogout extends Component {
                 <View style={styles.clauseContainer}>
                     <TouchableOpacity
                         activeOpacity={1.0}
-                        style={{flexDirection: 'row'}}
+                        style={{flexDirection: 'row',alignItems: 'center'}}
                         onPress={() => {
                         this.setState(previousState => {
                             return { readedClause: !previousState.readedClause };
@@ -73,7 +73,7 @@ export default class UserLogout extends Component {
                         }
                     }}>
                     <View style={[styles.confirmBtn,{backgroundColor:this.state.readedClause?'#444444':'#b0b0b0'}]}>
-                        <Text style={styles.confirmText}>注销帐号</Text>
+                        <Text style={styles.confirmText}>注销账号</Text>
                     </View>
                 </TouchableOpacity>
                 <Modal
@@ -85,26 +85,26 @@ export default class UserLogout extends Component {
                         <View style={styles.modalView}>
                             <View style={styles.confirmTitleContainer}>
                                 <View style={{marginTop:40,marginBottom:29}}>
-                                    <Text style={styles.confirmTitle}>确认注销帐号吗？</Text>
-                                    <Text style={styles.confirmTitle}>注销帐号将无法恢复！</Text>
+                                    <Text style={styles.confirmTitle}>确认注销账号吗？</Text>
+                                    <Text style={styles.confirmTitle}>注销账号将无法恢复！</Text>
                                 </View>
                             </View>
                             <View style={{width:'100%',height:0.5,backgroundColor:'#e0e0e0'}}/>
                             <View style={styles.confirmBtnContainer}>
                                 <TouchableOpacity
-                                    style={{width:'49%',alignItems:'center',height:45.5}}
+                                    style={{width:'49%',alignItems:'center',justifyContent:'center',height:45.5}}
                                     onPress={() => {
                                         this.props.updateLogoutModalState && this.props.updateLogoutModalState(false);
                                     }}>
-                                    <Text style={{lineHeight:44,fontSize:17,color:'#444444',letterSpacing:-0.41}}>放弃</Text>
+                                    <Text style={{fontSize:17,color:'#444444',letterSpacing:-0.41}}>放弃</Text>
                                 </TouchableOpacity>
                                 <View style={{width:0.5,height:45,backgroundColor:'#e0e0e0'}}/>
                                 <TouchableOpacity
-                                    style={{width:'49%',alignItems:'center',height:45.5}}
+                                    style={{width:'49%',alignItems:'center',justifyContent:'center',height:45.5}}
                                     onPress={() => {
                                         this.props.confirmLogoutAction && this.props.confirmLogoutAction();
                                     }}>
-                                    <Text style={{lineHeight:44,fontSize:17,color:'#d0021b',letterSpacing:-0.41}}>确定</Text>
+                                    <Text style={{fontSize:17,color:'#d0021b',letterSpacing:-0.41}}>确定</Text>
                                 </TouchableOpacity>
                             </View>
                         </View>
@@ -179,7 +179,6 @@ let styles = StyleSheet.create({
         flex: 1,
         justifyContent: 'center',
         backgroundColor:'rgba(0, 0, 0, 0.4)',
-        marginTop: 64
     },
     modalView: {
         marginTop: -64,
--- a/js/userLogout/components/userLogout/UserLogoutReason.js
View file @59f33d0
+++ b/js/userLogout/components/userLogout/UserLogoutReason.js
View file @59f33d0
@@ -95,6 +95,7 @@ export default class UserLogoutReason extends Component {
                         multiline={true}
                         placeholder="原因..."
                         placeholderTextColor='#b0b0b0'
+                        underlineColorAndroid='transparent' //设置下划线背景色透明 达到去掉下划线的效果
                         onChangeText={(text) => {
                             this.setState({text});
                             this.props.enableSubmitBtn && this.props.enableSubmitBtn(text == "" ? false : true)
@@ -133,6 +134,7 @@ export default class UserLogoutReason extends Component {
                                         placeholderTextColor='#b0b0b0'
                                         keyboardType="numeric"
                                         maxLength={13}
+                                        underlineColorAndroid='transparent' //设置下划线背景色透明 达到去掉下划线的效果
                                         onChangeText={(mobile) => {
                                             this.setState({mobile});
                                         }}/>
@@ -144,6 +146,7 @@ export default class UserLogoutReason extends Component {
                                         placeholderTextColor='#b0b0b0'
                                         keyboardType="numeric"
                                         maxLength={11}
+                                        underlineColorAndroid='transparent' //设置下划线背景色透明 达到去掉下划线的效果
                                         onChangeText={(cancleCode) => {
                                             this.setState({cancleCode});
                                         }}/>
@@ -233,12 +236,12 @@ export default class UserLogoutReason extends Component {
                                 <View style={{width:'100%',height:0.5,backgroundColor:'#e0e0e0',marginTop:15}}/>
                                 <TouchableOpacity
-                                    style={{width:'49%',alignItems:'center',height:45.5}}
+                                    style={{width:'49%',alignItems:'center',justifyContent: 'center',height:45.5}}
                                     onPress={() => {
                                         this.props.confirmLogout && this.props.confirmLogout(this.state.cancleCode, this.state.text);
                                     }}>
                                     <View style={{width:240}}>
-                                        <Text style={{lineHeight:44,fontSize:17,color:'#d0021b',letterSpacing:-0.41,fontFamily:'PingFang-SC-Medium',backgroundColor:'transparent',textAlign:'center'}}>确定</Text>
+                                        <Text style={{fontSize:17,color:'#d0021b',letterSpacing:-0.41,fontFamily:'PingFang-SC-Medium',backgroundColor:'transparent',textAlign:'center'}}>确定</Text>
                                     </View>
                                 </TouchableOpacity>
                             </View>
@@ -279,13 +282,13 @@ let styles = StyleSheet.create({
         padding: 10,
         color: '#444444',
         borderWidth: 0.5,
-        borderColor: '#e0e0e0'
+        borderColor: '#e0e0e0',
+        textAlignVertical: 'top'
     },
     textInputContainer: {
         marginLeft: 15,
         marginRight: 15,
         borderRadius: 10,
-        alignItems: 'center'
     },
     submitBtn: {
         marginLeft: 15,
@@ -294,10 +297,10 @@ let styles = StyleSheet.create({
         height: 44,
         borderRadius: 5,
         alignItems: 'center',
+        justifyContent: 'center',
     },
     submitText: {
         textAlign: 'center',
-        lineHeight: 43,
         color: 'white',
         fontSize: 16
     },