Authored by 马力

Merge branch 'test5.7.1' into gray

... ... @@ -2132,10 +2132,14 @@ $(document).on('change', '.link-resource', function() {
var linkType = Bll.moduleGrid.__rows[index].linkType;
var resource;
var text;
var selectIndex;
// 商品分类
if(linkType == 0) {
resource = $(this).find('.category-resource').val();
resource = !!~resource ? resource : "";
selectIndex = $(this).find('.category-resource')[0].options.selectedIndex;
text = $(this).find('.category-resource')[0].options[selectIndex].text;
} else {
resource = $(this).find('.input-resource').val();
resource = $.trim(resource);
... ... @@ -2152,7 +2156,7 @@ $(document).on('change', '.link-resource', function() {
}
Bll.moduleGrid.__rows[index].resource = resource;
Bll.moduleGrid.__rows[index].text = text;
Bll.moduleGrid.reload();
});
... ...