Merge remote-tracking branch 'origin/caoyun'

components/layout/index.tsx

@@ -6,6 +6,8 @@ import {useRouter} from 'next/router'
 import styles from './index.module.scss';
 
 const { Header, Footer, Content } = Layout;
+//底部栏固定定位
+const includesPage = ["/home","/flyingHandService/detail/[id]"]
 
 const homeStyle: React.CSSProperties = {
   position:'fixed',
@@ -61,13 +63,7 @@ export default function LayoutView(props: Props) {
         </Header>
         <Content className={styles.content}>{props.children}</Content>
         {!props.hideFooter && (
-          <Footer
-            style={
-              router.pathname.includes("home")
-                ? { ...footerStyle, ...homeStyle }
-                : footerStyle
-            }
-          >
+          <Footer style={ includesPage.includes(router.pathname) ? {...footerStyle,...homeStyle} : footerStyle}>
             <FooterView></FooterView>
           </Footer>
         )}

pages/equipmentLeasing/index.page.tsx

@@ -129,6 +129,13 @@ export default function EquipmentLeasing(props: Props) {
   useEffect(() => {
     if (router.query) {
       setFilterResult({ ...router.query });
+      console.log(router.query,{brandId:1});
+      onFilterChange({
+        categoryId: {
+            id: 2,
+            name: "类目：航测"
+        }
+      },{categoryId:2});
     }
   }, [router]);
   return (

pages/flyingHandService/detail/styled.tsx

@@ -11,7 +11,6 @@ export const Box = styled.div`
     justify-content: space-between;
     align-items: center;
     .left {
-      width: 190px;
       height: 25px;
       font-size: 20px;
       font-family: MicrosoftYaHeiUI-Bold, MicrosoftYaHeiUI;

pages/flyingHandService/index.page.tsx

@@ -17,8 +17,8 @@ export default function FlyingHandService() {
   const {Option} = Select
   const router = useRouter();
   const [list, setList] = useState([
-    "https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/925072db-5872-44dd-8b71-e408ad3adf41.jpg",
-    "https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/12d624b0-1250-44a6-9a3f-9025725a2adc.jpg",
+    "https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/540X844-1(1).jpg",
+    "https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/540X844(1).jpg",
   ]);
   const [productList, setProductList] = useState(
     Array<{ element: JSX.Element }>
@@ -32,8 +32,9 @@ export default function FlyingHandService() {
   const [skills, setSkills] = useState(
     Array<RegionResp>
   );
+  const [skillsDefault, setSkillsDefault] = useState<Array<number>>();
   const [flightSkillsList, setFlightSkillsList] = useState(Array<SkillsType>);
-
+  const [flightDefault, setFlightDefault] = useState<number | null>();
   const leftDom = (item: Flying) => {
     return (
       <div
@@ -113,6 +114,8 @@ export default function FlyingHandService() {
 
   //端口列表请求
   useEffect(() => {
+    console.log(router);
+    
     let queryVal = JSON.parse(JSON.stringify(router.query));
     for (const key in queryVal) {
       queryVal[key] = Number(queryVal[key]);
@@ -133,25 +136,26 @@ export default function FlyingHandService() {
       });
   }, [abort]);
 
-  const onProvinceChange = (value: string, type: string) => {
-    if (type === "考证") {
+  const onProvinceChange = (value: number) => {
+    if (value) {
+      setFlightDefault(value)
+    }else{
+      setFlightDefault(null)
+    }
       setFilterParams((props) => {
         return {
           ...props,
           licenseId: Number(value),
         };
       });
-    } else {
-      setFilterParams((props) => {
-        return {
-          ...props,
-          flightSkillsId: Number(value),
-        };
-      });
-    }
   };
 
   const onChange = (value: any) => {
+    if (value) {
+      setSkillsDefault([value])
+    }else{
+      setSkillsDefault([])
+    }
     setFilterParams((props) => {
       return {
         ...props,
@@ -199,6 +203,11 @@ export default function FlyingHandService() {
       for (const key in queryVal) {
         queryVal[key] = Number(queryVal[key]);
       }
+      if (queryVal.flightSkillsId) {
+        setSkillsDefault([queryVal.flightSkillsId])
+      }else{
+        setFlightDefault(queryVal.licenseId)
+      }
       setFilterParams((props) => {
         return {
           ...props,
@@ -284,29 +293,21 @@ export default function FlyingHandService() {
                   children: "childLicenses",
                 }}
                 options={skills}
-                onChange={onChange}
+                onChange={(value)=>onChange(value)}
                 changeOnSelect
+                value={skillsDefault}
               />
-              {/* <Select
-                className="selectItem"
-                bordered={false}
-                popupMatchSelectWidth={false}
-                placeholder="考证"
-                size="large"
-                onChange={(value) => onProvinceChange(value, "考证")}
-                options={skills}
-                allowClear
-              /> */}
               <Select
                 className="selectItem"
                 bordered={false}
                 popupMatchSelectWidth={false}
                 placeholder="技能"
                 size="large"
-                onChange={(value) => onProvinceChange(value, "技能")}
+                onChange={(value) => onProvinceChange(value)}
                 options={flightSkillsList}
                 fieldNames={{ value: "id", label: "skillsName" }}
                 allowClear
+                value={flightDefault}
               />
             </Space>
           </div>

pages/home/waterfallFlowBody/components/rotationChart/index.tsx

@@ -5,11 +5,11 @@ import Image from "next/image";
 
 export default function RotationChart() {
   const list = [
-    "https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/pc%E7%AB%AF%E8%BD%AE%E6%92%AD%E5%9B%BE1.png",
-    "https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/ebf4fd5d-f8da-45b7-b0b3-282a31e43929.png",
-    "https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/6b62ee5b-d929-4dee-b441-258c81c14403.png",
-    "https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/0dd9e0f6-c1cd-485a-bdf4-8aeb84b1c67a.png",
-    "https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/bcdabab5-f2f8-4c6d-85c6-4d304d8bfe4c.png",
+    "https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/1(1).jpg",
+    "https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/2(1).jpg",
+    "https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/3(1).jpg",
+    "https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/4(1).jpg",
+    "https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/5(1).jpg"
   ];
   return (
     <Box>

pages/home/waterfallFlowBody/index.tsx

@@ -294,7 +294,7 @@ export default function WaterfallFlowBody() {
     option: []
   ) => {
     return (
-      <div key={item.title} className={`item ${index>=3?'right-box':''}`}>
+      <div key={item.title} className="item" style={{ marginRight: index >= 3 ? 0 : 10 }}>
         <div className="item-title">
           <div className="item-left">
             <div className="item-left-label" onClick={() => routerPath(index)}>

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

@@ -76,8 +76,8 @@ export default function JobServicesDetail() {
               </div>
               <div className='right-bottom'>
                 <div className='bottom-btn'>
-                  <Button className='btn-left' size='small' type="primary">马上预约</Button>
-                  <Button className='btn-right' size='small' type="primary">电话沟通</Button>
+                  <Button className='btn-left' size='small' type="primary">电话沟通</Button>
+                  <Button className='btn-right' size='small' type="primary">立即预约</Button>
                 </div>
               </div>
           </div>

pages/jobServices/index.page.tsx

@@ -19,7 +19,7 @@ interface ImageListType {}
 export default function JobServices() {
   const router = useRouter();
   const [list, setList] = useState([
-    "https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/90a52d3e-1ffa-4347-886e-a1c4535cf8b3.jpg",
+    "https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/540X844-2(1).jpg",
     // "https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/665512fd-12e6-49a9-93c1-f9dcd0e82083.jpg",
   ]);
   const [productList, setProductList] = useState(