Merge branch 'feature/brand-valid' into 'master'

fix: 补充资质不校验品牌信息

See merge request !101

src/pages/BrandManage/staticData.js

@@ -160,7 +160,7 @@ export const brandInfoColumn = config => {
         disabled,
       },
       formItemProps: {
-        rules: [{ required: true, message: '请输入品牌名称' }],
+        rules: disabled ? [] : [{ required: true, message: '请输入品牌名称' }],
       },
     },
     {
@@ -184,7 +184,7 @@ export const brandInfoColumn = config => {
       dataIndex: 'alias',
       maxLength: 50,
       formItemProps: {
-        rules: [{ required: true, message: '请输入品牌缩写或别称' }],
+        rules: disabled ? [] : [{ required: true, message: '请输入品牌缩写或别称' }],
       },
       fieldProps: {
         disabled,
@@ -194,7 +194,7 @@ export const brandInfoColumn = config => {
       title: '长方形LOGO上传',
       dataIndex: 'horizontalLogo',
       formItemProps: {
-        rules: [{ required: true, message: '请上传长方形LOGO上传' }],
+        rules: disabled ? [] : [{ required: true, message: '请上传长方形LOGO上传' }],
         extra: (
           <div>
             <div>尺寸要求:219*72</div>
@@ -213,7 +213,7 @@ export const brandInfoColumn = config => {
       title: 'LOGO上传',
       dataIndex: 'logo',
       formItemProps: {
-        rules: [{ required: true, message: '请上传LOGO' }],
+        rules: disabled ? [] : [{ required: true, message: '请上传LOGO' }],
         extra: <span>尺寸要求:192*192</span>,
       },
       fieldProps: {