Authored by 马力

Merge branch 'grey'

... ... @@ -304,7 +304,7 @@ $(document).on("click",".sortadd",function(){
goodsSizeList.salePrice=$.trim($("#salesPriceStr").val());
g.__rows.push({
factoryCode: "",
factoryGoodsName: $.trim($("#factoryGoodsName").val())?$.trim($("#factoryGoodsName").val()):$(this).text(),
factoryGoodsName: text,
goodsColorImage: "",
goodsName: $(this).text(),
colorId: (+$(this).data("id")),
... ...
... ... @@ -308,7 +308,7 @@ webpackJsonp([28],[
goodsSizeList.salePrice=$.trim($("#salesPriceStr").val());
g.__rows.push({
factoryCode: "",
factoryGoodsName: $.trim($("#factoryGoodsName").val())?$.trim($("#factoryGoodsName").val()):$(this).text(),
factoryGoodsName: text,
goodsColorImage: "",
goodsName: $(this).text(),
colorId: (+$(this).data("id")),
... ...