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

@@ -67,7 +67,7 @@ export default class NameAuthen extends Component {
       let imageUrl = isBack ? this.state.backIDCardImageUri : this.state.frontIDCardImageUri;
       let hasImage = imageUrl.length > 0 ? true : false;
       return (
-          <View style={styles.renderIDCardAddCellImage}>
+          <View style={[styles.renderIDCardAddCellImage]}>
              <TouchableOpacity activeOpacity={1.0}
                 onPress={() => {
                   if(!hasImage){
@@ -78,9 +78,9 @@ export default class NameAuthen extends Component {
                   }
                 }}>
               {hasImage ?
-                <YH_Image resizeMode="contain" url={imageUrl} style={styles.leftViewImage}/>
+                <YH_Image resizeMode="contain" url={imageUrl} style={styles.viewImage}/>
               :
-              <Image resizeMode={'contain'} source={addImage} style={isBack ? styles.rightViewImage : styles.leftViewImage}/>
+              <Image resizeMode={'contain'} source={addImage} style={styles.viewImage}/>
               }
             </TouchableOpacity>
             <TouchableOpacity hitSlop={{top: 3, left: 3, bottom: 3, right: 3}} activeOpacity={1.0} style={styles.addImageClose}
@@ -318,27 +318,21 @@ let styles = StyleSheet.create({
     renderIDCardAddDetailCell: {
       flexDirection: 'row',
       marginTop: 15,
-      marginLeft: 15,
-      marginRight: 15,
+      marginLeft: 5,
+      marginRight: 5,
       justifyContent: 'center',
       alignItems: 'center',
     },
     renderIDCardAddCellImage: {
-      width: (width-30)/2,
-    },
-    leftViewImage: {
-      width: (width-50)/2,
-      height: 101,
-      marginTop: 5,
-      marginLeft: 0,
-      backgroundColor: 'transparent',
+      width: (width-10)/2,
     },
-    rightViewImage: {
+    viewImage:{
       width: (width-50)/2,
       height: 101,
       marginTop: 5,
       marginLeft: 10,
-      backgroundColor: 'transparent'
+      marginRight: 10,
+      backgroundColor: 'transparent',
     },
     addImage: {
       height: 30,
@@ -349,7 +343,7 @@ let styles = StyleSheet.create({
       height: 16,
       width: 16,
       top: 0,
-      left: (width-50)/2-6,
+      left: (width-50)/2+2,
     },
     renderIDCardSampleCellImage: {
       width: (width-30)/2,

@@ -205,6 +205,7 @@ let styles = StyleSheet.create({
       color: '#444444',
       backgroundColor: 'transparent',
       textAlign: 'left',
+      lineHeight: 23,
     },
     uploadButton: {
       width: 80,

@@ -275,11 +275,15 @@ export function getProductList(paramsDic) {
 }
 
 function reShuffleJumpList(jumplist, pageindex, pagesize) {
+  if (!jumplist || jumplist.length === 0) {
+    return []
+  } else {
     return jumplist && jumplist.map((item, index) => {
         item.rowType = 1
         item.index = (pageindex -1)*pagesize + parseInt(item.index)
         return item
     })
+  }
 }
 
 function exposeProductListData(json, order, channel, pageSize, tabId, tabName, prdFloorId, prdFloorName, prdFloorIndex) {