Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-system into dev

package.json

@@ -34,7 +34,7 @@
     "braft-editor": "^2.3.9",
     "classnames": "^2.2.6",
     "core-js": "^3.6.5",
-    "god": "0.1.18",
+    "god": "^0.1.18",
     "lint-staged": "^10.0.7",
     "mobx": "^5.15.4",
     "mobx-react": "^6.2.2",

src/pages/trademark/trademarkSearch/checkBrand.tsx

@@ -38,6 +38,8 @@ const CheckBrand: React.FC<{}> = () => {
             setFixStep(0)
           else if(res.data.status===2)
             setFixStep(1)
+          else
+            setFixStep(2)
         }
       })
       PublicApi.getProductBrandGetBrandCheckRecord({brandId: id}).then(res=> {
@@ -133,7 +135,7 @@ const CheckBrand: React.FC<{}> = () => {
 
   const tips = <>证明材料<Tooltip title="证明材料：如商标注册证书、品牌授权证书等证明材料"><span>&nbsp;<QuestionCircleOutlined /></span></Tooltip></>
   const content = <>
-      <Descriptions colon={true} style={{textAlign: 'left', marginLeft: 200}}>
+      <Descriptions colon={true}  style={{textAlign: 'left', marginLeft: 100, width: 800}}>
         <Descriptions.Item span={1} label="商家名称">{brandInfo?.memberName}</Descriptions.Item>
         <Descriptions.Item span={1} label="申请审核时间">{brandInfo.applyTime && moment(brandInfo.applyTime).format('YYYY-MM-DD HH:mm:ss')}</Descriptions.Item>
         <Descriptions.Item span={1} label="审核状态">

src/pages/trademark/trademarkSearch/viewBrand.tsx

@@ -32,6 +32,8 @@ const viewBrand: React.FC<{}> = () => {
             setFixStep(0)
           else if(res.data.status===2)
             setFixStep(1)
+          else
+            setFixStep(2)
         }
       })
       PublicApi.getProductBrandGetBrandCheckRecord({brandId: id}).then(res=> {
@@ -125,7 +127,7 @@ const viewBrand: React.FC<{}> = () => {
   }
   const tips = <>证明材料<Tooltip title="证明材料：如商标注册证书、品牌授权证书等证明材料"><span>&nbsp;<QuestionCircleOutlined /></span></Tooltip></>
   const content = <>
-      <Descriptions colon={true} style={{textAlign: 'left', marginLeft: 200}}>
+      <Descriptions colon={true}  style={{textAlign: 'left', marginLeft: 100, width: 800}}>
         <Descriptions.Item span={1} label="商家名称">{brandInfo?.memberName}</Descriptions.Item>
         <Descriptions.Item span={1} label="申请审核时间">{brandInfo.applyTime && moment(brandInfo.applyTime).format('YYYY-MM-DD HH:mm:ss')}</Descriptions.Item>
         <Descriptions.Item span={1} label="审核状态">