Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

src/components/PageContent/index.js

@@ -1,6 +1,5 @@
 import { UnityAction } from '@/utils/utils';
-import { CloseCircleFilled, LeftOutlined } from '@ant-design/icons';
-import { history } from '@umijs/max';
+import { CloseCircleFilled } from '@ant-design/icons';
 import { ConfigProvider } from 'antd';
 import locale from 'antd/es/locale/zh_CN';
 import { useEffect } from 'react';
@@ -11,16 +10,16 @@ export default (props) => {
     children,
     style,
     closeable = true,
-    returnable = false,
     tabs = false,
+    title = null,
   } = props;
 
   const handleClose = () => {
     UnityAction.sendMsg('closePage');
   };
-  const handleReturn = () => {
-    history.back();
-  };
+  // const handleReturn = () => {
+  //   history.back();
+  // };
 
   useEffect(() => {
     document.body.style.backgroundColor = 'transparent';
@@ -29,13 +28,14 @@ export default (props) => {
   return (
     <ConfigProvider locale={locale}>
       <div className={styles.page} style={style}>
-        {returnable && (
+        {title}
+        {/* {returnable && (
           <LeftOutlined
             onClick={handleReturn}
             className={styles.return}
             style={{ top: tabs ? '0.4rem' : '' }}
           />
-        )}
+        )} */}
         {closeable && (
           <CloseCircleFilled
             onClick={handleClose}
@@ -44,7 +44,7 @@ export default (props) => {
           />
         )}
 
-        {children}
+        <div className={styles.pageContent}>{children}</div>
       </div>
     </ConfigProvider>
   );

src/components/PageContent/index.less

@@ -1,6 +1,6 @@
 .page {
   // background: #fff;
-  padding: 0.2rem 0.5rem;
+  padding: 0.2rem 0;
   // padding-right: 0;
   min-height: 100vh;
   position: relative;
@@ -8,7 +8,7 @@
   .close {
     position: absolute;
     top: 0.175rem;
-    right: 0.2rem;
+    right: 0.5rem;
     font-size: 0.34rem;
     color: #bcbaba;
     cursor: pointer;
@@ -21,4 +21,7 @@
     color: #bcbaba;
     cursor: pointer;
   }
+  .pageContent {
+    padding: 0 0.5rem;
+  }
 }

src/components/PageTitle/index.less

@@ -1,9 +1,9 @@
 .titleBox {
   position: relative;
-  left: -0.2rem;
+  // left: -0.2rem;
   display: flex;
   align-items: center;
-  padding-bottom: 0.2rem;
+  // padding: 0.2rem 0.5rem 0;
   // border-bottom: 1px solid rgba(188, 186, 186, 1);
 }
 .subPage {

src/global.less

@@ -209,17 +209,17 @@ input[type='reset'] {
 .content-tab {
   padding-left: 0.05rem;
   padding-top: 0.05rem;
-  padding-right: 0.05rem;
+  padding-right: 0.25rem;
   height: calc(100vh - 1.3rem);
   overflow-x: hidden;
   overflow-y: auto;
 }
 .content-title {
-  padding-left: 0.05rem;
-  padding-right: 0.5rem;
-  height: calc(100vh - 1.15rem);
-  overflow-x: hidden;
-  overflow-y: auto;
+  // padding-left: 0.05rem;
+  // padding-right: 0.5rem;
+  // height: calc(100vh - 1.15rem);
+  // overflow-x: hidden;
+  // overflow-y: auto;
 }
 
 .password-eye {

src/pages/Center/MyTask/index.js

@@ -3,10 +3,17 @@ import TabsContent from '@/components/TabsContent';
 import { MandateType, OrderType } from '@/pages/TaskManage/constent';
 import { getMandateList } from '@/services/TaskManage';
 import { CaretRightFilled } from '@ant-design/icons';
-import { connect, useLocation, useNavigate, useParams } from '@umijs/max';
+import {
+  connect,
+  history,
+  useLocation,
+  useNavigate,
+  useParams,
+} from '@umijs/max';
 import { List, Spin } from 'antd';
 import { useEffect, useState } from 'react';
 import styles from './index.less';
+import PageTitle from '@/components/PageTitle';
 
 const MyTask = (props) => {
   const { userList, dispatch } = props;
@@ -124,7 +131,8 @@ const MyTask = (props) => {
   };
 
   return (
-    <PageContent tabs closeable={false} returnable>
+    <PageContent closeable={false}>
+      <PageTitle tabs onReturn={() => history.back()}></PageTitle>
       <TabsContent
         defaultActiveKey={tab}
         onChange={onTabChange}