mobile / YH_RNComponent · Commits

Go to a project

Authored by 张丽霞
Commit 4e00f685f9452af5fa6cd7b047e717a05e2bd7a4 2 parents b42901b7 40776b80

Merge branch '5.6.0-0.44.0' into 5.7.1-0.44.0

Inline Side-by-side
Showing 3 changed files with 6 additions and 24 deletions
@@ -43,10 +43,7 @@ export default class DoubleImage extends React.Component { @@ -43,10 +43,7 @@ export default class DoubleImage extends React.Component {
43 let data1 = list?list[0]:null; 43 let data1 = list?list[0]:null;
44 let backgroundImage1 = data1.pic; 44 let backgroundImage1 = data1.pic;
45 let linkType1 = data1.linkType; 45 let linkType1 = data1.linkType;
46 - let showProductInfo1 = true;  
47 - if (data1.showProductInfo && !data1.showProductInfo) {  
48 - showProductInfo1 = false;  
49 - } 46 + let showProductInfo1 = data1.showProductInfo?data1.showProductInfo:false;
50 let product1 = data1.product; 47 let product1 = data1.product;
51 if (!product1) { 48 if (!product1) {
52 showProductInfo1 = false; 49 showProductInfo1 = false;
@@ -62,10 +59,7 @@ export default class DoubleImage extends React.Component { @@ -62,10 +59,7 @@ export default class DoubleImage extends React.Component {
62 let data2 = list?list[1]:null; 59 let data2 = list?list[1]:null;
63 let backgroundImage2 = data2.pic; 60 let backgroundImage2 = data2.pic;
64 let linkType2 = data2.linkType; 61 let linkType2 = data2.linkType;
65 - let showProductInfo2 = true;  
66 - if (data2.showProductInfo && !data2.showProductInfo) {  
67 - showProductInfo2 = false;  
68 - } 62 + let showProductInfo2 = data2.showProductInfo?data2.showProductInfo:false;
69 let product2 = data2.product; 63 let product2 = data2.product;
70 if (!product2) { 64 if (!product2) {
71 showProductInfo2 = false; 65 showProductInfo2 = false;
@@ -39,10 +39,7 @@ export default class SingleImage extends React.Component { @@ -39,10 +39,7 @@ export default class SingleImage extends React.Component {
39 let data = list?list[0]:null; 39 let data = list?list[0]:null;
40 let backgroundImage = data.pic; 40 let backgroundImage = data.pic;
41 let linkType = data.linkType; 41 let linkType = data.linkType;
42 - let showProductInfo = true;  
43 - if (data.showProductInfo && !data.showProductInfo) {  
44 - showProductInfo = false;  
45 - } 42 + let showProductInfo = data.showProductInfo?data.showProductInfo:false;
46 let properties = resource.get('module_data').get('properties').toJS(); 43 let properties = resource.get('module_data').get('properties').toJS();
47 let imageW = properties.width; 44 let imageW = properties.width;
48 let imageH = properties.height; 45 let imageH = properties.height;
@@ -31,10 +31,7 @@ export default class RedPersonPicThree extends Component{ @@ -31,10 +31,7 @@ export default class RedPersonPicThree extends Component{
31 let data1 = list?list[0]:null; 31 let data1 = list?list[0]:null;
32 let backgroundImage1 = data1?data1.pic:''; 32 let backgroundImage1 = data1?data1.pic:'';
33 let linkType1 = data1.linkType; 33 let linkType1 = data1.linkType;
34 - let showProductInfo1 = true;  
35 - if (data1.showProductInfo && !data1.showProductInfo) {  
36 - showProductInfo1 = false;  
37 - } 34 + let showProductInfo1 = data1.showProductInfo?data1.showProductInfo:false;
38 let product1 = data1.product; 35 let product1 = data1.product;
39 if (!product1) { 36 if (!product1) {
40 showProductInfo1 = false; 37 showProductInfo1 = false;
@@ -50,10 +47,7 @@ export default class RedPersonPicThree extends Component{ @@ -50,10 +47,7 @@ export default class RedPersonPicThree extends Component{
50 let data2 = list?list[1]:null; 47 let data2 = list?list[1]:null;
51 let backgroundImage2 = data2.pic; 48 let backgroundImage2 = data2.pic;
52 let linkType2 = data2.linkType; 49 let linkType2 = data2.linkType;
53 - let showProductInfo2 = true;  
54 - if (data2.showProductInfo && !data2.showProductInfo) {  
55 - showProductInfo2 = false;  
56 - } 50 + let showProductInfo2 = data2.showProductInfo?data2.showProductInfo:false;
57 let product2 = data2.product; 51 let product2 = data2.product;
58 if (!product2) { 52 if (!product2) {
59 showProductInfo2 = false; 53 showProductInfo2 = false;
@@ -69,10 +63,7 @@ export default class RedPersonPicThree extends Component{ @@ -69,10 +63,7 @@ export default class RedPersonPicThree extends Component{
69 let data3 = list?list[2]:null; 63 let data3 = list?list[2]:null;
70 let backgroundImage3 = data3.pic; 64 let backgroundImage3 = data3.pic;
71 let linkType3 = data3.linkType; 65 let linkType3 = data3.linkType;
72 - let showProductInfo3 = true;  
73 - if (data3.showProductInfo && !data3.showProductInfo) {  
74 - showProductInfo3 = false;  
75 - } 66 + let showProductInfo3 = data3.showProductInfo?data3.showProductInfo:false;
76 let product3 = data3.product; 67 let product3 = data3.product;
77 if (!product3) { 68 if (!product3) {
78 showProductInfo3 = false; 69 showProductInfo3 = false;