Merge branch '7.1.8' into 7.3.0
Showing
3 changed files
with
14 additions
and
15 deletions
@@ -123,12 +123,12 @@ export default class Browse extends Component { | @@ -123,12 +123,12 @@ export default class Browse extends Component { | ||
123 | renderSectionHeader={this.renderSectionHeader} | 123 | renderSectionHeader={this.renderSectionHeader} |
124 | renderHiddenRow={ (data, rowMap) => ( | 124 | renderHiddenRow={ (data, rowMap) => ( |
125 | <View style={styles.rowBack}> | 125 | <View style={styles.rowBack}> |
126 | - <Text></Text> | ||
127 | - <Text> | ||
128 | - <TouchableOpacity activeOpacity={1} style={styles.tailContainer} onPress={ _ => this.deleteRow(data, rowMap)}> | ||
129 | - <Text style={styles.tailText}>删除</Text> | 126 | + <View></View> |
127 | + <TouchableOpacity activeOpacity={1} onPress={_ => this.deleteRow(data,rowMap)}> | ||
128 | + <View style={styles.tailContainer}> | ||
129 | + <Text style={styles.tailText}>删除</Text> | ||
130 | + </View> | ||
130 | </TouchableOpacity> | 131 | </TouchableOpacity> |
131 | - </Text> | ||
132 | </View> | 132 | </View> |
133 | )} | 133 | )} |
134 | rightOpenValue={-70} | 134 | rightOpenValue={-70} |
@@ -168,11 +168,13 @@ export default class ProductCell extends Component { | @@ -168,11 +168,13 @@ export default class ProductCell extends Component { | ||
168 | </TouchableOpacity> | 168 | </TouchableOpacity> |
169 | </Animated.View> | 169 | </Animated.View> |
170 | {showTail | 170 | {showTail |
171 | - ? <TouchableOpacity activeOpacity={1} style={styles.tailContainer} onPress={() => { | 171 | + ? <TouchableOpacity activeOpacity={1} onPress={() => { |
172 | this.props.onPressDelete && this.props.onPressDelete(data, rowID); | 172 | this.props.onPressDelete && this.props.onPressDelete(data, rowID); |
173 | }}> | 173 | }}> |
174 | + <View style={styles.tailContainer}> | ||
174 | <Text style={styles.tailText}>删除</Text> | 175 | <Text style={styles.tailText}>删除</Text> |
175 | - </TouchableOpacity> | 176 | + </View> |
177 | + </TouchableOpacity> | ||
176 | : null} | 178 | : null} |
177 | </View> | 179 | </View> |
178 | ); | 180 | ); |
@@ -226,7 +228,6 @@ let styles = StyleSheet.create({ | @@ -226,7 +228,6 @@ let styles = StyleSheet.create({ | ||
226 | tailText: { | 228 | tailText: { |
227 | color: 'white', | 229 | color: 'white', |
228 | fontSize: 17, | 230 | fontSize: 17, |
229 | - backgroundColor: 'red' | ||
230 | }, | 231 | }, |
231 | container: { | 232 | container: { |
232 | flexDirection: 'row', | 233 | flexDirection: 'row', |
@@ -247,13 +247,11 @@ export default class Product extends Component { | @@ -247,13 +247,11 @@ export default class Product extends Component { | ||
247 | return( | 247 | return( |
248 | <View style={styles.rowBack}> | 248 | <View style={styles.rowBack}> |
249 | <View></View> | 249 | <View></View> |
250 | - | ||
251 | - <TouchableOpacity activeOpacity={1} style={styles.tailContainerSub} onPress={_ => this.deleteRow(data,rowMap)}> | ||
252 | - <View style={styles.tailContainer}> | ||
253 | - <Text style={styles.tailText}>删除</Text> | ||
254 | - </View> | 250 | + <TouchableOpacity activeOpacity={1} onPress={_ => this.deleteRow(data,rowMap)}> |
251 | + <View style={styles.tailContainer}> | ||
252 | + <Text style={styles.tailText}>删除</Text> | ||
253 | + </View> | ||
255 | </TouchableOpacity> | 254 | </TouchableOpacity> |
256 | - | ||
257 | </View> | 255 | </View> |
258 | )}} | 256 | )}} |
259 | rightOpenValue={-70} | 257 | rightOpenValue={-70} |
@@ -290,7 +288,7 @@ let styles = StyleSheet.create({ | @@ -290,7 +288,7 @@ let styles = StyleSheet.create({ | ||
290 | height: 130, | 288 | height: 130, |
291 | alignItems: 'center', | 289 | alignItems: 'center', |
292 | justifyContent: 'center', | 290 | justifyContent: 'center', |
293 | - backgroundColor: 'red' | 291 | + backgroundColor: 'red', |
294 | }, | 292 | }, |
295 | tailContainerSub: { | 293 | tailContainerSub: { |
296 | width: 70, | 294 | width: 70, |
-
Please register or login to post a comment