Merge branch 'master' of http://git.51jingcheng.com/Joe/xie_fang_tong_admin

src/access.ts

@@ -6,6 +6,7 @@ export default function access(initialState: { currentUser?: API.PbcUsersVO | un
   if (currentUser?.currentAuthority) {
     const params: any = {
       dashboard: false,
+      dashboardUser: currentUser.pbcUserMobile !== '13052023298',
       dashboardQuery: false,
       operations: false,
       operationsQuery: false,

src/pages/AuditsList/detail.tsx

@@ -129,6 +129,7 @@ const Detail: React.FC<any> = () => {
           destroyOnClose: true,
           onCancel: () => setIsModalOpen(false),
         }}
+        requiredMark={false}
         width={500}
         onFinish={async (value: any) => {
           console.log(value);

src/pages/BusinessList/add.tsx

@@ -74,7 +74,7 @@ const Detail: React.FC<any> = () => {
         </Button>
       ]}
     >
-      <ProForm layout="horizontal" labelAlign="left" formRef={formRef} onFinish={onSubmit} submitter={false}>
+      <ProForm layout="horizontal" labelAlign="left" requiredMark={false} formRef={formRef} onFinish={onSubmit} submitter={false}>
         <ProCard title="基本信息" style={{ marginBottom: 12 }}>
           <Row gutter={20}>
             <Col span={8}>

src/pages/ContentList/components/UpdateForm.tsx

@@ -23,6 +23,7 @@ const UpdateForm: React.FC<UpdateFormProps> = (props) => {
   return (
     <DrawerForm
       width={800}
+      requiredMark={false}
       title={props.values.pbcId ? '编辑' : '新增'}
       open={props.updateModalVisible}
       formRef={formRef}

src/pages/Dashboard/index.tsx

@@ -4,7 +4,7 @@ import dayjs from 'dayjs';
 import { PageContainer, ProCard, ProForm, ProFormDateRangePicker, ProFormGroup, ProFormInstance, ProFormRadio } from '@ant-design/pro-components';
 import { Button, Card, Col, message, Row, Spin, Statistic } from 'antd';
 import React, { useEffect, useRef, useState } from 'react';
-import { history, Link } from '@umijs/max';
+import { Access, history, useAccess } from '@umijs/max';
 import Constants from '@/constants';
 import { disabledDate } from '@/utils/utils';
 
@@ -32,7 +32,7 @@ const handleExport = async (values?: API.PbcDashBoardDTO) => {
 };
 
 const Welcome: React.FC = () => {
-
+  const access: any = useAccess();
   const ref = useRef<ProFormInstance<API.PbcDashBoardDTO>>();
   const [loading, handleLoadChange] = useState<boolean>(false);
   const [data1, setData1] = useState<any[]>([]);
@@ -247,25 +247,29 @@ const Welcome: React.FC = () => {
           <Col span={8}>
             <Card title="注册情况" bodyStyle={{ display: 'flex', justifyContent: 'space-between' }} bordered={false}>
               <Statistic title="商家数" valueStyle={{ color: '#3f8600', fontSize: 30 }} value={pbcRegisterStatical.businessNumber || 0} />
-              <Statistic title="会员数" valueStyle={{ color: '#3f8600', fontSize: 30 }} value={pbcRegisterStatical.vipNumber || 0} />
+              <Access accessible={access.dashboardUser}>
+                <Statistic title="会员数" valueStyle={{ color: '#3f8600', fontSize: 30 }} value={pbcRegisterStatical.vipNumber || 0} />
+              </Access>
             </Card>
           </Col>
           <Col span={8}>
-            <Card title="扫码情况" bodyStyle={{ display: 'flex', justifyContent: 'space-between' }} bordered={false}>
+            <Card title="扫码情况" bodyStyle={{ display: 'flex', alignItems: 'center', justifyContent: 'space-between' }} bordered={false}>
               <Statistic title="扫码次数" valueStyle={{ color: '#3f8600', fontSize: 30 }} value={pbcScanCodeStatical.pbcScanNumber || 0} />
               <Statistic title="扫码人数" valueStyle={{ color: '#3f8600', fontSize: 30 }} value={pbcScanCodeStatical.pbcScanUserNumber || 0} />
-              <Button type='link' onClick={() => {
+              <Access accessible={access.dashboardUser}>
-                const param: any = ref.current?.getFieldsValue()
+                <Button type='link' onClick={() => {
-                let startDate = param.pbcQueryType == 1 ? dayjs().format('YYYY-MM-DD') : dayjs().date(1).format('YYYY-MM-DD')
+                  const param: any = ref.current?.getFieldsValue()
-                let endDate = dayjs().format('YYYY-MM-DD')
+                  let startDate = param.pbcQueryType === 1 ? dayjs().format('YYYY-MM-DD') : dayjs().date(1).format('YYYY-MM-DD')
-                if (param.dateRange) {
+                  let endDate = dayjs().format('YYYY-MM-DD')
-                  startDate = dayjs(param.dateRange[0]).format('YYYY-MM-DD')
+                  if (param.dateRange) {
-                  endDate = dayjs(param.dateRange[1]).format('YYYY-MM-DD')
+                    startDate = dayjs(param.dateRange[0]).format('YYYY-MM-DD')
-                }
+                    endDate = dayjs(param.dateRange[1]).format('YYYY-MM-DD')
-                history.push(`/dashboard/scan-detail?startDate=${startDate}&endDate=${endDate}`)
+                  }
-              }}>
+                  history.push(`/dashboard/scan-detail?startDate=${startDate}&endDate=${endDate}`)
-                <Statistic title="老客扫码/新客扫码>" valueStyle={{ color: '#3f8600', fontSize: 30 }} value={`${pbcScanCodeStatical.oldCustomerScanCount || 0}/${pbcScanCodeStatical.newCustomerScanCount || 0}`} />
+                }}>
-              </Button>
+                  <Statistic title="老客扫码/新客扫码>" valueStyle={{ color: '#3f8600', fontSize: 30 }} value={`${pbcScanCodeStatical.oldCustomerScanCount || 0}/${pbcScanCodeStatical.newCustomerScanCount || 0}`} />
+                </Button>
+              </Access>
             </Card>
           </Col>
           <Col span={8}>
@@ -281,7 +285,7 @@ const Welcome: React.FC = () => {
             <Card title="商户浏览量排行" extra={
               <Button type="link" onClick={() => {
                 const param: any = ref.current?.getFieldsValue()
-                let startDate = param.pbcQueryType == 1 ? dayjs().format('YYYY-MM-DD') : dayjs().date(1).format('YYYY-MM-DD')
+                let startDate = param.pbcQueryType === 1 ? dayjs().format('YYYY-MM-DD') : dayjs().date(1).format('YYYY-MM-DD')
                 let endDate = dayjs().format('YYYY-MM-DD')
                 if (param.dateRange) {
                   startDate = dayjs(param.dateRange[0]).format('YYYY-MM-DD')
@@ -323,7 +327,7 @@ const Welcome: React.FC = () => {
                     }
                   }
                   const param: any = ref.current?.getFieldsValue()
-                  let startDate = param.pbcQueryType == 1 ? dayjs().format('YYYY-MM-DD') : dayjs().date(1).format('YYYY-MM-DD')
+                  let startDate = param.pbcQueryType === 1 ? dayjs().format('YYYY-MM-DD') : dayjs().date(1).format('YYYY-MM-DD')
                   let endDate = dayjs().format('YYYY-MM-DD')
                   if (param.dateRange) {
                     startDate = dayjs(param.dateRange[0]).format('YYYY-MM-DD')

src/pages/MemberList/components/UpdateForm.tsx

@@ -22,6 +22,7 @@ const UpdateForm: React.FC<UpdateFormProps> = (props) => {
   return (
     <DrawerForm
       width={640}
+      requiredMark={false}
       title={props.values.pbcId ? '编辑' : '新增'}
       open={props.updateModalVisible}
       formRef={formRef}

src/pages/ProductList/add.tsx

@@ -138,7 +138,7 @@ const Detail: React.FC<any> = () => {
         </Button>
       ]}
     >
-      <ProForm layout="horizontal" labelAlign="left" formRef={formRef} onFinish={onSubmit} submitter={false}>
+      <ProForm layout="horizontal" labelAlign="left" requiredMark={false} formRef={formRef} onFinish={onSubmit} submitter={false}>
         <ProFormText name="pbcProductTopCategoryName" hidden />
         <ProFormText name="pbcProductParentCategoryName" hidden />
         <ProFormText name="pbcProductCategoryName" hidden />

src/pages/ProductList/components/UpdateForm.tsx

@@ -57,6 +57,7 @@ const UpdateForm: React.FC<UpdateFormProps> = (props) => {
   return (
     <DrawerForm
       width={640}
+      requiredMark={false}
       title={props.values.pbcId ? '编辑' : '新增'}
       open={props.updateModalVisible}
       formRef={formRef}

src/pages/ProductList/index.tsx

@@ -9,6 +9,7 @@ import { ActionType, ProColumns, ProTable } from '@ant-design/pro-components';
 import { PageContainer } from '@ant-design/pro-layout';
 import { Access, Link, useAccess, history } from '@umijs/max';
 import { Button, message } from 'antd';
+import moment from 'moment';
 import React, { useRef } from 'react';
 
 /**
@@ -96,6 +97,15 @@ const TableList: React.FC<{}> = () => {
         return [];
       },
     },
+    {
+      title: '创建时间',
+      dataIndex: 'pbcCreateAt',
+      hideInTable: true,
+      fieldProps:{
+        maxDate: moment()
+      },
+      valueType: 'dateRange'
+    },
     {
       title: '状态',
       dataIndex: 'pbcState',
@@ -163,7 +173,12 @@ const TableList: React.FC<{}> = () => {
         columns={columns}
         actionRef={actionRef}
         request={(param: any) => {
-          return fetchData(param);
+          const queryParam = {
+            ...param,
+            startDate: param.pbcCreateAt && param.pbcCreateAt.length > 1 ? param.pbcCreateAt[0] : undefined,
+            endDate: param.pbcCreateAt && param.pbcCreateAt.length > 1 ? param.pbcCreateAt[1] + ' 23:59:59' : undefined
+          }
+          return fetchData(queryParam);
         }}
         rowKey="pbcId"
         size="small"

src/pages/UserList/components/UpdateForm.tsx

@@ -30,6 +30,7 @@ const UpdateForm: React.FC<UpdateFormProps> = (props) => {
   return (
     <DrawerForm
       width={640}
+      requiredMark={false}
       title={props.values.pbcId ? '编辑' : '新增'}
       open={props.updateModalVisible}
       formRef={formRef}

src/services/pop-b2b2c/pbcProductController.ts

@@ -92,6 +92,21 @@ export async function deleteProductUsingGet(
   });
 }
 
+/** 首页的热销商品列表 首页的热销商品列表 POST /b2b2c/pbcproduct/getHotProductListForIndex */
+export async function getHotProductListForIndexUsingPost(
+  body: API.PbcBusinessIndexDTO,
+  options?: { [key: string]: any },
+) {
+  return request<API.AjaxResultPbcBusiness_>('/b2b2c/pbcproduct/getHotProductListForIndex', {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    data: body,
+    ...(options || {}),
+  });
+}
+
 /** 扫码后通过商品id和用户id获取商品信息和商户信息，暂时预留，不需要调用 卖家端或者买家端, 暂时预留，不需要调用 GET /b2b2c/pbcproduct/getProductByQrCode/${param0} */
 export async function getProductByQrCodeUsingGet(
   // 叠加生成的Param类型 (非body参数swagger默认没有生成对象)

src/services/pop-b2b2c/typings.d.ts

@@ -1927,6 +1927,8 @@ declare namespace API {
   type PbcProductPageDTO = {
     /** 当前页 */
     current?: number;
+    /** 结束日期 */
+    endDate?: string;
     /** 该字段用于过滤业务员私密商品,前端不要传值 */
     filterBusinessUserId?: number;
     /** 条数 */
@@ -1963,6 +1965,8 @@ declare namespace API {
     sort?: string;
     /** 排序列，用表字段名称 */
     sortField?: string;
+    /** 开始日期 */
+    startDate?: string;
   };
 
   type PbcProductPosterVO = {