Merge branch 'test5.4' into gray

@@ -348,6 +348,7 @@ module.exports={
             params: {
                 productSkn:{type:Number},
                 modelCardId:{type:Number},
+                modelId:{type:Number},
                 size:{type:String}
             }
         },
@@ -365,6 +366,7 @@ module.exports={
             params: {
                 productSkn:{type:Number},
                 modelCardId:{type:Number},
+                modelId:{type:Number},
                 size:{type:String}
             }
         },

@@ -27,9 +27,9 @@ var modelCardTable = new common.grid({
 		display: '尺码',
 		name: 'size'
 	}, {
-		display: '模特卡',
+		display: '模特头像',
 		render: function(item) {
-			return '<img src="' + item.modelImg + '"/>';
+			return '<img src="' + item.modelImg +'?imageView/2/w/125/h/125'+ '"/>';
 		}
 	},{
 		display: '操作',
@@ -44,13 +44,13 @@ $(document).on('click', '#btn-model-add', function () {
 
   modelCardTable.init(NETSALEDATA.modelcardList);
   var productSkn = NETSALEDATA.baseProductInfo.baseProduct.productSkn;
-  var modelCardId = $("#select—model").val();
+  var modelId = $("#select—model").val();
   var size = $("#select—size").val();
-  if(modelCardId==-1){
+  if(modelId<1){
 	common.util.__tip("模特姓名不能为空");
 	return false;
   }
-  if(size==-1){
+  if(size<1){
   	common.util.__tip("商品尺寸不能为空");
 	return false;
   }
@@ -58,7 +58,7 @@ $(document).on('click', '#btn-model-add', function () {
 	    url: '/goods/product/addproductModelCard',
 	    data: {
 			productSkn:productSkn,
-			modelCardId:modelCardId,
+			modelId:modelId,
 			size:size
 	    }
 	    }, function (res) {
@@ -77,7 +77,7 @@ var productSkn = NETSALEDATA.baseProductInfo.baseProduct.productSkn;
 	    url: '/goods/product/delproductModelCard',
 	    data: {
 			productSkn:productSkn,
-			modelCardId:item.modelcardId,
+			modelId:item.modelId,
 			size:item.size
 	    }
 	    }, function (res) {