Merge branch '7.1.8' of http://git.yoho.cn/mobile/YH_RNComponent into 7.1.8
Showing
12 changed files
with
19 additions
and
10 deletions
@@ -413,11 +413,11 @@ let styles = StyleSheet.create({ | @@ -413,11 +413,11 @@ let styles = StyleSheet.create({ | ||
413 | height: 15, | 413 | height: 15, |
414 | }, | 414 | }, |
415 | thumbsUpNumView: { | 415 | thumbsUpNumView: { |
416 | - backgroundColor: 'red', | 416 | + backgroundColor: '#D0021B', |
417 | borderRadius: 5, | 417 | borderRadius: 5, |
418 | position: 'absolute', | 418 | position: 'absolute', |
419 | - left: 12, | ||
420 | - top: 10, | 419 | + left: 16, |
420 | + top: 8, | ||
421 | }, | 421 | }, |
422 | thumbsUpNumText: { | 422 | thumbsUpNumText: { |
423 | backgroundColor: 'transparent', | 423 | backgroundColor: 'transparent', |
@@ -246,12 +246,14 @@ export default class Product extends Component { | @@ -246,12 +246,14 @@ export default class Product extends Component { | ||
246 | this.rowMap = rowMap; | 246 | this.rowMap = rowMap; |
247 | return( | 247 | return( |
248 | <View style={styles.rowBack}> | 248 | <View style={styles.rowBack}> |
249 | - <Text></Text> | ||
250 | - <Text> | ||
251 | - <TouchableOpacity activeOpacity={1} style={styles.tailContainer} onPress={_ => this.deleteRow(data,rowMap)}> | 249 | + <View></View> |
250 | + | ||
251 | + <TouchableOpacity activeOpacity={1} style={styles.tailContainerSub} onPress={_ => this.deleteRow(data,rowMap)}> | ||
252 | + <View style={styles.tailContainer}> | ||
252 | <Text style={styles.tailText}>删除</Text> | 253 | <Text style={styles.tailText}>删除</Text> |
254 | + </View> | ||
253 | </TouchableOpacity> | 255 | </TouchableOpacity> |
254 | - </Text> | 256 | + |
255 | </View> | 257 | </View> |
256 | )}} | 258 | )}} |
257 | rightOpenValue={-70} | 259 | rightOpenValue={-70} |
@@ -290,6 +292,10 @@ let styles = StyleSheet.create({ | @@ -290,6 +292,10 @@ let styles = StyleSheet.create({ | ||
290 | justifyContent: 'center', | 292 | justifyContent: 'center', |
291 | backgroundColor: 'red' | 293 | backgroundColor: 'red' |
292 | }, | 294 | }, |
295 | + tailContainerSub: { | ||
296 | + width: 70, | ||
297 | + height: 130, | ||
298 | + }, | ||
293 | tailText: { | 299 | tailText: { |
294 | color: 'white', | 300 | color: 'white', |
295 | fontSize: 17, | 301 | fontSize: 17, |
@@ -652,6 +652,7 @@ | @@ -652,6 +652,7 @@ | ||
652 | "resolved": "http://registry.npm.taobao.org/align-text/download/align-text-0.1.4.tgz", | 652 | "resolved": "http://registry.npm.taobao.org/align-text/download/align-text-0.1.4.tgz", |
653 | "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", | 653 | "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", |
654 | "dev": true, | 654 | "dev": true, |
655 | + "optional": true, | ||
655 | "requires": { | 656 | "requires": { |
656 | "kind-of": "^3.0.2", | 657 | "kind-of": "^3.0.2", |
657 | "longest": "^1.0.1", | 658 | "longest": "^1.0.1", |
@@ -663,6 +664,7 @@ | @@ -663,6 +664,7 @@ | ||
663 | "resolved": "http://registry.npm.taobao.org/kind-of/download/kind-of-3.2.2.tgz", | 664 | "resolved": "http://registry.npm.taobao.org/kind-of/download/kind-of-3.2.2.tgz", |
664 | "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", | 665 | "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", |
665 | "dev": true, | 666 | "dev": true, |
667 | + "optional": true, | ||
666 | "requires": { | 668 | "requires": { |
667 | "is-buffer": "^1.1.5" | 669 | "is-buffer": "^1.1.5" |
668 | } | 670 | } |
@@ -5738,7 +5740,8 @@ | @@ -5738,7 +5740,8 @@ | ||
5738 | "version": "1.0.1", | 5740 | "version": "1.0.1", |
5739 | "resolved": "http://registry.npm.taobao.org/longest/download/longest-1.0.1.tgz", | 5741 | "resolved": "http://registry.npm.taobao.org/longest/download/longest-1.0.1.tgz", |
5740 | "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", | 5742 | "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", |
5741 | - "dev": true | 5743 | + "dev": true, |
5744 | + "optional": true | ||
5742 | }, | 5745 | }, |
5743 | "loose-envify": { | 5746 | "loose-envify": { |
5744 | "version": "1.3.1", | 5747 | "version": "1.3.1", |
@@ -6054,7 +6057,7 @@ | @@ -6054,7 +6057,7 @@ | ||
6054 | "resolved": "http://registry.npm.taobao.org/minimatch/download/minimatch-3.0.4.tgz", | 6057 | "resolved": "http://registry.npm.taobao.org/minimatch/download/minimatch-3.0.4.tgz", |
6055 | "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=", | 6058 | "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=", |
6056 | "requires": { | 6059 | "requires": { |
6057 | - "brace-expansion": "1.1.11" | 6060 | + "brace-expansion": "^1.1.7" |
6058 | } | 6061 | } |
6059 | }, | 6062 | }, |
6060 | "minimist": { | 6063 | "minimist": { |
-
Please register or login to post a comment