Merge branch 'master' into feature/chuck

components/NavHeader/index.tsx

@@ -109,6 +109,7 @@ export default function NavHeader() {
           activeKey={currentPath}
           items={items}
           onChange={onChange}
+          onTabClick={onChange}
         />
         <Space size={16} className={styles.btns}>
           <Button type="primary" className={styles.btn1} onClick={onPublish}>

components/contentBox/left/styled.tsx

@@ -47,11 +47,11 @@ export const WaterfallBox = styled.div<BoxProps>`
 			// 同时设置下边距margin-bottom（每个元素的上下间隙）
 			/* margin: 0 24px 15px 0; */
 			margin: ${props => props.leftcontentstyle?.margin ? (`${props.leftcontentstyle?.margin.top} ${props.leftcontentstyle?.margin.right} ${props.leftcontentstyle?.margin.bottom} ${props.leftcontentstyle?.margin.left}`)  : "0 24px 15px 0"};;
-			width: calc(( 100% - ${props => props.index} * ${props => props.leftcontentstyle?.margin ? props.leftcontentstyle?.margin.right : "24px" }) / ${props => props.index});   
+			/* width: calc(( 100% - ${props => props.index} * ${props => props.leftcontentstyle?.margin ? props.leftcontentstyle?.margin.right : "24px" }) / ${props => props.index});   
 			// 这里一行显示index个，所以是/index，一行显示几个就除以几 
 			// 这里的72px = (分布个数index-1)*间隙20px, 可以根据实际的分布个数和间隙区调整
 			min-width: calc(( 100% - ${props => props.index} * ${props => props.leftcontentstyle?.margin ? props.leftcontentstyle?.margin.right : "24px" }) / ${props => props.index});
-			max-width: calc(( 100% - ${props => props.index} * ${props => props.leftcontentstyle?.margin ? props.leftcontentstyle?.margin.right : "24px" }) / ${props => props.index});
+			max-width: calc(( 100% - ${props => props.index} * ${props => props.leftcontentstyle?.margin ? props.leftcontentstyle?.margin.right : "24px" }) / ${props => props.index}); */
 	}
 	.left-columns{
 

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

-import React, { useContext, useEffect , useState  } from 'react'
+import React, { useEffect , useState , useContext } from 'react'
 import {useRouter} from 'next/router';
 import Layout from "~/components/layout";
 import {Box} from './styled';
@@ -7,15 +7,13 @@ import { Button , Image as AImage , Divider , Select,Modal ,Tag,Space,Form,messa
 import Image from 'next/image';
 import errImg from "~/assets/errImg";
 import api,{GetWebDeviceDetailResult,GetWebDeviceWareSkuById} from './api';
-import LoginModal from "~/components/loginModal";
-import { UserContext } from '~/lib/userProvider';
+import { UserContext } from "~/lib/userProvider";
 
 const { CheckableTag } = Tag
 
 export default function EquipmentLeasingDetail() {
   const router = useRouter();
-  const { userInfo } = useContext(UserContext);
-  const [openLoginModal, setOpenLoginModal] = useState(false); //登录modal
+  const { userInfo, setNeedLogin } = useContext(UserContext);
   const [id, setId] = useState<number | null>(null);
   
   const [detail,setDetail] = useState<GetWebDeviceDetailResult | null>()
@@ -56,7 +54,7 @@ export default function EquipmentLeasingDetail() {
   const [selectedTagsData, setSelectedTagsData] = useState<string>();
 
   const showModal = () => {
-    if (userInfo?.id) {
+    if (userInfo) {
       setIsModalOpen(true);
       if (wareSkuList?.length) {
         setSelectedTags(wareSkuList[0].id);
@@ -65,7 +63,7 @@ export default function EquipmentLeasingDetail() {
         form.setFieldValue("date","3-7天")
       }
     }else{
-      setOpenLoginModal(true)
+      setNeedLogin(true)
     }
   };
 
@@ -253,10 +251,6 @@ export default function EquipmentLeasingDetail() {
       </Form.Item>
       </Form>
       </Modal>
-      <LoginModal
-        open={openLoginModal}
-        onCancel={() => setOpenLoginModal(false)}
-      ></LoginModal>
       </Box>
     </Layout>
   )

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

@@ -23,7 +23,7 @@ export default function FlyingDetail() {
         <div className="box-top">
           <div className="left">{detail?.curriculumName}</div>
           <div className="right">
-            <Button
+            {/* <Button
               type="primary"
               className="btn"
               onClick={() =>
@@ -31,7 +31,7 @@ export default function FlyingDetail() {
               }
             >
               去考试
-            </Button>
+            </Button> */}
           </div>
         </div>
         <div className="box-body">

pages/flyingHandService/detail/styled.tsx

@@ -10,6 +10,7 @@ export const Box = styled.div`
     display: flex;
     justify-content: space-between;
     align-items: center;
+    padding: 10px 0;
     .left {
       height: 25px;
       font-size: 20px;

pages/flyingHandService/index.page.tsx

-import React, { useContext, useEffect, useState } from "react";
+import React, { useEffect, useState , useContext} from "react";
 import { Box } from "./styled";
 import Image from "next/image";
 import { Button, Select, Space, Pagination, Cascader, Modal , Form ,Input,Checkbox, message} from "antd";
@@ -7,7 +7,6 @@ import Layout from "~/components/layout";
 import ContentBox from "~/components/contentBox";
 import api, { Flying, SkillsType, RegionResp } from "./api";
 import { useRouter } from "next/router";
-import LoginModal from "~/components/loginModal";
 import { UserContext } from "~/lib/userProvider";
 interface FilterInfoParams {
   regionId?: number;
@@ -18,8 +17,7 @@ interface FilterInfoParams {
 export default function FlyingHandService() {
   const {Option} = Select
   const router = useRouter();
-  const {userInfo} = useContext(UserContext);
-  const [openLoginModal, setOpenLoginModal] = useState(false); //登录modal
+  const { userInfo, setNeedLogin } = useContext(UserContext);
   const [list, setList] = useState([
     "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",
@@ -328,7 +326,7 @@ export default function FlyingHandService() {
           <Button
             type="primary"
             className="btn"
-            onClick={() => userInfo?.id ? setIsModalOpen(true) : setOpenLoginModal(true)}
+            onClick={() => userInfo ? setIsModalOpen(true) : setNeedLogin(true)}
           >
             报名学习课程
           </Button>
@@ -447,10 +445,6 @@ export default function FlyingHandService() {
           }}
           rightRenderDom={{ columns: rightDomList }}
         />
-      <LoginModal
-        open={openLoginModal}
-        onCancel={() => setOpenLoginModal(false)}
-      ></LoginModal>
       </Box>
     </Layout>
   );

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

@@ -114,7 +114,6 @@ export default function MapComponent() {
     }
   }
   const showUavBitmap = async (index:number,data?:UserInfoType) => {
-    console.log(MAP.panTo);
     const res = await api.listUavBitmap({
       lon: userPositioning?.lon || data?.lon ||  113.93029,
       lat: userPositioning?.lat || data?.lat ||  22.53291,

pages/home/waterfallFlowBody/components/map/moreServicePoints/index.page.tsx

@@ -127,7 +127,6 @@ export default function MoreServicePoints() {
     }
   };
   const showUavBitmap = async (index: number, data?: UserInfoType) => {
-    console.log(MAP.panTo);
     const res = await api.listUavBitmap({
       lon: userPositioning?.lon || data?.lon || 113.93029,
       lat: userPositioning?.lat || data?.lat || 22.53291,

pages/home/waterfallFlowBody/index.tsx

-import React, { useContext, useEffect, useState } from "react";
+import React, { useEffect, useState , useContext } from "react";
 import { Space, Select, Button, message } from "antd";
 import Image from "next/image";
 import { useRouter } from "next/router";
@@ -23,8 +23,8 @@ import {
   listNewsApi,
 } from "./api";
 import { BaseOptionType, DefaultOptionType } from "antd/es/select";
-import LoginModal from "~/components/loginModal";
 import { UserContext } from "~/lib/userProvider";
+
 interface ColumnsType {
   title: string;
   router: string;
@@ -32,8 +32,8 @@ interface ColumnsType {
 
 export default function WaterfallFlowBody() {
   const router = useRouter();
-  const {userInfo} = useContext(UserContext);   //获取信息
-  const [openLoginModal, setOpenLoginModal] = useState(false); //登录modal
+  const { userInfo, setNeedLogin } = useContext(UserContext);
+
   const [list, setList] = useState([
     "中国人寿",
     "中国平安",
@@ -270,11 +270,11 @@ export default function WaterfallFlowBody() {
 
   const handleTenderApply = async (item:NewsTenderType)=>{
     if (item.apply) return;
-    if (userInfo?.id) {
+    if (userInfo) {
       let res = await listNewsApi.tenderApply({
         tenderInfoId: item.id,
          tenderNewsId: item.tenderNewsId,
-         userAccountId: userInfo?.id,
+         userAccountId: userInfo.id,
           })
       try{
         if (res.code==="200") {
@@ -291,7 +291,7 @@ export default function WaterfallFlowBody() {
         console.log(e);
       }
     }else{
-      setOpenLoginModal(true)
+      setNeedLogin(true)
     }
   }
 
@@ -302,7 +302,7 @@ export default function WaterfallFlowBody() {
     option: []
   ) => {
     return (
-      <div key={item.title} className="item" style={{ marginRight: index >= 3 ? 0 : 10 }}>
+      <div key={item.title} className="item">
         <div className="item-title">
           <div className="item-left">
             <div className="item-left-label" onClick={() => routerPath(index)}>
@@ -379,7 +379,7 @@ export default function WaterfallFlowBody() {
             className="title-label"
             onClick={() => router.push("/projectInfo")}
           >
-            行业新闻 &gt;
+            行业新闻
           </div>
         </div>
         <div className="body">
@@ -412,7 +412,7 @@ export default function WaterfallFlowBody() {
               className="title-label"
               onClick={() => router.push("/projectInfo")}
             >
-              招标快讯 &gt;
+              招标快讯
             </div>
           </div>
           <div className="body">
@@ -459,10 +459,7 @@ export default function WaterfallFlowBody() {
           ],
         }}
       />
-      <LoginModal
-        open={openLoginModal}
-        onCancel={() => setOpenLoginModal(false)}
-      ></LoginModal>
+
     </Box>
   );
 }

pages/home/waterfallFlowBody/styled.tsx

@@ -14,6 +14,7 @@ export const Box = styled.div`
   .item {
     transition: all 0.5s;
     border-radius: 6px; 
+    width: 398px;
     &-title {
       display: flex;
       justify-content: space-between;

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

@@ -31,7 +31,7 @@ export default function JobServicesDetail() {
     {
       key: '2',
       label: `团队评价`,
-      children: <Evaluate evaluateInfo={detail?.evaluateInfo!}/>,
+      children: <Evaluate evaluateInfo={detail?.evaluateInfo || []}/>,
     },
   ];
   

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

@@ -35,7 +35,6 @@ const name = [
 "呆到深处自然萌",
 "各不打扰",
 "无声飞雪",
-"我一生下来就是个无齿的人",
 "浅笑小倔强",
 "乱了夏末蓝了海",
 "初夏知鸣"]