Merge remote-tracking branch 'remotes/origin/feature/product-detail' into release/4.9

@@ -75,9 +75,9 @@ const getSizeInfo = (sizeInfo) => {
         dest.sizeInfo.detail.list = [];
         dest.sizeInfo.detail.list = [];
 
 
         // 参考尺码
         // 参考尺码
-        let boyReference = !_.isEmpty(sizeInfo.productExtra.boyReference);
-        let girlReference = !_.isEmpty(sizeInfo.productExtra.girlReference);
-        let gender = !_.isEmpty(sizeInfo.productDescBo.gender) ? sizeInfo.productDescBo.gender : 3;
+        let boyReference = sizeInfo.productExtra.boyReference;
+        let girlReference = sizeInfo.productExtra.girlReference;
+        let gender = sizeInfo.productDescBo.gender ? sizeInfo.productDescBo.gender : 3;
         let referenceName = '参考尺码';
         let referenceName = '参考尺码';
 
 
         if ((gender === 1 && boyReference) || (gender === 2 && girlReference)) {
         if ((gender === 1 && boyReference) || (gender === 2 && girlReference)) {
@@ -102,12 +102,14 @@ const getSizeInfo = (sizeInfo) => {
 
 
         if (!_.isEmpty(sizeInfo.sizeInfoBo.sizeAttributeBos)) {
         if (!_.isEmpty(sizeInfo.sizeInfoBo.sizeAttributeBos)) {
 
 
+            // [{param: attrName}]   th
             let sizeNameList = [];
             let sizeNameList = [];
 
 
             temp = {};
             temp = {};
             temp.param = '吊牌尺码';
             temp.param = '吊牌尺码';
             sizeNameList.push(temp);
             sizeNameList.push(temp);
 
 
+            // {id: [{param: str},......]} sizeBoGroup[id][0] 属性名,  sizeBoGroup[id][index] 属性值
             let sizeBoGroup = {};
             let sizeBoGroup = {};
 
 
             _.forEach(sizeInfo.sizeInfoBo.sizeAttributeBos, function(attr) {
             _.forEach(sizeInfo.sizeInfoBo.sizeAttributeBos, function(attr) {
@@ -126,13 +128,11 @@ const getSizeInfo = (sizeInfo) => {
 
 
                 if (boyReference && (gender === 1 || gender === 3)) {
                 if (boyReference && (gender === 1 || gender === 3)) {
                     temp = {};
                     temp = {};
-                    temp.param = _.isEmpty(value.boyReferSize.referenceName) ?
-                        ' ' : value.boyReferSize.referenceName;
+                    temp.param = value.boyReferSize.referenceName || '';
                     referenceList.push(temp);
                     referenceList.push(temp);
                 } else if (girlReference && (gender === 2 || gender === 3)) {
                 } else if (girlReference && (gender === 2 || gender === 3)) {
                     temp = {};
                     temp = {};
-                    temp.param = _.isEmpty(value.girlReferSize.referenceName) ?
-                        ' ' : value.girlReferSize.referenceName;
+                    temp.param = value.girlReferSize.referenceName || '';
                     referenceList.push(temp);
                     referenceList.push(temp);
                 } else {
                 } else {
                     showReference = false;
                     showReference = false;
@@ -140,7 +140,7 @@ const getSizeInfo = (sizeInfo) => {
 
 
                 _.forEach(value.sortAttributes, function(attr) {
                 _.forEach(value.sortAttributes, function(attr) {
                     temp = {};
                     temp = {};
-                    temp.param = _.isEmpty(attr.sizeValue) ? ' ' : attr.sizeValue;
+                    temp.param = attr.sizeValue || ' ';
                     sizeBoGroup[attr.id].push(temp);
                     sizeBoGroup[attr.id].push(temp);
                 });
                 });
             });
             });
@@ -149,6 +149,7 @@ const getSizeInfo = (sizeInfo) => {
             dest.sizeInfo.detail.list[0] = {};
             dest.sizeInfo.detail.list[0] = {};
             dest.sizeInfo.detail.list[0].params = sizeNameList;
             dest.sizeInfo.detail.list[0].params = sizeNameList;
             if (showReference) {
             if (showReference) {
+                dest.sizeInfo.detail.list[1] = {};
                 dest.sizeInfo.detail.list[1].params = referenceList;
                 dest.sizeInfo.detail.list[1].params = referenceList;
             }
             }
             _.forEach(sizeBoGroup, function(value) {
             _.forEach(sizeBoGroup, function(value) {

@@ -709,23 +709,26 @@ $basicBtnC: #eb0313;
 
 
         a {
         a {
             display: inline-block;
             display: inline-block;
+        }
 
 
-            &.num-incart {
+        .num-incart {
+            position: relative;
             color: #444;
             color: #444;
             font-size: 47px;
             font-size: 47px;
         }
         }
 
 
-            &.favorite {
+        .favorite {
             color: #ccc;
             color: #ccc;
             font-size: 34px;
             font-size: 34px;
+            background-color: transparent;
         }
         }
 
 
-            &.favorite.liked {
+        .favorite.liked {
             color: $basicBtnC;
             color: $basicBtnC;
         }
         }
 
 
-            &.addto-cart,
-            &.sold-out {
+        .addto-cart,
+        .sold-out {
             margin: 0 100px 0 115px;
             margin: 0 100px 0 115px;
             width: 260px;
             width: 260px;
             height: 80px;
             height: 80px;
@@ -736,15 +739,14 @@ $basicBtnC: #eb0313;
             line-height: 80px;
             line-height: 80px;
         }
         }
 
 
-            &.sold-out {
+        .sold-out {
             background-color: #f58189;
             background-color: #f58189;
         }
         }
-        }
 
 
         .num-tag {
         .num-tag {
             position: absolute;
             position: absolute;
             top: 0;
             top: 0;
-            left: 48px;
+            right: -15px;
             display: block;
             display: block;
             width: 30px;
             width: 30px;
             height: 30px;
             height: 30px;