Merge branch 'hotfix_netsale' of http://git.yoho.cn/fe/yohobuy-shop-fe2 into hotfix_netsale

@@ -77,7 +77,9 @@ var jQuery = require('jquery');
                             Array.push(itemsUpdate[i]._index);
                             Array.push(itemsUpdate[i]._index);
                         }
                         }
                         for (var i = 0; i < Array.length; i++) {
                         for (var i = 0; i < Array.length; i++) {
-                            sortArray.push(dataArray[Array[i]]);
+                             if(dataArray[Array[i]]){
+                                sortArray.push(dataArray[Array[i]]);    
+                            }  
                         }
                         }
                         if (callBack) {
                         if (callBack) {
                             callBack(sortArray);
                             callBack(sortArray);

@@ -318,16 +318,6 @@ function renderGoodList() {
         "男": 1,
         "男": 1,
         "女": 2
         "女": 2
     };
     };
-    goodsList.forEach(function (item, index) {
-        if (item && item.goodsImagesList) {
-            console.log((item.goodsImagesList));
-            for (var i = 0; i < item.goodsImagesList.length; i++) {
-                if (!item.goodsImagesList[i]) {
-                    item.goodsImagesList.splice(i, 1);
-                }
-            }
-        }
-    });
     var gender = map[window.NETSALEDATA.baseProductInfo.baseProduct.gender]||3;
     var gender = map[window.NETSALEDATA.baseProductInfo.baseProduct.gender]||3;
     $("#fenmianWrap").html(common.util.__template2($("#fenmianTemp").html(), {
     $("#fenmianWrap").html(common.util.__template2($("#fenmianTemp").html(), {
         goodsList: goodsList,
         goodsList: goodsList,
@@ -439,24 +429,20 @@ $('#fenmianWrap').on("click", ".btn-metro", function () {
     var colorIndex = $(this).data("i");
     var colorIndex = $(this).data("i");
     if (colorIndex == 0) {
     if (colorIndex == 0) {
         list.forEach(function (item, index) {
         list.forEach(function (item, index) {
-            if(item){
-                if (index == index1) {
-                    item.isDefault = "Y";
-                    item.genderCover = 0;
-                } else {
-                    item.isDefault = "N";
-                }
+            if (index == index1) {
+                item.isDefault = "Y";
+                item.genderCover = 0;
+            } else {
+                item.isDefault = "N";
             }
             }
         });
         });
     } else {
     } else {
         list.forEach(function (item, index) {
         list.forEach(function (item, index) {
-            if(item){
-                if (index == index1) {
-                    item.genderCover = colorIndex;
-                    item.isDefault = "N";
-                } else {
-                    item.genderCover = 0;
-                }
+            if (index == index1) {
+                item.genderCover = colorIndex;
+                item.isDefault = "N";
+            } else {
+                item.genderCover = 0;
             }
             }
         });
         });
         // item.genderCover = colorIndex;
         // item.genderCover = colorIndex;