cd新的排版

jscore/pages/Desktop/Home.js

@@ -15,6 +15,7 @@ class DesktopHome extends Component {
             data: [],
             data2: [
                 {
+                    userData: "453534",
                     barcode: "4330012800000003232126",
                     orgType: "国网公司",
                     model: "YJLSZ-JF-10-630",
@@ -132,7 +133,7 @@ class DesktopHome extends Component {
     dianLiuRender = (item, index) => {
         return (
             <View
-                key={item.barcode}
+                key={item.userData}
                 style={styles.mainView}
             >
                 <View style={{
@@ -152,34 +153,34 @@ class DesktopHome extends Component {
                 <View style={styles.betweenView}>
                     <Text style={[styles.textColor, {borderRightWidth: 0.5,textAlign: 'left',  width: '30%'}]}>绕组配置 <Text
                         style={styles.textRed}>{item.windingCount}</Text></Text>
-                    <Text style={[styles.textColor, {borderRightWidth: 0.5,textAlign: 'left',  width: '45%'}]}>互感器原理 <Text
+                    <Text style={[styles.textColor, {borderRightWidth: 0.5,textAlign: 'left',  width: '46%'}]}>互感器原理 <Text
                         style={styles.textRed}>{item.transformer}</Text></Text>
-                    <Text style={[styles.textColor, {textAlign: 'left', width: '25%'}]}>绝缘方式 <Text
+                    <Text style={[styles.textColor, {textAlign: 'left', width: '24%'}]}>绝缘方式 <Text
                         style={styles.textRed}>{item.insulation}</Text></Text>
                     {/*<Text style={{borderRightColor}}>绝缘方式 <Text style={styles.textRed}>{item.insulation}</Text></Text>*/}
                 </View>
                 <View style={styles.betweenView}>
                     <Text style={[styles.textColor, {borderRightWidth: 0.5,textAlign: 'left',  width: '30%'}]}>额定电压 <Text
                         style={styles.textRed}>{item.ratedVoltage}</Text></Text>
-                    <Text style={[styles.textColor, {borderRightWidth: 0.5,  width: '45%'}]}>额定频率(Hz),安装场所 <Text
+                    <Text style={[styles.textColor, {borderRightWidth: 0.5,textAlign: 'left',  width: '46%'}]}>额定频率(Hz),安装场所 <Text
                         style={styles.textRed}>{item.ratedFrequencyAndPlace}</Text></Text>
-                    <Text style={[styles.textColor, {textAlign: 'left', width: '25%'}]}>功率因数 <Text
+                    <Text style={[styles.textColor, {textAlign: 'left', width: '24%'}]}>功率因数 <Text
                         style={styles.textRed}>{item.powerFactor}</Text></Text>
                 </View>
-                <View style={styles.betweenView}>
+                <View style={[styles.betweenView, {paddingHorizontal:0}]}>
                     <Text style={styles.textColor1}>额定电流变比(A)</Text>
                     <Text style={styles.textColor2}>TA额定二次负荷(VA)</Text>
                     <Text style={styles.textColor3}>TA轻载负荷(VA)</Text>
                     <Text style={styles.textColor4}>TA精度</Text>
                 </View>
-                <View style={styles.betweenView}>
+                <View style={[styles.betweenView, {paddingHorizontal:0}]}>
                     <Text style={styles.textColor1}>电流变比1 <Text
                         style={styles.textRed}>{item.ratedCurrent1}</Text></Text>
                     <Text style={{borderRightWidth: 0.5, width: '31%'}}/>
                     <Text style={{borderRightWidth: 0.5, width: '26%'}}/>
                     <Text style={{width: '16%'}}/>
                 </View>
-                <View style={[styles.betweenView, {borderTopWidth: 0,}]}>
+                <View style={[styles.betweenView, {borderTopWidth: 0, paddingHorizontal:0}]}>
                     <Text style={[styles.textColor1, {
                         borderTopWidth: 0.5,
                     }]}>电流变比2 <Text style={styles.textRed}>{item.ratedCurrent2}</Text></Text>
@@ -190,7 +191,7 @@ class DesktopHome extends Component {
                     <Text style={styles.textColor4}><Text
                         style={styles.textRed}>{item.precisionTA}</Text></Text>
                 </View>
-                <View style={[styles.betweenView, {borderTopWidth: 0,}]}>
+                <View style={[styles.betweenView, {borderTopWidth: 0, paddingHorizontal:0}]}>
                     <Text style={[styles.textColor1, {
                         borderTopWidth: 0.5,
                     }]}>电流变比3 <Text style={styles.textRed}>{item.ratedCurrent3}</Text></Text>
@@ -198,13 +199,13 @@ class DesktopHome extends Component {
                     <Text style={{borderRightWidth: 0.5, width: '26%'}}/>
                     <Text style={{width: '16%'}}/>
                 </View>
-                <View style={styles.betweenView}>
+                <View style={[styles.betweenView, {paddingHorizontal:0}]}>
                     <Text style={styles.textColor1}>电压比</Text>
                     <Text style={styles.textColor2}>TV额定二次负荷(VA)</Text>
                     <Text style={styles.textColor3}>TV轻载负荷(VA)</Text>
                     <Text style={styles.textColor4}>TV精度</Text>
                 </View>
-                <View style={styles.betweenView}>
+                <View style={[styles.betweenView, {paddingHorizontal:0}]}>
                     <Text style={styles.textColor1}><Text style={styles.textRed}>{item.voltageChangeRate}</Text></Text>
                     <Text style={styles.textColor2}><Text
                         style={styles.textRed}>{item.ratedSecondLoadTV}</Text></Text>