Merge branch '5.6.0-0.44.0'

@@ -43,10 +43,7 @@ export default class DoubleImage extends React.Component {
         let data1 = list?list[0]:null;
         let backgroundImage1 = data1.pic;
         let linkType1 = data1.linkType;
-        let showProductInfo1 = true;
-        if (data1.showProductInfo && !data1.showProductInfo) {
-            showProductInfo1 = false;
-        }
+        let showProductInfo1 = data1.showProductInfo?data1.showProductInfo:false;
         let product1 = data1.product;
         if (!product1) {
             showProductInfo1 = false;
@@ -62,10 +59,7 @@ export default class DoubleImage extends React.Component {
         let data2 = list?list[1]:null;
         let backgroundImage2 = data2.pic;
         let linkType2 = data2.linkType;
-        let showProductInfo2 = true;
-        if (data2.showProductInfo && !data2.showProductInfo) {
-            showProductInfo2 = false;
-        }
+        let showProductInfo2 = data2.showProductInfo?data2.showProductInfo:false;
         let product2 = data2.product;
         if (!product2) {
             showProductInfo2 = false;

@@ -39,10 +39,7 @@ export default class SingleImage extends React.Component {
         let data = list?list[0]:null;
         let backgroundImage = data.pic;
         let linkType = data.linkType;
-        let showProductInfo = true;
-        if (data.showProductInfo && !data.showProductInfo) {
-            showProductInfo = false;
-        }
+        let showProductInfo = data.showProductInfo?data.showProductInfo:false;
         let properties = resource.get('module_data').get('properties').toJS();
         let imageW = properties.width;
         let imageH = properties.height;

@@ -31,10 +31,7 @@ export default class RedPersonPicThree extends Component{
     let data1 = list?list[0]:null;
     let backgroundImage1 = data1?data1.pic:'';
     let linkType1 = data1.linkType;
-    let showProductInfo1 = true;
-    if (data1.showProductInfo && !data1.showProductInfo) {
-        showProductInfo1 = false;
-    }
+    let showProductInfo1 = data1.showProductInfo?data1.showProductInfo:false;
     let product1 = data1.product;
     if (!product1) {
         showProductInfo1 = false;
@@ -50,10 +47,7 @@ export default class RedPersonPicThree extends Component{
     let data2 = list?list[1]:null;
     let backgroundImage2 = data2.pic;
     let linkType2 = data2.linkType;
-    let showProductInfo2 = true;
-    if (data2.showProductInfo && !data2.showProductInfo) {
-        showProductInfo2 = false;
-    }
+    let showProductInfo2 = data2.showProductInfo?data2.showProductInfo:false;
     let product2 = data2.product;
     if (!product2) {
         showProductInfo2 = false;
@@ -69,10 +63,7 @@ export default class RedPersonPicThree extends Component{
     let data3 = list?list[2]:null;
     let backgroundImage3 = data3.pic;
     let linkType3 = data3.linkType;
-    let showProductInfo3 = true;
-    if (data3.showProductInfo && !data3.showProductInfo) {
-        showProductInfo3 = false;
-    }
+    let showProductInfo3 = data3.showProductInfo?data3.showProductInfo:false;
     let product3 = data3.product;
     if (!product3) {
         showProductInfo3 = false;