Skip to content

W
web
提交 0151ed8d 作者: 18928357778
操作

添-飞手培训-报名学习课程弹框 

添-设备租赁-立即租赁弹框
添-首页-招标列表-申请合作功能
改-首页-地图-点位改变数量
改-首页-底部-服务号，小程序图片更换
上级 b08dd55b
正在显示 包含 296 行增加 和 31 行删除
components/footer/index.tsx
...@@ -8,7 +8,7 @@ const qrcodeList = [ ...@@ -8,7 +8,7 @@ const qrcodeList = [
url: "http://www.mmcuav.cn/", url: "http://www.mmcuav.cn/",
}, },
{ {
img: require("./assets/fuwuhao.png"), img: require("./assets/fuwuhao.jpg"),
title: "云享飞服务号", title: "云享飞服务号",
}, },
{ {
......
pages/equipmentLeasing/detail/[id].page.tsx
...@@ -3,10 +3,11 @@ import {useRouter} from 'next/router'; ...@@ -3,10 +3,11 @@ import {useRouter} from 'next/router';
import Layout from "~/components/layout"; import Layout from "~/components/layout";
import {Box} from './styled'; import {Box} from './styled';
import ImagePreview from './components/picture-preview'; import ImagePreview from './components/picture-preview';
import { Button , Image as AImage , Divider , Select} from 'antd'; import { Button , Image as AImage , Divider , Select,Modal ,Tag,Space,Form,message} from 'antd';
import Image from 'next/image'; import Image from 'next/image';
import errImg from "~/assets/errImg"; import errImg from "~/assets/errImg";
import api,{GetWebDeviceDetailResult,GetWebDeviceWareSkuById} from './api'; import api,{GetWebDeviceDetailResult,GetWebDeviceWareSkuById} from './api';
const {CheckableTag } = Tag
export default function EquipmentLeasingDetail() { export default function EquipmentLeasingDetail() {
const router = useRouter(); const router = useRouter();
...@@ -42,6 +43,85 @@ export default function EquipmentLeasingDetail() { ...@@ -42,6 +43,85 @@ export default function EquipmentLeasingDetail() {
} }
},[id]) },[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 ( return (
<Layout> <Layout>
<Box> <Box>
...@@ -56,7 +136,7 @@ export default function EquipmentLeasingDetail() { ...@@ -56,7 +136,7 @@ export default function EquipmentLeasingDetail() {
</div>) : (<div className='function not'></div>) </div>) : (<div className='function not'></div>)
} }
<div className='menoy'> <div className='menoy'>
<span className='menoy-left'>¥{detail?.minRent}</span> <span className='menoy-left'>{`¥${detail?.minRent}`}</span>
<span className='menoy-right'>/天起</span> <span className='menoy-right'>/天起</span>
</div> </div>
<div className='classification'> <div className='classification'>
...@@ -67,12 +147,14 @@ export default function EquipmentLeasingDetail() { ...@@ -67,12 +147,14 @@ export default function EquipmentLeasingDetail() {
</div> </div>
<div className='right'> <div className='right'>
<Select <Select
className="selectItem"
defaultActiveFirstOption defaultActiveFirstOption
defaultValue={wareSkuList} defaultValue={wareSkuList}
style={{ width: 120 }} style={{ width: 120 }}
bordered={false} bordered={false}
options={wareSkuList} options={wareSkuList}
fieldNames={{label:"skuTitle",value:"id"}} fieldNames={{label:"skuTitle",value:"id"}}
placeholder="选择商品"
/> />
</div> </div>
</div> </div>
...@@ -83,7 +165,7 @@ export default function EquipmentLeasingDetail() { ...@@ -83,7 +165,7 @@ export default function EquipmentLeasingDetail() {
</div> </div>
<div className='botton-btn'> <div className='botton-btn'>
<Button className='btn-left' size='small' type="primary">成为渠道商</Button> <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> </div>
</div> </div>
...@@ -98,6 +180,71 @@ export default function EquipmentLeasingDetail() { ...@@ -98,6 +180,71 @@ export default function EquipmentLeasingDetail() {
detail?.wareDetailContent ? <div style={{ textAlign: "center" }} dangerouslySetInnerHTML={{ __html: detail?.wareDetailContent}}> detail?.wareDetailContent ? <div style={{ textAlign: "center" }} dangerouslySetInnerHTML={{ __html: detail?.wareDetailContent}}>
</div> : <div style={{ textAlign: "center" }} ></div> </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> </Box>
</Layout> </Layout>
) )
......
pages/equipmentLeasing/detail/api/index.tsx
...@@ -57,6 +57,14 @@ export interface GetWebDeviceWareSkuById { ...@@ -57,6 +57,14 @@ export interface GetWebDeviceWareSkuById {
skuPriceDTOList: Array<PriceList>, skuPriceDTOList: Array<PriceList>,
} }
export interface WebDeviceUpdateParams {
id?:number,
inventoryId?:number,
inventoryUsage?:string,
startDay?:string
endDay?:string,
}
export default { export default {
//web-设备租赁-详情 //web-设备租赁-详情
listDetailDeviceInfo: (params: GetWebDeviceDetailParams): Promise<Response<GetWebDeviceDetailResult>> => { listDetailDeviceInfo: (params: GetWebDeviceDetailParams): Promise<Response<GetWebDeviceDetailResult>> => {
...@@ -65,5 +73,9 @@ export default { ...@@ -65,5 +73,9 @@ export default {
//web-设备租赁-商品 //web-设备租赁-商品
listWareSkuById: (params: GetWebDeviceDetailParams): Promise<Response<GetWebDeviceWareSkuById[]>> => { listWareSkuById: (params: GetWebDeviceDetailParams): Promise<Response<GetWebDeviceWareSkuById[]>> => {
return request('/pms/appDevice/listWareSkuById', 'get', params) 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,7 +56,7 @@ export const Box = styled.div` ...@@ -56,7 +56,7 @@ export const Box = styled.div`
} }
.classification{ .classification{
margin-top: 28px; margin-top: 28px;
width: 300px; width: 375px;
height: 50px; height: 50px;
.label{ .label{
height: 21px; height: 21px;
...@@ -80,6 +80,11 @@ export const Box = styled.div` ...@@ -80,6 +80,11 @@ export const Box = styled.div`
.left{ .left{
} }
.right{ .right{
.selectItem{
.ant-select-selection-placeholder {
color: #000;
}
}
} }
} }
.bottom{ .bottom{
...@@ -149,4 +154,49 @@ export const Box = styled.div` ...@@ -149,4 +154,49 @@ export const Box = styled.div`
color: #989898; 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/styled.tsx
...@@ -74,6 +74,6 @@ export const Box = styled.div` ...@@ -74,6 +74,6 @@ export const Box = styled.div`
} }
.pagination-page { .pagination-page {
text-align: right; text-align: right;
margin-top: 150px; margin-top: 50px;
} }
`; `;
pages/flyingHandService/index.page.tsx
...@@ -193,17 +193,34 @@ export default function FlyingHandService() { ...@@ -193,17 +193,34 @@ export default function FlyingHandService() {
const [isModalOpen, setIsModalOpen] = useState(false); const [isModalOpen, setIsModalOpen] = useState(false);
const [loading, setLoading] = useState(false); const [loading, setLoading] = useState(false);
const handleOk = async (values: any) => { const handleOk = async (values: any) => {
const value = form.getFieldsValue()
setLoading(true); form
try{ .validateFields()
const res = await api.PilotRegistrations(value) .then(async (values) => {
setLoading(true);
try{
const res = await api.PilotRegistrations(values)
if (res.code === "200") {
setLoading(false); setLoading(false);
setIsModalOpen(false); setIsModalOpen(false);
form.resetFields() form.resetFields()
message.success('报名成功') message.success('报名成功')
}else{
setLoading(false);
message.error(res.message)
}
}catch(e:any){ }catch(e:any){
message.error(e.message) message.error(e.message)
} }
}).catch((err) => {
message
.warning({
content: err.errorFields[0].errors[0],
})
.then();
});
}; };
const handleCancel = () => { const handleCancel = () => {
...@@ -309,21 +326,21 @@ export default function FlyingHandService() { ...@@ -309,21 +326,21 @@ export default function FlyingHandService() {
<div style={{display:"flex",justifyContent:"space-between"}}> <div style={{display:"flex",justifyContent:"space-between"}}>
<Form.Item style={{flex:1,marginRight:16}} <Form.Item style={{flex:1,marginRight:16}}
name="name" name="name"
rules={[{ required: true, message: 'Please input the title of collection!' }]} rules={[{ required: true, message: '请输入姓名!' }]}
> >
<Input placeholder="姓名" /> <Input placeholder="姓名" />
</Form.Item> </Form.Item>
<Form.Item style={{flex:1}} name="telephone"> <Form.Item style={{flex:1}} name="telephone" rules={[{ required: true, message: '请输入手机号!' }]}>
<Input placeholder="手机号" /> <Input placeholder="手机号" />
</Form.Item> </Form.Item>
</div> </div>
<Form.Item <Form.Item
name="city" name="city"
rules={[{ required: true, message: 'Please select gender!' }]} rules={[{ required: true, message: '请选择城市!' }]}
> >
<Cascader <Cascader
allowClear allowClear
placeholder="地域" placeholder="城市"
className="selectItem" className="selectItem"
size="large" size="large"
fieldNames={{ fieldNames={{
...@@ -338,16 +355,14 @@ export default function FlyingHandService() { ...@@ -338,16 +355,14 @@ export default function FlyingHandService() {
<Form.Item <Form.Item
name="drivingLicense" name="drivingLicense"
rules={[{ required: true, message: 'Please select gender!' }]}
> >
<Select placeholder="是否有驾照"> <Select allowClear placeholder="是否有驾照">
<Option value="0">是</Option> <Option value="0">是</Option>
<Option value="1">否</Option> <Option value="1">否</Option>
</Select> </Select>
</Form.Item> </Form.Item>
<Form.Item <Form.Item
name="uavLicenseLevelOne" name="uavLicenseLevelOne"
rules={[{ required: true, message: 'Please select gender!' }]}
> >
<Cascader <Cascader
allowClear allowClear
......
pages/home/waterfallFlowBody/api/index.ts
...@@ -174,15 +174,27 @@ interface ListTenderNewsInfoParams { ...@@ -174,15 +174,27 @@ interface ListTenderNewsInfoParams {
provinceCode?: number; provinceCode?: number;
} }
export interface TenderApplyType{
tenderInfoId: number,
tenderNewsId: number,
userAccountId: number
}
export const listNewsApi = { export const listNewsApi = {
//新闻列表
listNewsPage: ( listNewsPage: (
params: ListPageNewsInfoParams params: ListPageNewsInfoParams
): Promise<Response<ListPageNewsInfoResp>> => { ): Promise<Response<ListPageNewsInfoResp>> => {
return request("/release/industry-news/listNewsPage", "post", params); return request("/release/industry-news/listNewsPage", "post", params);
}, },
//招标列表
listNewTenderInfo: ( listNewTenderInfo: (
params: ListTenderNewsInfoParams params: ListTenderNewsInfoParams
): Promise<Response<ListTenderNewsInfoResp>> => { ): Promise<Response<ListTenderNewsInfoResp>> => {
return request("/release/tender/listNewTenderInfo", "post", params); 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() { ...@@ -63,10 +63,10 @@ export default function MapComponent() {
} }
//解析定位错误信息 //解析定位错误信息
async function onError(data:any) { async function onError(data:any) {
message.error(`定位失败 // message.error(`定位失败
失败原因排查信息：${data.message} // 失败原因排查信息：${data.message}
浏览器返回信息：${data.originMessage} // 浏览器返回信息：${data.originMessage}
`) // `)
} }
await mapEntiy(0) await mapEntiy(0)
}) })
...@@ -85,7 +85,7 @@ export default function MapComponent() { ...@@ -85,7 +85,7 @@ export default function MapComponent() {
const list = res.result const list = res.result
?.map((item) => item.locationList) ?.map((item) => item.locationList)
.flat() .flat()
.filter((item: { dizhi: string }) => item.dizhi.includes("广东省")); .filter((item: { dizhi: string }) => item.dizhi.includes("省"));
const markerList: any = []; const markerList: any = [];
if (list?.length) { if (list?.length) {
list?.map((item) => { list?.map((item) => {
...@@ -100,7 +100,7 @@ export default function MapComponent() { ...@@ -100,7 +100,7 @@ export default function MapComponent() {
lon: userPositioning?.lon || data?.lon || 113.93029, lon: userPositioning?.lon || data?.lon || 113.93029,
lat: userPositioning?.lat || data?.lat || 22.53291, lat: userPositioning?.lat || data?.lat || 22.53291,
pageNo:1, pageNo:1,
pageSize: pageSize || 10 pageSize: pageSize || 40
}); });
const list = res.result?.list const list = res.result?.list
const markerList: any = []; const markerList: any = [];
...@@ -118,7 +118,7 @@ export default function MapComponent() { ...@@ -118,7 +118,7 @@ export default function MapComponent() {
lon: userPositioning?.lon || data?.lon || 113.93029, lon: userPositioning?.lon || data?.lon || 113.93029,
lat: userPositioning?.lat || data?.lat || 22.53291, lat: userPositioning?.lat || data?.lat || 22.53291,
pageNo:1, pageNo:1,
pageSize: 10 pageSize: 40
}); });
const list = res.result?.list const list = res.result?.list
const markerList: any = []; const markerList: any = [];
...@@ -137,7 +137,7 @@ export default function MapComponent() { ...@@ -137,7 +137,7 @@ export default function MapComponent() {
if (index === 0) { if (index === 0) {
showPositioningInfo(index,data) showPositioningInfo(index,data)
}else if (index === 1) { }else if (index === 1) {
showFlyerBitmap(index,data) showFlyerBitmap(index,data,30)
} else if(index === 2) { } else if(index === 2) {
showUavBitmap(index,data) showUavBitmap(index,data)
}else{ }else{
......
pages/home/waterfallFlowBody/index.tsx
import React, { useEffect, useState } from "react"; 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 Image from "next/image";
import { useRouter } from "next/router"; import { useRouter } from "next/router";
import { Box } from "./styled"; import { Box } from "./styled";
...@@ -266,6 +266,29 @@ export default function WaterfallFlowBody() { ...@@ -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 = ( const leftDom = (
item: ColumnsType, item: ColumnsType,
index: number, index: number,
...@@ -355,7 +378,7 @@ export default function WaterfallFlowBody() { ...@@ -355,7 +378,7 @@ export default function WaterfallFlowBody() {
</div> </div>
<div className="body"> <div className="body">
{list?.map((item, index) => ( {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 <div
className={`item-ranking ${index === 0 ? "one" : ""} ${ className={`item-ranking ${index === 0 ? "one" : ""} ${
index === 1 ? "two" : "" index === 1 ? "two" : ""
...@@ -393,9 +416,11 @@ export default function WaterfallFlowBody() { ...@@ -393,9 +416,11 @@ export default function WaterfallFlowBody() {
{item.tenderContent} {item.tenderContent}
<div className="label-bottom">{item.tenderPrice}</div> <div className="label-bottom">{item.tenderPrice}</div>
</div> </div>
<div className="item-right"> <div className="item-right" onClick={()=>handleTenderApply(item)}>
<div className="left">{`${item.tenderPrice}W`}</div> {
<div className="right">申请合作</div> item.apply ? <div>已申请</div> : <><div className="left">{`${item.tenderPrice}W`}</div>
<div className="right">申请合作</div></>
}
</div> </div>
</div> </div>
))} ))}
......
pages/home/waterfallFlowBody/styled.tsx
...@@ -162,6 +162,7 @@ export const Box = styled.div` ...@@ -162,6 +162,7 @@ export const Box = styled.div`
align-items: center; align-items: center;
padding: 0 23px 0 19px; padding: 0 23px 0 19px;
height: 32px; height: 32px;
cursor: pointer;
.item-ranking { .item-ranking {
color: #9295a3; color: #9295a3;
&.one { &.one {
...@@ -282,6 +283,7 @@ export const Box = styled.div` ...@@ -282,6 +283,7 @@ export const Box = styled.div`
height: 22px; height: 22px;
background: url(${button.src}) no-repeat; background: url(${button.src}) no-repeat;
background-size: contain; background-size: contain;
cursor: pointer;
.left { .left {
width: 35px; width: 35px;
height: 22px; height: 22px;
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论