Authored by 马力

Merge branch 'hotfix_套餐'

@@ -51,7 +51,7 @@ if($("#id").val()){ @@ -51,7 +51,7 @@ if($("#id").val()){
51 $("#budle-table").find("input[name='bundleDiscount']").val($("#edit-discount").val()); 51 $("#budle-table").find("input[name='bundleDiscount']").val($("#edit-discount").val());
52 52
53 $("#shopLable").text(shopName); 53 $("#shopLable").text(shopName);
54 - $("#discount, input[name=bundleDiscount]").attr('disabled', 'disabled'); 54 + $("#discount, input[name=bundleDiscount], #shop").attr('disabled', 'disabled');
55 } 55 }
56 56
57 57