Merge branch 'hotfix/shop-edit' into gray

@@ -15,6 +15,7 @@ window.UMBusinessLicense = UM.getEditor('edit-business-license');
 // 一件代发 选项展示
 function underTakeElm(isShow) {
     const shopRelations = $("#shopRelationList").val()
+    const shopsType = $("#shopsType").val();
     if(isShow) {
         $("#customerTelFormGroup").show();
         $("#shopsAddressInfo").show();
@@ -32,7 +33,7 @@ function underTakeElm(isShow) {
         // 一件代发 默认选择单品 且不可修改
         // $('#shopsType').val('1').attr('disabled', 'disabled')
 
-        if(!!$("#shopsType").val()){
+        if(shopsType == '1' || shopsType == '2'){
             $("#modalId").prop("disabled",false);
         }else{
             $("#modalId").prop("disabled",true);
@@ -58,7 +59,7 @@ function underTakeElm(isShow) {
         $('#checkTel').attr('required', false)
         // $('#shopsType').attr('disabled', false).val('-1')
 
-        if(!!$("#shopsType").val()){
+        if(shopsType == '1' || shopsType == '2'){
             $("#modalId").prop("disabled",false);
         }else{
             $("#modalId").prop("disabled",true);