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

src/pages/content/utils/utils.tsx

@@ -64,7 +64,9 @@ const ADVERTISE_WEB_COLUMN_TYPE = {
 
 const ADVERTISE_APP_COLUMN_TYPE = {
   "4": '找店铺广告图',
-  "5": "人气店铺广告图"
+  "5": "人气店铺广告图",
+  "6": "商品询价广告",
+  "7": "未开通电子签章推广页广告"
 }
 
 // 内容管理 - 公告栏目

src/pages/home/components/MemberStatistics/lineChart.tsx

@@ -8,7 +8,18 @@ interface IProps {
 
 const LineChart: React.FC<IProps> = (props) => {
   return (
-    <Chart height={360} autoFit data={props.data}>
+    <Chart
+      height={360}
+      autoFit
+      data={props.data}
+      scale={
+        {
+          count: {
+            tickInterval: 1,
+          }
+        }
+      }
+    >
       <Legend position="top-left" />
       {/* <Axis name="dateTime" />
       <Axis name="count"/> */}

src/pages/home/components/OrderStatistics/index.tsx

@@ -57,7 +57,7 @@ const OrderStatistics: React.FC<Iprops> = (props) => {
     <Card
       headStyle={{borderBottom:'none'}}
       style={{height: '100%'}}
-      title="会员统计"
+      title="订单统计"
       bordered={false}
       extra={
         <Radio.Group value={timeRadio} buttonStyle="solid" size="small" onChange={handleChangeTime}>

src/pages/home/components/Settlement/index.tsx

@@ -83,7 +83,7 @@ const Settlement: React.FC = () => {
                 <img src={feeIcon3} alt=""/>
                 <div className={styles.lineDescText}>
                   <p className={styles.lineDescTitle}>{settlements.tobeValifyCashout?.count}</p>
-                  <p className={styles.lineDescTip}>待提现申请</p>
+                  <p className={styles.lineDescTip}>待审核提现申请</p>
                 </div>
               </div>
               <Link to={settlements.tobeValifyCashout?.link}>查看&nbsp;<RightOutlined /></Link>

src/pages/home/components/StatisticsColumn/index.tsx

@@ -40,7 +40,9 @@ const StatisticsColumn = (props) => {
                               <p className={styles.lineDescTip}>{data.addProduct?.name}</p>
                             </div>
                           </div>
-                          <Link to={data.addProduct?.link}>查看&nbsp;<RightOutlined /></Link>
+                          {
+                            data.addProduct?.link && <Link to={data.addProduct?.link}>查看&nbsp;<RightOutlined /></Link>
+                          }
                         </div>
                       </Col>
                       <Col xxl={12} xl={12} lg={24} md={12} sm={24}  xs={24} className={styles.commodityTotalDesc} >
@@ -52,7 +54,9 @@ const StatisticsColumn = (props) => {
                               <p className={styles.lineDescTip}>{data.toBeProductValify?.name}</p>
                             </div>
                           </div>
-                          <Link to={data.toBeProductValify?.link}>查看&nbsp;<RightOutlined /></Link>
+                          {
+                            data.toBeProductValify?.link && <Link to={data.toBeProductValify?.link}>查看&nbsp;<RightOutlined /></Link>
+                          }
                         </div>
                       </Col>
                     </Row>
@@ -88,7 +92,9 @@ const StatisticsColumn = (props) => {
                               <p className={styles.lineDescTip}>{data.addBrand?.name}</p>
                             </div>
                           </div>
-                          <Link to={data.addBrand?.link}>查看&nbsp;<RightOutlined /></Link>
+                          {
+                            data.addBrand?.link && <Link to={data.addBrand?.link}>查看&nbsp;<RightOutlined /></Link>
+                          }
                         </div>
                       </Col>
                       <Col xxl={12} xl={12} lg={24} md={12} sm={24}  xs={24} className={styles.commodityTotalDesc}>
@@ -100,7 +106,9 @@ const StatisticsColumn = (props) => {
                               <p className={styles.lineDescTip}>{data.toBeBrandValify?.name}</p>
                             </div>
                           </div>
-                          <Link to={data.toBeBrandValify?.link}>查看&nbsp;<RightOutlined /></Link>
+                          {
+                            data.toBeBrandValify?.link && <Link to={data.toBeBrandValify?.link}>查看&nbsp;<RightOutlined /></Link>
+                          }
                         </div>
                       </Col>
                     </Row>

src/pages/platformSettlement/accountPayable/index.tsx

@@ -4,7 +4,7 @@
  * @Description: 应付账款结算
  */
 
-import React, { useRef } from 'react';
+import React, { useRef, useEffect, useState } from 'react';
 import { PageHeaderWrapper } from '@ant-design/pro-layout'
 import { Card, Button, Modal, DatePicker, Tag, Space } from 'antd';
 import NiceForm from '@/components/NiceForm';
@@ -37,6 +37,7 @@ const { RangePicker } = DatePicker;
 const formActions = createFormActions();
 const PLATFORM_PAYER = 4;
 const SettlementList = () => {
+  const [hasBrokerage, setHasBrokerage] = useState(true);
   const ref = useRef<any>({})
   const fetchListData = async (params) => {
     // /settle/accounts/platform/settlement/pagePayableSettlement
@@ -105,6 +106,15 @@ const SettlementList = () => {
     }
   ]
 
+  useEffect(() => {
+    PublicApi.getSettleAccountsPlatformSettlementIsExistsBrokerage()
+    .then(({data, code}) => {
+      if(code === 1000 && !data) {
+        setHasBrokerage(false)
+      }
+    })
+  }, [])
+
    /**
    *
    * @param params 手动结算
@@ -141,6 +151,7 @@ const SettlementList = () => {
     const endTime = values.endTime ? values.endTime.format(format) + " 23:59:59" : "";
     ref.current.reload({...values, startTime, endTime});
   }
+  const frozenColumn = hasBrokerage ? columns : columns.filter((item: any) => item.dataIndex !== 'brokerage')
   return (
     <PageHeaderWrapper>
       <Card>
@@ -148,7 +159,7 @@ const SettlementList = () => {
           tableProps={{
             rowKey: 'id',
           }}
-          columns={columns}
+          columns={frozenColumn}
           currentRef={ref}
           fetchTableData={(params: any) => fetchListData(params)}
           controlRender={