Merge remote-tracking branch 'origin/caoyun'

components/layout/index.tsx

@@ -2,9 +2,16 @@ import React, { Suspense } from "react";
 import { Layout, Space } from "antd";
 import NavHeader from "~/components/NavHeader";
 import FooterView from "~/components/footer";
+import {useRouter} from 'next/router'
 
 const { Header, Footer, Content } = Layout;
 
+const homeStyle: React.CSSProperties = {
+  position:'fixed',
+  width:'100%',
+  bottom:'0'
+}
+
 const headerStyle: React.CSSProperties = {
   height: "auto",
   background: "none",
@@ -24,14 +31,12 @@ const contentStyle: React.CSSProperties = {
 };
 
 const footerStyle: React.CSSProperties = {
-  width:"100%",
   color: "",
   backgroundColor: "",
   lineHeight: "1",
   padding: 0,
-  position: "fixed",
-  bottom:0,
-  // marginTop: 60,
+  position: "relative",
+  marginTop: 60,
 };
 
 type Props = {
@@ -41,6 +46,7 @@ type Props = {
 };
 
 export default function LayoutView(props: Props) {
+  const router = useRouter()
   return (
     <Space direction="vertical" style={{ width: "100%" }} size={[0, 48]}>
       <Layout
@@ -54,7 +60,7 @@ export default function LayoutView(props: Props) {
         </Header>
         <Content style={contentStyle}>{props.children}</Content>
         {!props.hideFooter && (
-          <Footer style={footerStyle}>
+          <Footer style={router.pathname.includes("home") ? {...footerStyle,...homeStyle} : footerStyle}>
             <FooterView></FooterView>
           </Footer>
         )}

pages/jobServices/detail/[id].page.tsx

@@ -23,7 +23,10 @@ export default function JobServicesDetail() {
     {
       key: '1',
       label: `团队介绍`,
-      children: <Image width={1100} height={800} src={detail?.teamPoster ? detail?.teamPoster : ''} alt='error'/>,
+      children: <div>
+        {/* <Image width={1100} height={800} src={detail?.teamPoster ? detail?.teamPoster : ''} alt='error'/> */}
+        <img src={detail?.teamPoster ? detail?.teamPoster : ''} alt="error" />
+      </div>,
     },
     {
       key: '2',

pages/jobServices/detail/components/evaluate/styled.tsx

@@ -7,7 +7,7 @@ export default function Style() {
 export const Box = styled.div`
     box-sizing: border-box;
     overflow-y: auto;
-    height: 900px;
+    height: 800px;
     .item{
         height: 180px;
         &-user{

pages/jobServices/detail/styled.tsx

@@ -104,7 +104,7 @@ export const Box = styled.div`
         }
     }
     .tabs{
-        padding: 0 60px;
+        padding: 0 24px;
         margin-top: 69px;
     }
 `
\ No newline at end of file

pages/jobServices/index.page.tsx

@@ -167,7 +167,6 @@ export default function JobServices() {
                     total={count}
                     onChange={onPageChange}
                     hideOnSinglePage={true}
-                    style={{ marginTop: 20 }}
                   />
                 </div>
               ),