Merge branch 'feature/20230327_public_takeaway' of...

Merge branch 'feature/20230327_public_takeaway' of http://git.quantgroup.cn/ui/merchant-manage-ui into feature/20230327_public_takeaway

src/pages/GoodsManage/staticdata.js

@@ -302,25 +302,25 @@ export function takeawayColumn(actions) {
     {
       title: '售卖价格(元)',
       dataIndex: 'salePrice',
-      width: 150,
+      width: 120,
       align: 'center',
     },
     {
       title: '库存',
-      width: 120,
+      width: 100,
       dataIndex: 'stock',
       align: 'center',
     },
     {
       title: '上下架状态',
       dataIndex: 'stateDesc', // 5:未上架 ,6 :上架,7:下架
-      width: 200,
+      width: 110,
       align: 'center',
     },
     {
       title: '操作',
       dataIndex: 'action',
-      width: 400,
+      width: 390,
       align: 'center',
       render: (_, row, index) => (
         <div className={styles.actionBtn}>

src/pages/businessManage/info/index.jsx

@@ -705,6 +705,7 @@ class BusinessInfo extends Component {
                   <Col span={24}>
                     <FormItem label="授权品牌" labelCol={{ span: 4 }}>
                       {getFieldDecorator('brand', {
+                        rules: [{ required: true, message: '请输入授权品牌!' }],
                         initialValue: businessInfo.brand,
                       })(<Input maxLength={32} disabled={disabled} />)}
                     </FormItem>
@@ -716,6 +717,7 @@ class BusinessInfo extends Component {
                       wrapperCol={wrapperCol}
                     >
                       {getFieldDecorator('brandCertificate', {
+                        rules: [{ required: true, message: '请上传品牌经销商授权书!' }],
                         initialValue: businessInfo.brandCertificate,
                       })(
                         <Upload