Skip to content

W
web-ci-test
提交 043e70c3 作者: 翁进城
操作

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

上级 ba071b4b 01439eac
正在显示 包含 392 行增加 和 37 行删除
components/footer/index.tsx
......@@ -8,7 +8,7 @@ const qrcodeList = [
url: "http://www.mmcuav.cn/",
},
{
img: require("./assets/fuwuhao.png"),
img: require("./assets/fuwuhao.jpg"),
title: "云享飞服务号",
},
{
......
pages/equipmentLeasing/detail/[id].page.tsx
......@@ -3,10 +3,11 @@ import {useRouter} from 'next/router';
import Layout from "~/components/layout";
import {Box} from './styled';
import ImagePreview from './components/picture-preview';
import { Button , Image as AImage , Divider } from 'antd';
import { Button , Image as AImage , Divider , Select,Modal ,Tag,Space,Form,message} from 'antd';
import Image from 'next/image';
import errImg from "~/assets/errImg";
import api,{GetWebDeviceDetailResult} from './api';
import api,{GetWebDeviceDetailResult,GetWebDeviceWareSkuById} from './api';
const {CheckableTag } = Tag
export default function EquipmentLeasingDetail() {
const router = useRouter();
......@@ -14,6 +15,7 @@ export default function EquipmentLeasingDetail() {
const [id, setId] = useState<number | null>(null);
const [detail,setDetail] = useState<GetWebDeviceDetailResult | null>()
const [wareSkuList,setWareSkuList] = useState<GetWebDeviceWareSkuById[] | undefined>()
useEffect(()=>{
setId(Number(router.query.id))
......@@ -28,9 +30,98 @@ export default function EquipmentLeasingDetail() {
.then((res) => {
setDetail(res.result || null);
});
api
.listWareSkuById({
id:id
})
.then((res) => {
res.result?.map(item=>{
return item
})
setWareSkuList(res.result || undefined);
});
}
},[id])
//租赁弹框
const [isModalOpen, setIsModalOpen] = useState(false);
const [loading, setLoading] = useState(false);
const [form] = Form.useForm();
const tagsData = ['3-7天', '8-15天', '16-30天', '30天以上'];
const [selectedTags, setSelectedTags] = useState<number>();
const [selectedTagsData, setSelectedTagsData] = useState<string>();
const showModal = () => {
setIsModalOpen(true);
if (wareSkuList?.length) {
setSelectedTags(wareSkuList[0].id);
form.setFieldValue("id",wareSkuList[0].id)
setSelectedTagsData("3-7天")
form.setFieldValue("date","3-7天")
}
};
const handleOk = () => {
setLoading(true);
form
.validateFields()
.then(async (values) => {
form.resetFields()
message.success("租赁成功")
setLoading(false);
setIsModalOpen(false);
// try{
// const res = await api.listWareSkuUpdate(values)
// if (res.code === "200") {
// setLoading(false);
// setIsModalOpen(false);
// form.resetFields()
// message.success('租赁成功')
// }else{
// setLoading(false);
// message.error(res.message)
// }
// }catch(e:any){
// message.error(e.message)
// }
}).catch((err) => {
message
.warning({
content: err.errorFields[0].errors[0],
})
.then();
setLoading(false);
});
};
const handleCancel = () => {
setIsModalOpen(false);
};
const handleChange = (tag: number, checked: boolean) => {
if (checked) {
const nextWareSkuList = checked
? tag
: wareSkuList?.filter((t) => t.id !== tag)[0].id;
console.log('You are interested in: ', nextWareSkuList);
setSelectedTags(nextWareSkuList);
form.setFieldValue("id",tag)
}
};
const handleChangeDate = (tag: string, checked: boolean) => {
if (checked) {
const nextSelectedTags = checked
? tag
: tagsData.filter((t) => t !== tag)[0];
console.log('You are interested in: ', nextSelectedTags);
setSelectedTagsData(nextSelectedTags);
form.setFieldValue("date",tag)
}
};
return (
<Layout>
<Box>
......@@ -45,13 +136,36 @@ export default function EquipmentLeasingDetail() {
</div>) : (<div className='function not'></div>)
}
<div className='menoy'>
<span className='menoy-left'>¥{detail?.minRent}</span>
<span className='menoy-left'>{`¥${detail?.minRent}`}</span>
<span className='menoy-right'>/天起</span>
</div>
<div className='classification'></div>
<div className='classification'>
<div className='top'>
<div className='left'>
<span className='label'>选择</span>
<span className='value'>商品分类</span>
</div>
<div className='right'>
<Select
className="selectItem"
defaultActiveFirstOption
defaultValue={wareSkuList}
style={{ width: 120 }}
bordered={false}
options={wareSkuList}
fieldNames={{label:"skuTitle",value:"id"}}
placeholder="选择商品"
/>
</div>
</div>
<div className='bottom'>
<span className='label'>发货</span>
<span className='value'>顺丰到付</span>
</div>
</div>
<div className='botton-btn'>
<Button className='btn-left' size='small' type="primary">成为渠道商</Button>
<Button className='btn-right' size='small' type="primary">立即租赁</Button>
<Button className='btn-right' size='small' type="primary" onClick={showModal}>立即租赁</Button>
</div>
</div>
</div>
......@@ -66,6 +180,71 @@ export default function EquipmentLeasingDetail() {
detail?.wareDetailContent ? <div style={{ textAlign: "center" }} dangerouslySetInnerHTML={{ __html: detail?.wareDetailContent}}>
</div> : <div style={{ textAlign: "center" }} ></div>
}
{/* 立即租赁 */}
<Modal
wrapClassName='application'
open={isModalOpen}
onOk={handleOk}
onCancel={handleCancel}
getContainer={false}
footer={[
<Button
style={{ width: "100%" ,height: 44 }}
key="submit"
type="primary"
loading={loading}
onClick={handleOk}
>
立即租赁
</Button>,
]}
>
<div className='title'>
<div className="left"></div>
<div className="right">
<div className="top">
<span className='tag'>¥</span>
<span className='money'>{detail?.minRent}</span>
<span className='unit'>/天</span>
</div>
<div className="bottom">渠道免押金</div>
</div>
</div>
<Form
form={form}
layout="vertical"
name="application"
initialValues={{ modifier: 'public' }}
>
<Form.Item style={{flex:1,marginRight:16}} name="id" label="选择商品">
<Space size={[0, 8]} wrap>
{wareSkuList?.map((tag) => (
<CheckableTag
style={{height:28,lineHeight:"28px"}}
key={tag.id}
checked={wareSkuList?.some(item=>tag.id === selectedTags)}
onChange={(checked) => handleChange(tag.id, checked)}
>
{tag.skuTitle}
</CheckableTag>
))}
</Space>
</Form.Item>
<Form.Item style={{flex:1,marginRight:16}} name="date" label="租期天数（拿到和归还当天不算入租期）">
<Space size={[0, 8]} wrap>
{tagsData.map((tag) => (
<CheckableTag
key={tag}
checked={tag === selectedTagsData}
onChange={(checked) => handleChangeDate(tag, checked)}
>
{tag}
</CheckableTag>
))}
</Space>
</Form.Item>
</Form>
</Modal>
</Box>
</Layout>
)
......
pages/equipmentLeasing/detail/api/index.tsx
......@@ -34,9 +34,48 @@ export interface GetWebDeviceDetailResult {
wareDetailContent: string | TrustedHTML
}
export interface PriceList {
id: number,
wareInfoId: number,
skuInfoId: number,
rentPrice: number,
minDay: number,
maxDay: number,
createTime: null
}
export interface GetWebDeviceWareSkuById {
id: number,
wareInfoId: number,
skuTitle: string,
rentPrice: number | null,
rentDeposit: number,
stockNum: number,
saleNum: number,
createTime: string,
updateTime: null,
skuPriceDTOList: Array<PriceList>,
}
export interface WebDeviceUpdateParams {
id?:number,
inventoryId?:number,
inventoryUsage?:string,
startDay?:string
endDay?:string,
}
export default {
//web-设备租赁-详情
listDetailDeviceInfo: (params: GetWebDeviceDetailParams): Promise<Response<GetWebDeviceDetailResult>> => {
return request('/pms/webDevice/detail', 'get', params)
},
//web-设备租赁-商品
listWareSkuById: (params: GetWebDeviceDetailParams): Promise<Response<GetWebDeviceWareSkuById[]>> => {
return request('/pms/appDevice/listWareSkuById', 'get', params)
},
//web-设备租赁-立即租赁
listWareSkuUpdate: (params: WebDeviceUpdateParams): Promise<Response<number>> => {
return request('/pms/appDevice/update', 'post', params)
}
}
\ No newline at end of file
pages/equipmentLeasing/detail/styled.tsx
......@@ -56,9 +56,40 @@ export const Box = styled.div`
}
.classification{
margin-top: 28px;
width: 300px;
width: 375px;
height: 50px;
background-color: pink;
.label{
height: 21px;
font-size: 16px;
font-family: MicrosoftYaHei;
color: #9A9A9A;
line-height: 21px;
margin-right: 36px;
}
.value{
height: 21px;
font-size: 16px;
font-family: MicrosoftYaHei;
color: #151515;
line-height: 21px;
}
.top{
display: flex;
justify-content: space-between;
align-items: center;
.left{
}
.right{
.selectItem{
.ant-select-selection-placeholder {
color: #000;
}
}
}
}
.bottom{
margin-top: 5px;
}
}
.botton-btn{
margin-top: 30px;
......@@ -123,4 +154,49 @@ export const Box = styled.div`
color: #989898;
}
}
.application{
.title{
display: flex;
align-items: center;
padding-bottom: 25px;
.left{
width: 58px;
height: 58px;
background: #D8D8D8;
border-radius: 2px;
}
.right{
margin-left: 15px;
.top{
.tag{
font-size: 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #FF0F0F;
}
.money{
font-size: 22px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: #FF0F0F;
}
.unit{
font-size: 12px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #FF0F0F;
}
}
.bottom{
width: 65px;
height: 18px;
font-size: 13px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #121212;
line-height: 18px;
}
}
}
}
`
\ No newline at end of file
pages/equipmentLeasing/index.page.tsx
......@@ -69,7 +69,7 @@ export default function EquipmentLeasing(props: Props) {
const [abort, setAbort] = useState<AbortController | null>(null); //请求中断
const [pageParams, setPageParams] = useState({
pageNo: 1,
pageSize: 16,
pageSize: 15,
}); //分页器对象
const onPageChange = (page: number, pageSize: number) => {
......@@ -141,7 +141,7 @@ export default function EquipmentLeasing(props: Props) {
></Filter>
<div style={{ paddingTop: 13 }}>
<ContentBox
boxIndex={4}
boxIndex={5}
leftcontentstyle={{
width: "916px",
margin: { top: 0, right: "12px", bottom: "12px", left: 0 },
......
pages/equipmentLeasing/styled.tsx
......@@ -16,10 +16,12 @@ export const Box = styled.div`
cursor: pointer;
transition: all 0.5s;
&-top {
display: flex;
justify-content: center;
align-items: center;
height: 145px;
background: #ffffff;
border-radius: 6px 6px 0px 0px;
padding: 19px 52px 10px 52px;
&-image {
width: 116px;
height: 116px;
......@@ -29,7 +31,6 @@ export const Box = styled.div`
&-bottom {
padding: 10px 13px 14px 18px;
&-title {
width: 189px;
height: 24px;
font-size: 14px;
font-family: MicrosoftYaHeiUI-Bold, MicrosoftYaHeiUI;
......@@ -73,5 +74,6 @@ export const Box = styled.div`
}
.pagination-page {
text-align: right;
margin-top: 50px;
}
`;
pages/flyingHandService/index.page.tsx
......@@ -193,17 +193,34 @@ export default function FlyingHandService() {
const [isModalOpen, setIsModalOpen] = useState(false);
const [loading, setLoading] = useState(false);
const handleOk = async (values: any) => {
const value = form.getFieldsValue()
setLoading(true);
try{
const res = await api.PilotRegistrations(value)
form
.validateFields()
.then(async (values) => {
setLoading(true);
try{
const res = await api.PilotRegistrations(values)
if (res.code === "200") {
setLoading(false);
setIsModalOpen(false);
form.resetFields()
message.success('报名成功')
}else{
setLoading(false);
message.error(res.message)
}
}catch(e:any){
message.error(e.message)
}
}).catch((err) => {
message
.warning({
content: err.errorFields[0].errors[0],
})
.then();
});
};
const handleCancel = () => {
......@@ -309,21 +326,21 @@ export default function FlyingHandService() {
<div style={{display:"flex",justifyContent:"space-between"}}>
<Form.Item style={{flex:1,marginRight:16}}
name="name"
rules={[{ required: true, message: 'Please input the title of collection!' }]}
rules={[{ required: true, message: '请输入姓名!' }]}
>
<Input placeholder="姓名" />
</Form.Item>
<Form.Item style={{flex:1}} name="telephone">
<Form.Item style={{flex:1}} name="telephone" rules={[{ required: true, message: '请输入手机号!' }]}>
<Input placeholder="手机号" />
</Form.Item>
</div>
<Form.Item
name="city"
rules={[{ required: true, message: 'Please select gender!' }]}
rules={[{ required: true, message: '请选择城市!' }]}
>
<Cascader
allowClear
placeholder="地域"
placeholder="城市"
className="selectItem"
size="large"
fieldNames={{
......@@ -338,16 +355,14 @@ export default function FlyingHandService() {
<Form.Item
name="drivingLicense"
rules={[{ required: true, message: 'Please select gender!' }]}
>
<Select placeholder="是否有驾照">
<Select allowClear placeholder="是否有驾照">
<Option value="0">是</Option>
<Option value="1">否</Option>
</Select>
</Form.Item>
<Form.Item
name="uavLicenseLevelOne"
rules={[{ required: true, message: 'Please select gender!' }]}
>
<Cascader
allowClear
......
pages/home/waterfallFlowBody/api/index.ts
......@@ -174,15 +174,27 @@ interface ListTenderNewsInfoParams {
provinceCode?: number;
}
export interface TenderApplyType{
tenderInfoId: number,
tenderNewsId: number,
userAccountId: number
}
export const listNewsApi = {
//新闻列表
listNewsPage: (
params: ListPageNewsInfoParams
): Promise<Response<ListPageNewsInfoResp>> => {
return request("/release/industry-news/listNewsPage", "post", params);
},
//招标列表
listNewTenderInfo: (
params: ListTenderNewsInfoParams
): Promise<Response<ListTenderNewsInfoResp>> => {
return request("/release/tender/listNewTenderInfo", "post", params);
},
};
//web-招标-合作申请提交
tenderApply: (params: TenderApplyType): Promise<Response<number>> => {
return request('/release/tender/apply', 'post', params)
}
}
pages/home/waterfallFlowBody/components/map/index.tsx
......@@ -63,10 +63,10 @@ export default function MapComponent() {
}
//解析定位错误信息
async function onError(data:any) {
message.error(`定位失败
失败原因排查信息：${data.message}
浏览器返回信息：${data.originMessage}
`)
// message.error(`定位失败
// 失败原因排查信息：${data.message}
// 浏览器返回信息：${data.originMessage}
// `)
}
await mapEntiy(0)
})
......@@ -85,7 +85,7 @@ export default function MapComponent() {
const list = res.result
?.map((item) => item.locationList)
.flat()
.filter((item: { dizhi: string }) => item.dizhi.includes("广东省"));
.filter((item: { dizhi: string }) => item.dizhi.includes("省"));
const markerList: any = [];
if (list?.length) {
list?.map((item) => {
......@@ -100,7 +100,7 @@ export default function MapComponent() {
lon: userPositioning?.lon || data?.lon || 113.93029,
lat: userPositioning?.lat || data?.lat || 22.53291,
pageNo:1,
pageSize: pageSize || 10
pageSize: pageSize || 40
});
const list = res.result?.list
const markerList: any = [];
......@@ -118,7 +118,7 @@ export default function MapComponent() {
lon: userPositioning?.lon || data?.lon || 113.93029,
lat: userPositioning?.lat || data?.lat || 22.53291,
pageNo:1,
pageSize: 10
pageSize: 40
});
const list = res.result?.list
const markerList: any = [];
......@@ -137,7 +137,7 @@ export default function MapComponent() {
if (index === 0) {
showPositioningInfo(index,data)
}else if (index === 1) {
showFlyerBitmap(index,data)
showFlyerBitmap(index,data,30)
} else if(index === 2) {
showUavBitmap(index,data)
}else{
......
pages/home/waterfallFlowBody/index.tsx
import React, { useEffect, useState } from "react";
import { Space, Select, Button } from "antd";
import { Space, Select, Button, message } from "antd";
import Image from "next/image";
import { useRouter } from "next/router";
import { Box } from "./styled";
......@@ -266,6 +266,29 @@ export default function WaterfallFlowBody() {
}
};
const handleTenderApply = async (item:NewsTenderType)=>{
console.log(item);
let res = await listNewsApi.tenderApply({
tenderInfoId: item.id,
tenderNewsId: item.tenderNewsId,
userAccountId: 0,
})
try{
if (res.code==="200") {
message.success("申请成功")
let res8 = await listNewsApi.listNewTenderInfo({
pageNo: 1,
pageSize: 6,
});
setRightBottomDomList(rightDom2(res8.result?.list!));
}else{
message.error(res.message)
}
}catch(e){
console.log(e);
}
}
const leftDom = (
item: ColumnsType,
index: number,
......@@ -355,7 +378,7 @@ export default function WaterfallFlowBody() {
</div>
<div className="body">
{list?.map((item, index) => (
<div key={item.id} className="body-item">
<div key={item.id} className="body-item" onClick={()=>router.push(`/projectInfo/newsArticle/${item.id}`)}>
<div
className={`item-ranking ${index === 0 ? "one" : ""} ${
index === 1 ? "two" : ""
......@@ -393,9 +416,11 @@ export default function WaterfallFlowBody() {
{item.tenderContent}
<div className="label-bottom">{item.tenderPrice}</div>
</div>
<div className="item-right">
<div className="left">{`${item.tenderPrice}W`}</div>
<div className="right">申请合作</div>
<div className="item-right" onClick={()=>handleTenderApply(item)}>
{
item.apply ? <div>已申请</div> : <><div className="left">{`${item.tenderPrice}W`}</div>
<div className="right">申请合作</div></>
}
</div>
</div>
))}
......
pages/home/waterfallFlowBody/styled.tsx
......@@ -162,6 +162,7 @@ export const Box = styled.div`
align-items: center;
padding: 0 23px 0 19px;
height: 32px;
cursor: pointer;
.item-ranking {
color: #9295a3;
&.one {
......@@ -184,6 +185,9 @@ export const Box = styled.div`
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
&:hover {
color: #ff552d;
}
}
}
}
......@@ -282,6 +286,7 @@ export const Box = styled.div`
height: 22px;
background: url(${button.src}) no-repeat;
background-size: contain;
cursor: pointer;
.left {
width: 35px;
height: 22px;
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论