Skip to content

W
web
提交 7548c3b7 作者: 曹云
操作

Merge branch 'master' of ssh://git.mmcuav.cn:8222/root/sharefly-web-nextjs into caoyun

上级 4788df10 d09e1f1f
正在显示 包含 376 行增加 和 380 行删除
components/filter/index.tsx
......@@ -36,7 +36,7 @@ export default function Filter(props: Props) {
useEffect(() => {
props.onChange(result);
}, [result]);
}, [result, props]);
const onDel = (key: string) => {
//@ts-ignore
delete result[key];
......
components/footer/index.tsx
import styles from './index.module.scss';
import Image from 'next/image';
const qrcodeList = [
{
......@@ -28,7 +29,7 @@ export default function Footer() {
qrcodeList.map((item, i) => {
return (
<div className={styles.qrcodeItem} key={i}>
<img className={styles.qrcodeImg} src={item.img}></img>
<Image alt="" className={styles.qrcodeImg} src={item.img}></Image>
<div className={styles.qrcodeTitle}>{item.title}</div>
</div>
);
......
next.config.js
/** @type {import('next').NextConfig} */
const nextConfig = {
reactStrictMode: true,
transpilePackages: ['antd'],
transpilePackages: ["antd"],
redirects() {
return [
{
......@@ -11,6 +11,7 @@ const nextConfig = {
},
];
},
pageExtensions: ["page.tsx", "page.ts", "page.jsx", "page.js"],
};
module.exports = nextConfig;
pages/equipmentLeasing/styled.tsx
import styled from "styled-components"
export default function Style(){ return <></>}
export const Box = styled.div`
box-sizing: border-box;
padding-top: 15px;
......
pages/flyingHandService/styled.tsx
import styled from "styled-components"
import styled from "styled-components";
export default function Style() {
return <></>;
}
export const Box = styled.div`
box-sizing: border-box;
width: 1200px;
.flyingTop{
display: flex;
justify-content: space-between;
align-items: center;
padding: 15px 0;
width: 925px;
&-left{
.selectItem{
width: 120px;
background-color: #fff;
border-radius: 5px;
}
}
.btn {
width: 220px;
height: 60px;
background: linear-gradient(90deg, #278eff 0%, #0052da 100%);
border-radius: 6px;
border: 0;
font-size: 16px;
font-family: MicrosoftYaHeiUI-Bold, MicrosoftYaHeiUI;
font-weight: bold;
color: #ffffff;
&:hover {
opacity: 0.8;
}
}
box-sizing: border-box;
width: 1200px;
.flyingTop {
display: flex;
justify-content: space-between;
align-items: center;
padding: 15px 0;
width: 925px;
&-left {
.selectItem {
width: 120px;
background-color: #fff;
border-radius: 5px;
}
}
.item{
.btn {
width: 220px;
height: 320px;
cursor: pointer;
transition: all .5s;
background-color: #fff;
height: 60px;
background: linear-gradient(90deg, #278eff 0%, #0052da 100%);
border-radius: 6px;
&-top{
width: 220px;
height: 160px;
background-color: #E6E6E6;
border-radius: 6px 6px 0px 0px;
border: 0;
font-size: 16px;
font-family: MicrosoftYaHeiUI-Bold, MicrosoftYaHeiUI;
font-weight: bold;
color: #ffffff;
&:hover {
opacity: 0.8;
}
&-bottom{
height: 160px;
padding: 9px 12px 20px;
border-radius: 0px 0px 6px 6px;
background-color: #fff;
.bottom-title{
width: 196px;
height: 44px;
font-size: 15px;
font-family: MicrosoftYaHeiUI-Bold, MicrosoftYaHeiUI;
font-weight: bold;
color: #34383F;
line-height: 22px;
-webkit-background-clip: text;
}
.bottom-details{
width: 192px;
height: 44px;
font-size: 12px;
}
}
.item {
width: 220px;
height: 320px;
cursor: pointer;
transition: all 0.5s;
background-color: #fff;
border-radius: 6px;
&-top {
width: 220px;
height: 160px;
background-color: #e6e6e6;
border-radius: 6px 6px 0px 0px;
}
&-bottom {
height: 160px;
padding: 9px 12px 20px;
border-radius: 0px 0px 6px 6px;
background-color: #fff;
.bottom-title {
width: 196px;
height: 44px;
font-size: 15px;
font-family: MicrosoftYaHeiUI-Bold, MicrosoftYaHeiUI;
font-weight: bold;
color: #34383f;
line-height: 22px;
-webkit-background-clip: text;
}
.bottom-details {
width: 192px;
height: 44px;
font-size: 12px;
font-family: MicrosoftYaHei;
color: #828a92;
line-height: 22px;
//超出两行隐藏
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}
.bottom-price {
display: flex;
justify-content: space-between;
align-items: center;
margin-top: 14px;
&-left {
width: 100px;
height: 26px;
line-height: 26px;
background: #e7eeff;
border-radius: 12px;
text-align: center;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #828A92;
line-height: 22px;
//超出两行隐藏
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
color: #4280f9;
}
.bottom-price{
display: flex;
justify-content: space-between;
align-items: center;
margin-top: 14px;
&-left{
width: 100px;
height: 26px;
line-height: 26px;
background: #E7EEFF;
border-radius: 12px;
text-align: center;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #4280F9;
}
&-right{
.price-right-label {
width: 36px;
height: 22px;
font-size: 18px;
font-family: MicrosoftYaHeiUI-Bold, MicrosoftYaHeiUI;
font-weight: bold;
color: #FF552D;
line-height: 22px;
}
.price-right-money {
margin-left: 5px;
width: 36px;
height: 16px;
font-size: 12px;
font-family: MicrosoftYaHei;
color: #8790A2;
line-height: 16px;
-webkit-background-clip: text;
}
}
&-right {
.price-right-label {
width: 36px;
height: 22px;
font-size: 18px;
font-family: MicrosoftYaHeiUI-Bold, MicrosoftYaHeiUI;
font-weight: bold;
color: #ff552d;
line-height: 22px;
}
.price-right-money {
margin-left: 5px;
width: 36px;
height: 16px;
font-size: 12px;
font-family: MicrosoftYaHei;
color: #8790a2;
line-height: 16px;
-webkit-background-clip: text;
}
}
}
&:hover{
box-shadow: 20px 20px 10px 0px rgba(228,228,228,1);
}
}
.right-item{
width: 260px;
height: 420px;
background: #FFFFFF;
border-radius: 6px;
&:hover {
box-shadow: 20px 20px 10px 0px rgba(228, 228, 228, 1);
}
`
\ No newline at end of file
}
.right-item {
width: 260px;
height: 420px;
background: #ffffff;
border-radius: 6px;
}
`;
pages/forum/components/publishMessage/index.tsx
......@@ -3,6 +3,7 @@ import { Form, Input, Modal, Upload } from "antd";
import type { RcFile, UploadProps } from "antd/es/upload";
import type { UploadFile } from "antd/es/upload/interface";
import { useState } from "react";
import Image from "next/image";
const getBase64 = (file: RcFile): Promise<string> =>
new Promise((resolve, reject) => {
......@@ -139,7 +140,7 @@ export default function PublishMessage(props: Props) {
footer={null}
onCancel={handlePreviewCancel}
>
<img alt="example" style={{ width: "100%" }} src={previewImage} />
<Image alt="example" style={{ width: "100%" }} src={previewImage} />
</Modal>
</Form.Item>
</Form>
......
pages/forum/index.tsx → pages/forum/index.page.tsx
......@@ -27,7 +27,7 @@ export default function Forum() {
<Space direction="vertical" size={8}>
<div className={styles.item}>
<Space size={10} align="start">
<img className={styles.headImg}></img>
<Image alt="" className={styles.headImg}></Image>
<div className={styles.info}>
<div className={styles.name}>给**的</div>
<div className={styles.desc}>
......@@ -44,54 +44,13 @@ export default function Forum() {
>
<Space size={6} wrap>
<Image
alt=""
className="img"
width={132}
height={132}
src="error"
fallback={errImg}
/>
<Image
className="img"
width={132}
height={132}
src="error"
fallback={errImg}
/>
<Image
className="img"
width={132}
height={132}
src="errImg"
fallback={errImg}
/>
<Image
className="img"
width={132}
height={132}
src="errImg"
fallback={errImg}
/>
<Image
className="img"
width={132}
height={132}
src="errImg"
fallback={errImg}
/>
<Image
className="img"
width={132}
height={132}
src="errImg"
fallback={errImg}
/>
<Image
className="img"
width={132}
height={132}
src="errImg"
fallback={errImg}
/>
</Space>
</Image.PreviewGroup>
</div>
......
pages/home/styled.tsx
import styled from "styled-components"
export default function Style() {
return <></>;
}
export const Box = styled.div`
box-sizing: border-box;
`
\ No newline at end of file
pages/home/waterfallFlowBody/components/map/styled.tsx
import styled from "styled-components"
import styled from "styled-components";
export default function Style() {
return <></>;
}
export const Box = styled.div`
box-sizing: border-box;
width: 384px;
height: 337px;
#container{
box-sizing: border-box;
width: 384px;
height: 337px;
#container {
position: relative;
padding: 0px;
margin: 0px;
width: 384px;
height: 285px;
}
}
.amap-logo {//去除高德地图水印
display: none!important;
visibility: hidden!important;
}
.amap-copyright {//去除高德地图水印
display: none!important;
visibility: hidden!important;
}
.amap-logo {
//去除高德地图水印
display: none !important;
visibility: hidden !important;
}
.amap-copyright {
//去除高德地图水印
display: none !important;
visibility: hidden !important;
}
.map-dosome{
display: flex;
align-items: center;
justify-content: space-around;
width: 384px;
height: 52px;
background: #FFFFFF;
border-radius: 0px 0px 6px 6px;
}
`
\ No newline at end of file
.map-dosome {
display: flex;
align-items: center;
justify-content: space-around;
width: 384px;
height: 52px;
background: #ffffff;
border-radius: 0px 0px 6px 6px;
}
`;
pages/home/waterfallFlowBody/components/rotationChart/styled.tsx
import styled from "styled-components"
import styled from "styled-components";
export default function Style() {
return <></>;
}
export const Box = styled.div`
box-sizing: border-box;
margin: 0 0 30px 0;
display: flex;
.rotationChart{
width: 790px;
margin-right: 24px;
}
.botsBotton{
position: absolute;
left: 10px;
li{
display: flex;
justify-content:center;
align-items: center;
&:not(.slick-active)>button{
width: 10px;
height: 10px;
border-radius:50%;
}
&>button{
height: 10px;
border-radius:5px;
}
}
}
.contentStyle{
width: 790px;
height: 200px;
color: #fff;
line-height: 200px;
text-align: center;
background: #364d79;
box-sizing: border-box;
margin: 0 0 30px 0;
display: flex;
.rotationChart {
width: 790px;
margin-right: 24px;
}
.botsBotton {
position: absolute;
left: 10px;
li {
display: flex;
justify-content: center;
align-items: center;
&:not(.slick-active) > button {
width: 10px;
height: 10px;
border-radius: 50%;
}
& > button {
height: 10px;
border-radius: 5px;
}
}
`
\ No newline at end of file
}
.contentStyle {
width: 790px;
height: 200px;
color: #fff;
line-height: 200px;
text-align: center;
background: #364d79;
}
`;
pages/home/waterfallFlowBody/index.tsx
......@@ -5,6 +5,8 @@ import {Box} from './styled';
import ContentBox from '~/components/contentBox';
import RotationChart from './components/rotationChart'
import Map from './components/map';
// import icon from './_assets/icon.png';
const icon = 'error'
export default function WaterfallFlowBody() {
const onMoreChange = (value: string) => {
......@@ -20,7 +22,7 @@ export default function WaterfallFlowBody() {
<div className='item-title'>
<div className='item-left'>
<div className='item-left-icon'>
<Image src={require("./assets/icon.png")} alt='#'/>
<Image src={icon} alt='#'/>
</div>
<div className='item-left-label'>
无人机出租
......@@ -81,7 +83,7 @@ export default function WaterfallFlowBody() {
asdasdasdasjhgdbjasjgdjashgdbjahsdgahjs
</div>
<div className='item-image'>
<Image className='item-image' src={require("./assets/icon.png")} alt='#'/>
<Image className='item-image' src={icon} alt='#'/>
</div>
</div>
<div className='body-item'>
......@@ -89,7 +91,7 @@ export default function WaterfallFlowBody() {
asdasdasdasjhgdbjasjgdjashgdbjahsdgahjs
</div>
<div className='item-image'>
<Image className='item-image' src={require("./assets/icon.png")} alt='#'/>
<Image className='item-image' src={icon} alt='#'/>
</div>
</div>
<div className='body-item'>
......@@ -97,7 +99,7 @@ export default function WaterfallFlowBody() {
asdasdasdasjhgdbjasjgdjashgdbjahsdgahjs
</div>
<div className='item-image'>
<Image className='item-image' src={require("./assets/icon.png")} alt='#'/>
<Image className='item-image' src={icon} alt='#'/>
</div>
</div>
<div className='body-item'>
......@@ -105,7 +107,7 @@ export default function WaterfallFlowBody() {
asdasdasdasjhgdbjasjgdjashgdbjahsdgahjs
</div>
<div className='item-image'>
<Image className='item-image' src={require("./assets/icon.png")} alt='#'/>
<Image className='item-image' src={icon} alt='#'/>
</div>
</div>
<div className='body-item'>
......@@ -113,7 +115,7 @@ export default function WaterfallFlowBody() {
asdasdasdasjhgdbjasjgdjashgdbjahsdgahjs
</div>
<div className='item-image'>
<Image className='item-image' src={require("./assets/icon.png")} alt='#'/>
<Image className='item-image' src={icon} alt='#'/>
</div>
</div>
<div className='body-item'>
......@@ -121,7 +123,7 @@ export default function WaterfallFlowBody() {
asdasdasdasjhgdbjasjgdjashgdbjahsdgahjs
</div>
<div className='item-image'>
<Image className='item-image' src={require("./assets/icon.png")} alt='#'/>
<Image className='item-image' src={icon} alt='#'/>
</div>
</div>
</div>
......
pages/home/waterfallFlowBody/styled.tsx
import styled from "styled-components"
let one = require("./assets/icon.png")
import styled from "styled-components";
export default function Style() {
return <></>;
}
export const Box = styled.div`
box-sizing: border-box;
padding-top: 24px;
width: 1200px;
margin: 0 auto;
.item{
height:343px;
transition: all .5s;
cursor: pointer;
&-title{
display: flex;
justify-content: space-between;
align-items: center;
padding: 0 25px;
height: 75px;
background: #FFFFFF;
box-shadow: 10px 10px 20px 0px rgba(228,228,228,0.3);
border-radius: 6px 6px 0px 0px ;
.item-left{
display: flex;
justify-content: space-around;
align-items: center;
width:150px;
&-icon{
width: 40px;
height: 40px;
}
&-label{
width: 100px;
height: 32px;
font-size: 20px;
font-family: MicrosoftYaHeiUI-Bold, MicrosoftYaHeiUI;
font-weight: bold;
color: #000000;
line-height: 32px;
}
}
box-sizing: border-box;
padding-top: 24px;
width: 1200px;
margin: 0 auto;
.item {
height: 343px;
transition: all 0.5s;
cursor: pointer;
&-title {
display: flex;
justify-content: space-between;
align-items: center;
padding: 0 25px;
height: 75px;
background: #ffffff;
box-shadow: 10px 10px 20px 0px rgba(228, 228, 228, 0.3);
border-radius: 6px 6px 0px 0px;
.item-left {
display: flex;
justify-content: space-around;
align-items: center;
width: 150px;
&-icon {
width: 40px;
height: 40px;
}
&-body{
padding-left: 10px;
height: 268px;
background: #FFFFFF;
box-shadow: 10px 10px 20px 0px rgba(228,228,228,0.3);
border-radius: 0px 0px 6px 6px;
.item-bubble{
/* width: 80px; */
padding: 0 5px;
height: 32px;
line-height: 32px;
background: #F4F6F9;
border-radius: 19px;
text-align: center;
cursor: pointer;
&.active{
color: #FF552D;
}
}
&-label {
width: 100px;
height: 32px;
font-size: 20px;
font-family: MicrosoftYaHeiUI-Bold, MicrosoftYaHeiUI;
font-weight: bold;
color: #000000;
line-height: 32px;
}
&:hover{
box-shadow: 20px 20px 10px 0px rgba(228,228,228,1);
}
}
&-body {
padding-left: 10px;
height: 268px;
background: #ffffff;
box-shadow: 10px 10px 20px 0px rgba(228, 228, 228, 0.3);
border-radius: 0px 0px 6px 6px;
.item-bubble {
/* width: 80px; */
padding: 0 5px;
height: 32px;
line-height: 32px;
background: #f4f6f9;
border-radius: 19px;
text-align: center;
cursor: pointer;
&.active {
color: #ff552d;
}
}
}
.right-item{
height: 344px;
background-color: #fff;
.title{
display: flex;
align-items: center;
padding: 0 25px;
height: 60px;
width: 80px;
font-size: 20px;
font-family: MicrosoftYaHeiUI-Bold, MicrosoftYaHeiUI;
font-weight: bold;
color: #000000;
line-height: 25px;
&:hover {
box-shadow: 20px 20px 10px 0px rgba(228, 228, 228, 1);
}
}
.right-item {
height: 344px;
background-color: #fff;
.title {
display: flex;
align-items: center;
padding: 0 25px;
height: 60px;
width: 80px;
font-size: 20px;
font-family: MicrosoftYaHeiUI-Bold, MicrosoftYaHeiUI;
font-weight: bold;
color: #000000;
line-height: 25px;
}
.body {
height: 284px;
overflow-y: auto;
&-item {
display: flex;
justify-content: space-between;
align-items: center;
height: 70px;
padding: 0 20px;
.item-label {
width: 217px;
height: 40px;
font-size: 16px;
font-family: MicrosoftYaHei;
color: #323232;
line-height: 21px;
word-wrap: break-word;
}
.body{
height: 284px;
overflow-y: auto;
&-item{
display: flex;
justify-content: space-between;
align-items: center;
height: 70px;
padding: 0 20px;
.item-label{
width: 217px;
height: 40px;
font-size: 16px;
font-family: MicrosoftYaHei;
color: #323232;
line-height: 21px;
word-wrap: break-word;
}
.item-image{
width: 96px;
height: 60px;
background: #D8D8D8;
border-radius: 6px;
}
}
.item-image {
width: 96px;
height: 60px;
background: #d8d8d8;
border-radius: 6px;
}
}
}
}
.right-item-second {
height: 510px;
background-color: #fff;
.title {
display: flex;
align-items: center;
padding: 0 25px;
height: 62px;
width: 80px;
font-size: 20px;
font-family: MicrosoftYaHeiUI-Bold, MicrosoftYaHeiUI;
font-weight: bold;
color: #000000;
line-height: 25px;
}
.right-item-second{
height: 510px;
background-color: #fff;
.title{
display: flex;
align-items: center;
padding: 0 25px;
height: 62px;
width: 80px;
font-size: 20px;
font-family: MicrosoftYaHeiUI-Bold, MicrosoftYaHeiUI;
font-weight: bold;
color: #000000;
line-height: 25px;
.body {
height: 448px;
overflow-y: auto;
&-item {
display: flex;
justify-content: space-between;
align-items: center;
height: 88px;
padding: 0 20px;
.item-label {
width: 217px;
height: 40px;
font-size: 16px;
font-family: MicrosoftYaHei;
color: #323232;
line-height: 21px;
word-wrap: break-word;
.label-top {
}
.label-bottom {
font-size: 15px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: #ff552d;
}
}
.body{
height: 448px;
overflow-y: auto;
&-item{
display: flex;
justify-content: space-between;
align-items: center;
height: 88px;
padding: 0 20px;
.item-label{
width: 217px;
height: 40px;
font-size: 16px;
font-family: MicrosoftYaHei;
color: #323232;
line-height: 21px;
word-wrap: break-word;
.label-top{
}
.label-bottom{
font-size: 15px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: #FF552D;
}
}
.item-right{
.btn{
text-align: center;
background: #FF552D;
border-radius: 14px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #FFFFFF;
}
}
}
.item-right {
.btn {
text-align: center;
background: #ff552d;
border-radius: 14px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #ffffff;
}
}
}
}
`
\ No newline at end of file
}
`;
pages/jobServices/detail/components/evaluate/styled.tsx
import styled from "styled-components"
export default function Style() {
return <></>;
}
export const Box = styled.div`
box-sizing: border-box;
.item{
......
pages/jobServices/detail/styled.tsx
import styled from "styled-components"
export default function Style() {
return <></>;
}
export const Box = styled.div`
box-sizing: border-box;
width: 1200px;
......
pages/jobServices/styled.tsx
import styled from "styled-components"
export default function Style() {
return <></>;
}
export const Box = styled.div`
box-sizing: border-box;
padding-top: 15px;
......
pages/mall/index.tsx → pages/mall/index.page.tsx
......@@ -8,7 +8,7 @@ import Filter, { FilterResult } from "~/components/filter";
import { FilterOptionResp, mallApi } from "~/components/filter/api";
// 此函数在构建时被调用
export async function getStaticProps() {
export async function getServerSideProps() {
//获取筛选数据，进行静态渲染
const brand = Filter.mallApi.brand();
const category = Filter.mallApi.category();
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论