Merge branch 'hotfix_netsale' into grey

@@ -35,3 +35,4 @@ npm-debug.log
 *.njsproj
 obj/
 logs/
+dist/

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

@@ -351,7 +351,7 @@ var uesImgDialog = null,uesImgMap={},uesImgIndex=0;
 $(document).on('click', '.btn-use-img', function() {
 	var productSkc = $(this).data('productSkc'),
 		index = $(this).data("index");
-
+    uesImgIndex = index;
 	common.util.__ajax({
 		url: '/productPhoto/queryProductPhotoList',
 		data: {
@@ -370,6 +370,10 @@ $(document).on('click', '.btn-use-img', function() {
                     addFengmian(uesImgIndex, uesImgMap[i]);
                 }
                 renderGoodList();
+                uesImgMap = {};
+            },function(){
+                uesImgMap = {};
+               $(".select_img").removeClass("select_img"); 
             });
 		} else {
 			common.util.__tip('没有可调用的图片', 'warning');