Authored by weiqingting

Merge branch 'yohobuy_portal_dev_v4.5_20160601' of http://git.yoho.cn/fe/yohobuy…

…-portal-fe into yohobuy_portal_dev_v4.5_20160601
@@ -43,7 +43,6 @@ g.init("/meterManage/tryInfo/index2"); @@ -43,7 +43,6 @@ g.init("/meterManage/tryInfo/index2");
43 var modelLists = []; 43 var modelLists = [];
44 //根据productSkn获取所有试穿信息并拼接返回 44 //根据productSkn获取所有试穿信息并拼接返回
45 var getAllInfo = function (item, callback) { 45 var getAllInfo = function (item, callback) {
46 - console.log("item11",item);  
47 common.util.__ajax({url: '/meterManage/tryInfo/info1', data: {productSkn: item.productSkn}}, function (data) { 46 common.util.__ajax({url: '/meterManage/tryInfo/info1', data: {productSkn: item.productSkn}}, function (data) {
48 var feelIds = { 47 var feelIds = {
49 1: "合适", 48 1: "合适",
@@ -117,7 +116,13 @@ var getNewLists = function (modelLists, callback) { @@ -117,7 +116,13 @@ var getNewLists = function (modelLists, callback) {
117 newList[i].fit_remark = ""; 116 newList[i].fit_remark = "";
118 } 117 }
119 } 118 }
120 - callback(newList); 119 + var postDoc=[];
  120 + for(var j=0;j<newList.length;j++){
  121 + if(newList[j].feel_id||newList[j].fit_size||newList[j].fit_remark){
  122 + postDoc.push(newList[j]);
  123 + }
  124 + }
  125 + callback(postDoc);
121 }; 126 };
122 127
123 //详情模态 128 //详情模态
@@ -182,7 +187,6 @@ $(document).on("change", ".tryInfo1", function () { @@ -182,7 +187,6 @@ $(document).on("change", ".tryInfo1", function () {
182 else { 187 else {
183 item[name] = $(this).val(); 188 item[name] = $(this).val();
184 } 189 }
185 - console.log(item);  
186 }); 190 });
187 //查询按钮--点击事件 191 //查询按钮--点击事件
188 $(document).on('click', '#filter-btn', function () { 192 $(document).on('click', '#filter-btn', function () {