feat: 增加品牌新需求

src/locales/en-US/trademark.ts

@@ -75,7 +75,7 @@ export default {
   'trademark.addBrand.card.2.name.message':'Enter the brand name!',
   'trademark.addBrand.card.2.name.placeholder':'Enter brand name',
   'trademark.addBrand.card.2.logoUrl':'Brand LOGO',
-  'trademark.addBrand.card.2.logoUrl.extra':'Support JPG/PNG/JPEG, the maximum is not more than 60K, in order to reduce the amount of loaded data, only the first-level project is recommended',
+  'trademark.addBrand.card.2.logoUrl.extra':'Support JPG/PNG/JPEG, the maximum is not more than 5M, in order to reduce the amount of loaded data, only the first-level project is recommended',
   'trademark.addBrand.card.2.logoUrl.message':'Upload a picture!',
 
   'trademark.checkBrand.state.1': 'Pending review',

src/locales/ko-KR/trademark.ts

@@ -75,7 +75,7 @@ export default {
   'trademark.addBrand.card.2.name.message' : '브랜드 이름 입력!',
   'trademark.addBrand.card.2.name.placeholder' : '브랜드 이름 입력',
   'trademark.addBrand.card.2.logoUrl' : '브랜드 로고.',
-  'trademark.addBrand.card.2.logoUrl.extra' : '최대 60K 이하의 JPG/PNG/JPEG 지원, 로드 데이터 양을 줄이기 위해 레벨 1 항목만 권장',
+  'trademark.addBrand.card.2.logoUrl.extra' : '최대 5M 이하의 JPG/PNG/JPEG 지원, 로드 데이터 양을 줄이기 위해 레벨 1 항목만 권장',
   'trademark.addBrand.card.2.logoUrl.message' : '사진 업로드!',
 
   'trademark.checkBrand.state.1': '심사 제출을 기다리다',

src/locales/zh-CN/trademark.ts

@@ -76,7 +76,7 @@ export default {
   'trademark.addBrand.card.2.name.message' : '输入品牌名称!',
   'trademark.addBrand.card.2.name.placeholder' : '输入品牌名称',
   'trademark.addBrand.card.2.logoUrl' : '品牌LOGO',
-  'trademark.addBrand.card.2.logoUrl.extra' : '支持JPG/PNG/JPEG，最大不超过 60K，为了减少加载数据量，只建议一级项目使用',
+  'trademark.addBrand.card.2.logoUrl.extra' : '支持JPG/PNG/JPEG，最大不超过 5M，为了减少加载数据量，只建议一级项目使用',
   'trademark.addBrand.card.2.logoUrl.message' : '上传图片!',
 
   'trademark.checkBrand.state.1': '待提交审核',

src/pages/trademark/addBrand.tsx

 import React, { useState, useEffect } from 'react'
 import { history, useIntl } from 'umi'
-import { Button, Steps, Card, Space, Tooltip, Form, Input, message, Row, Col } from 'antd'
+import { Button, Steps, Card, Space, Tooltip, Form, Input, message, Row, Col, Upload } from 'antd'
 import { PageHeaderWrapper } from '@ant-design/pro-layout'
 import { QuestionCircleOutlined, SaveOutlined } from '@ant-design/icons'
 import { UploadFile } from 'antd/lib/upload/interface';
@@ -78,14 +78,17 @@ const AddBrand: React.FC<{}> = () => {
     form.setFieldsValue({ proveUrl: obj })
   }, [fileList])
 
-  const beforeUpload = (file: UploadFile) => {
+  const beforeUpload = (file: UploadFile, size: number) => {
     const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png' || file.type === 'image/jpg';
     if (!isJpgOrPng) {
       message.error(intl.formatMessage({ id: 'trademark.addBrand.error.1' }));
+      return Upload.LIST_IGNORE
     }
-    const isLt2M = file.size / 1024 / 1024 < 2;
+    const isLt2M = file.size / 1024 / 1024 < size;
     if (!isLt2M) {
-      message.error(intl.formatMessage({ id: 'trademark.addBrand.error.3' }));
+      // message.error(intl.formatMessage({ id: 'trademark.addBrand.error.3' }));
+      message.error(`上传图片不超过${size}MB!`)
+      return Upload.LIST_IGNORE
     }
     return isJpgOrPng && isLt2M;
   }
@@ -189,6 +192,9 @@ const AddBrand: React.FC<{}> = () => {
             >
               <Input placeholder={intl.formatMessage({ id: 'trademark.addBrand.card.2.name.placeholder' })} />
             </Form.Item>
+            <Form.Item name='description' label='品牌描述'>
+              <Input.TextArea rows={2} placeholder="200字符" maxLength={200}  />
+            </Form.Item>
             <Form.Item
               name="logoUrl"
               label={<span>{intl.formatMessage({ id: 'trademark.addBrand.card.2.logoUrl' })}&nbsp;&nbsp;</span>}
@@ -203,7 +209,8 @@ const AddBrand: React.FC<{}> = () => {
             >
               <UploadImage
                 imgUrl={logoUrl}
-                fileMaxSize={60}
+                fileMaxSize={5*1024}
+                beforeUpload={(file) => beforeUpload(file, 5)}
                 onChange={(val) => {
                   setlogoUrl(val)
                   form.setFieldsValue({
@@ -225,7 +232,7 @@ const AddBrand: React.FC<{}> = () => {
                     listType="picture-card"
                     fileList={fileList}
                     filelistLength={20}
-                    beforeUpload={beforeUpload}
+                    beforeUpload={(file) => beforeUpload(file, 2)}
                     onChange={handleChange}
                     showUploadList={{ showPreviewIcon: false }}
                   />

src/pages/trademark/index.tsx

@@ -89,6 +89,13 @@ const Trademark: React.FC<{}> = () => {
       render: (text: any, record: any) => text && moment(text).format('YYYY-MM-DD HH:mm:ss')
     },
     {
+      title: '品牌描述',
+      dataIndex: 'description',
+      key: 'description',
+      width: 250,
+      ellipsis: true,
+    },
+    {
       // trademarkApply.state
       title: intl.formatMessage({ id: 'trademark.columns.isEnable' }),
       dataIndex: 'isEnable',