Merge branch 'gerry/v6.9.16_bugfixed' into 'v6.9.16'

ui优化 # reviewed by hongyong



See merge request !47

@@ -73,26 +73,16 @@ export default class PBProductListView extends Component {
                         <View style={styles.tagView}>
                         <View style={styles.tagView}>
 +                            <Text style= {styles.tag}>{rowData.tag}</Text>
 +                            <Text style= {styles.tag}>{rowData.tag}</Text>
                         </View>}
                         </View>}
-
-                        {/* {tipState == '已抢光' ?
-                            <View style={styles.soldOutContainer}>
-                                <Image source={require('../../images/yqg.png')}/>
-                            </View>
-                            : null } */}
-
                     </View>
                     </View>
 
 
 
 
                     <View style={styles.rowRight}>
                     <View style={styles.rowRight}>
                         <Text style={styles.productTitle}
                         <Text style={styles.productTitle}
                               numberOfLines={2}>{rowData.productName}</Text>
                               numberOfLines={2}>{rowData.productName}</Text>
-
-                            {/* <View style = {{flexDirection : 'row', position: 'absolute', top: 80}}> */}
                             {tipState == '马上抢' && <View style = {styles.progressBar}>
                             {tipState == '马上抢' && <View style = {styles.progressBar}>
-
                                 <Progress.Bar
                                 <Progress.Bar
                                 progress={percent/100}
                                 progress={percent/100}
-                                width={100}
+                                width={adjustPx(100)}
                                 color={'#D0021B'}
                                 color={'#D0021B'}
                                 unfilledColor={'#ffffff'}
                                 unfilledColor={'#ffffff'}
                                 borderWidth={1}
                                 borderWidth={1}
@@ -104,7 +94,7 @@ export default class PBProductListView extends Component {
                             {tipState == '已抢光' && <View style = {styles.progressBar}>
                             {tipState == '已抢光' && <View style = {styles.progressBar}>
                                 <Progress.Bar
                                 <Progress.Bar
                                 progress={1}
                                 progress={1}
-                                width={100}
+                                width={adjustPx(100)}
                                 color={'#B0B0B0'}
                                 color={'#B0B0B0'}
                                 unfilledColor={'#B0B0B0'}
                                 unfilledColor={'#B0B0B0'}
                                 borderWidth={1}
                                 borderWidth={1}
@@ -113,11 +103,9 @@ export default class PBProductListView extends Component {
                                 <Text style = {styles.progressText}>已售罄</Text>
                                 <Text style = {styles.progressText}>已售罄</Text>
                             </View> }
                             </View> }
 
 
-                            <View>
-                                <Text style={{fontSize: 12, color: '#B0B0B0', top: 8}}>限量{stock}件</Text>
-                            </View>
-
-
+                            {rowData.wait && <View style={styles.limit}>
+                                <Text style={styles.limitText}>限量{stock}件</Text>
+                            </View>}
                         <View style={{
                         <View style={{
                             flexDirection: 'row',
                             flexDirection: 'row',
                             flex: 1,
                             flex: 1,
@@ -271,17 +259,18 @@ let styles = StyleSheet.create({
     },
     },
     seckillPrice: {
     seckillPrice: {
         fontSize: 18,
         fontSize: 18,
-        lineHeight: 21,
+        lineHeight: 30,
         fontWeight: 'bold',
         fontWeight: 'bold',
         color: '#d0021b',
         color: '#d0021b',
+        justifyContent: 'center',
     },
     },
     originPrice: {
     originPrice: {
         textDecorationLine: 'line-through',
         textDecorationLine: 'line-through',
         color: '#B0B0B0',
         color: '#B0B0B0',
         fontSize: 12,
         fontSize: 12,
-        lineHeight: 17,
+        height: 17,
         left: 5,
         left: 5,
-        top: 3
+        top: 10,
     },
     },
     seckillBeginTimeTip: {
     seckillBeginTimeTip: {
         fontSize: 9,
         fontSize: 9,
@@ -311,12 +300,20 @@ let styles = StyleSheet.create({
     },
     },
     progressBar: {
     progressBar: {
         flexDirection : 'row', 
         flexDirection : 'row', 
-        position: 'absolute', 
+        position: 'absolute',
         top: adjustPx(80),
         top: adjustPx(80),
     },
     },
     tag: {
     tag: {
         fontSize: 10,
         fontSize: 10,
         color: 'white',
         color: 'white',
-    }
+    },
+    limit: {
+        position: 'absolute',
+        top: adjustPx(80),
+    },
+    limitText: {
+        fontSize: 12, 
+        color: '#B0B0B0', 
+    },
 
 
 });
 });