fix：查询品牌详情参数id变更为审核品牌后的返回最新id

src/app.tsx

@@ -86,6 +86,10 @@ export function render(oldRender:Function) {
  * @param {*} { routes, matchedRoutes, location, action }
  */
 export function onRouteChange({ routes, matchedRoutes, location, action }) {
+  console.log('onRouteChange')
+  // 路由切换时， 自动回到顶部
+  document.body.scrollTop = document.documentElement.scrollTop = 0;
+
   if (isDev) {
     console.log('dev')
     return;
@@ -123,7 +127,7 @@ export function onRouteChange({ routes, matchedRoutes, location, action }) {
     history.replace('/noAuth')
   } else {
     // 未登录
-    
+
     if (whiteLists.includes(location.pathname)) {
       // 访问路由在白名单里
     } else {

src/constants/index.ts

@@ -586,6 +586,7 @@ export const PurchaseOrderOutWorkStateTexts = {
 
 export const PurchaseOrderInsideWorkStateTexts = {
   "-1": '取消订单',
+  0: '订单完成',
   1: '新增采购订单',
   2: '一级审核订单',
   3: '二级审核订单',
@@ -605,6 +606,7 @@ export const PurchaseOrderInsideWorkStateTexts = {
 
 // 销售订单内部显示文案
 export const SaleOrderInsideWorkStateTexts = {
+  0: '订单完成',
   1: '待审核订单',
   2: '一级审核订单',
   3: '二级审核订单',
@@ -615,7 +617,7 @@ export const SaleOrderInsideWorkStateTexts = {
   8: '提交二级审核订单不通过',
   9: '不接受订单',
   10: '待确认支付结果',
-  
+
   16: '支付结果确认到账',
   17: '支付结果没到账',
   18: '发货单创建',
@@ -651,4 +653,4 @@ export const InquiryStateTexts = {
   2: '待确认',
   3: '接受报价',
   4: '不接受报价',
-}
\ No newline at end of file
+}

src/pages/commodity/effect/index.tsx

@@ -27,4 +27,4 @@ export const searchCustomerCategoryOptionEffect = (context: any, fieldName: stri
       })
     })
   })
-}
\ No newline at end of file
+}

src/pages/trademark/trademarkWillCheck/checkBrand.tsx

@@ -33,7 +33,7 @@ const CheckBrand: React.FC<{}> = () => {
       loadPageData(id)
     }
   }, [])
-  
+
   const columns: ColumnType<any>[] = [
     {
       title: '序号',
@@ -129,11 +129,11 @@ const CheckBrand: React.FC<{}> = () => {
       let imgArray = Object.values(proveInfo)
        return imgArray.map((item: any, index: number) => <Col key={index} span={3} xxl={3} xl={4} lg={4}>
         <div className={styles.proveBox}>
-          <Image 
+          <Image
             width={175}
             height={120}
-            src={item} 
-            alt="品牌相关证明材料" 
+            src={item}
+            alt="品牌相关证明材料"
           />
         </div>
       </Col>
@@ -166,14 +166,14 @@ const CheckBrand: React.FC<{}> = () => {
         if(res.code=1000){
           handleCancel()
           setDisableCheck(true)
-          loadPageData(brandInfo.id)
+          loadPageData(res.data)
         }
       })
     })
   }
 
   const handleCancel = () => {
-    checkForm.resetFields() 
+    checkForm.resetFields()
     setVisibleModal(false)
   }
 
@@ -188,7 +188,7 @@ const CheckBrand: React.FC<{}> = () => {
       backIcon={<ReutrnEle logoSrc={brandInfo?.logoUrl} />}
       content={content}
       extra={[
-        <Button 
+        <Button
           icon={<CheckSquareOutlined />}
           key="1"
           type="primary"
@@ -232,8 +232,8 @@ const CheckBrand: React.FC<{}> = () => {
           layout="vertical"
           form={checkForm}
         >
-          <Form.Item 
-            name="status" 
+          <Form.Item
+            name="status"
             label=""
             rules={[
               {
@@ -249,8 +249,8 @@ const CheckBrand: React.FC<{}> = () => {
             </Radio.Group>
           </Form.Item>
           {
-            checkStatus===3 && <Form.Item 
-              name="checkRemark" 
+            checkStatus===3 && <Form.Item
+              name="checkRemark"
               label='审核不通过原因'
               rules={[
                 {