Authored by 孙凯

Merge branch '7.1.8' into 7.3.0

... ... @@ -123,12 +123,12 @@ export default class Browse extends Component {
renderSectionHeader={this.renderSectionHeader}
renderHiddenRow={ (data, rowMap) => (
<View style={styles.rowBack}>
<Text></Text>
<Text>
<TouchableOpacity activeOpacity={1} style={styles.tailContainer} onPress={ _ => this.deleteRow(data, rowMap)}>
<Text style={styles.tailText}>删除</Text>
<View></View>
<TouchableOpacity activeOpacity={1} onPress={_ => this.deleteRow(data,rowMap)}>
<View style={styles.tailContainer}>
<Text style={styles.tailText}>删除</Text>
</View>
</TouchableOpacity>
</Text>
</View>
)}
rightOpenValue={-70}
... ...
... ... @@ -168,11 +168,13 @@ export default class ProductCell extends Component {
</TouchableOpacity>
</Animated.View>
{showTail
? <TouchableOpacity activeOpacity={1} style={styles.tailContainer} onPress={() => {
? <TouchableOpacity activeOpacity={1} onPress={() => {
this.props.onPressDelete && this.props.onPressDelete(data, rowID);
}}>
<View style={styles.tailContainer}>
<Text style={styles.tailText}>删除</Text>
</TouchableOpacity>
</View>
</TouchableOpacity>
: null}
</View>
);
... ... @@ -226,7 +228,6 @@ let styles = StyleSheet.create({
tailText: {
color: 'white',
fontSize: 17,
backgroundColor: 'red'
},
container: {
flexDirection: 'row',
... ...
... ... @@ -247,13 +247,11 @@ export default class Product extends Component {
return(
<View style={styles.rowBack}>
<View></View>
<TouchableOpacity activeOpacity={1} style={styles.tailContainerSub} onPress={_ => this.deleteRow(data,rowMap)}>
<View style={styles.tailContainer}>
<Text style={styles.tailText}>删除</Text>
</View>
<TouchableOpacity activeOpacity={1} onPress={_ => this.deleteRow(data,rowMap)}>
<View style={styles.tailContainer}>
<Text style={styles.tailText}>删除</Text>
</View>
</TouchableOpacity>
</View>
)}}
rightOpenValue={-70}
... ... @@ -290,7 +288,7 @@ let styles = StyleSheet.create({
height: 130,
alignItems: 'center',
justifyContent: 'center',
backgroundColor: 'red'
backgroundColor: 'red',
},
tailContainerSub: {
width: 70,
... ...