+
+ {/*
*/}
+
-
{renderBuyBtn()}
+
+
+
{renderLines()}
+
{renderNew()}
+ {renderCharge()}
+
+
-
+
{renderBuyBtn()}
+
+
)
}
\ No newline at end of file
diff --git a/src/components/card/card-proj-type.css b/src/components/card/card-proj-type.css
index 6acec92..05a1762 100644
--- a/src/components/card/card-proj-type.css
+++ b/src/components/card/card-proj-type.css
@@ -4,6 +4,7 @@
/* position: relative; */
/* background-color: rgb(255, 255, 255); */
margin-left: 28px;
+ /* margin-top: 0; */
}
.seruseImg {
@@ -20,24 +21,65 @@
}
.proj .proj-head {
- font-weight: bold;
- font-size: 30px;
- color: #492800;
- text-align: center;
+
/* background-image: url('./proj-card-head-bg.png'); */
/* background-size: 100% 100%; */
/* background-repeat: no-repeat; */
/* position: absolute; */
width: 100%;
/* height: 132px; */
- line-height: 100px;
+ /* line-height: 100px; */
/* left: 38px; */
/* top: -4px; */
/* background-color: aqua; */
}
+.head-box{
+ /* cursor: pointer; */
+ font-weight: bold;
+ font-size: 30px;
+ color: #492800;
+ text-align: center;
+ /* background-color: pink; */
+ line-height: 60px;
+ margin-top: 10px;
+}
+.detail-box{
+ padding: 0 18px;
+ /* background-color: skyblue; */
+
+ /* padding: 10px; */
+ box-sizing: border-box;
+ height: 40px;
+ font-size: 12px;
+ /* text-align: center; */
+ color: rgb(167, 167, 167);
+ /* margin-bottom: 10px; */
+}
+.detail-text{
+ background-color: #FFFBEF;
+ display: flex;
+ align-items: center;
+ height: 40px;
+ padding: 0 10px;
+ border-radius: 5px;
+ color: #FFAF22;
+ position: relative;
+
+}
+.triangle {
+ position: absolute;
+ top: -10px;
+ left: calc(50% - 5px);
+ width: 0;
+ height: 0;
+ border-left: 10px solid transparent;
+ border-right: 10px solid transparent;
+ border-bottom: 10px solid #FFFBEF; /* 87px 是一个正三角形的高度 */
+}
.proj .proj-body {
+ margin-top: 5px;
/* min-height: 385px; */
margin-bottom: 15px;
/* padding: 60px 15px 15px 15px; */
@@ -71,10 +113,10 @@
.proj .proj-body .line .line-content ul li {
display: flex;
align-items: center;
- margin-top: 15px;
+ margin-top: 8px;
font-family: PingFang SC;
font-weight: 500;
- font-size: 18px;
+ font-size: 14px;
color: #6F6F6F;
margin-left: 48px;
}
@@ -84,21 +126,21 @@
}
.proj .proj-body .line .line-content ul li .index {
- width: 20px;
- height: 20px;
- line-height: 20px;
+ width: 15px;
+ height: 15px;
+ line-height: 15px;
border-radius: 50%;
display: inline-block;
/* background-color: rgba(251, 176, 59, 1); */
background: #F38F1E;
text-align: center;
color: var(--color-light);
- font-size: 12px;
+ font-size: 10px;
}
.proj .proj-body .line .line-content ul li .newIndex img {
- width: 26px;
- height: 20px;
+ width: 16px;
+ height: 12px;
}
.proj .proj-body .line .line-content ul li .title {
@@ -133,7 +175,7 @@
.chargeCon {
font-weight: 500;
- font-size: 18px;
+ font-size: 14px;
color: #989898;
}
@@ -210,4 +252,24 @@
.proj-foot .buy-btn:nth-child(2) {
/* background-color: red; */
margin-left: 9px;
-}
\ No newline at end of file
+}
+/* 注释 */
+.notes-text{
+ position: relative;
+}
+.notes-box{
+ position: absolute;
+ padding: 5px;
+ box-sizing: border-box;
+ width: 250px;
+ top: 20px;
+ left: 0;
+ background-color: rgb(241, 241, 241);
+ border: 1px solid rgb(212, 212, 212);
+ display: none;
+ border-radius: 5px;
+ z-index: 9;
+}
+.notes-text:hover .notes-box{
+ display: block;
+}
diff --git a/src/components/list/ListProj.tsx b/src/components/list/ListProj.tsx
index d2d5c57..9db2d0b 100644
--- a/src/components/list/ListProj.tsx
+++ b/src/components/list/ListProj.tsx
@@ -30,6 +30,7 @@ export default function ListProj() {
// }
const keywords = state ? state.keyword : ''
const name = state ? state.name : ''
+ const chargeAdditionals = state? state.chargeAdditionals:''
// console.log(keywords);
// const images = [syminga,symingb,symingc,symingd]
const listProjRef: MutableRefObject
= useRef(null);
@@ -57,6 +58,7 @@ export default function ListProj() {
rows: 10,
keywords: keywords,
charge: name,
+ chargeAdditionals:chargeAdditionals,
projCategoryId: indexListContext.category,
status: indexListContext.status ? indexListContext.status : getMenuActive()
}
@@ -154,7 +156,7 @@ export default function ListProj() {
setTimeout(() => {
setShowPage(true)
}, 0);
- }, [indexListContext.status, keywords, name])
+ }, [indexListContext.status, keywords, name,chargeAdditionals])
useEffect(() => {
if (indexListContext.categorys) {
diff --git a/src/components/payment/Payment.tsx b/src/components/payment/Payment.tsx
index d1f8abb..493ddf0 100644
--- a/src/components/payment/Payment.tsx
+++ b/src/components/payment/Payment.tsx
@@ -135,6 +135,8 @@ export default function Payment(props: IPaymentProps) {
setIsLoading(true);
},
onSuccess({ data }) {
+ // console.log('用户id',data.accountRechargeId);
+
setAccountRechargeId(data.accountRechargeId);
setThirdPartyPayUrl(data.thirdPartyPayUrl);
countdown();
@@ -210,27 +212,27 @@ export default function Payment(props: IPaymentProps) {
{
- form.setFieldValue('rechargeMoney', '100');
+ form.setFieldValue('rechargeMoney', 100);
setIsRechargeMoneyEdit(false)
getPay()
}} color="volcano">100
{
- form.setFieldValue('rechargeMoney', '200');
+ form.setFieldValue('rechargeMoney', 200);
setIsRechargeMoneyEdit(false)
getPay()
}} color="volcano">200
{
- form.setFieldValue('rechargeMoney', '300');
+ form.setFieldValue('rechargeMoney', 300);
setIsRechargeMoneyEdit(false)
getPay()
}} color="volcano">300
{
- form.setFieldValue('rechargeMoney', '400');
+ form.setFieldValue('rechargeMoney', 400);
setIsRechargeMoneyEdit(false)
getPay()
}} color="volcano">400
{
- form.setFieldValue('rechargeMoney', '500');
+ form.setFieldValue('rechargeMoney', 500);
setIsRechargeMoneyEdit(false)
getPay()
}} color="volcano">500
diff --git a/src/components/payment/payment.css b/src/components/payment/payment.css
index 25850e9..cec7df2 100644
--- a/src/components/payment/payment.css
+++ b/src/components/payment/payment.css
@@ -51,5 +51,4 @@
}
.moneyBox {
display: flex;
- flex-wrap: ;
}
diff --git a/src/components/user/UserEdit.tsx b/src/components/user/UserEdit.tsx
index 9c2f4a9..bbd86be 100644
--- a/src/components/user/UserEdit.tsx
+++ b/src/components/user/UserEdit.tsx
@@ -1,43 +1,53 @@
import {
Button,
Col,
- DatePicker, Flex,
+ // DatePicker,
+ Flex,
Form,
- GetProp,
+ // GetProp,
Input,
message,
Radio,
Row,
- Spin,
- Upload,
+ // Spin,
+ // Upload,
UploadFile,
- UploadProps
+ // UploadProps
} from "antd";
-import {DevUserId, downloadUrl, get, uploadImageUrl} from "../../util/AjaxUtils.ts";
-import {useEffect, useState} from "react";
-import locale from "antd/es/date-picker/locale/zh_CN";
-import dayjs, {Dayjs} from "dayjs";
+import {
+ // DevUserId,
+ downloadUrl, get,
+ // uploadImageUrl
+ } from "../../util/AjaxUtils.ts";
+import { useEffect, useState } from "react";
+// import locale from "antd/es/date-picker/locale/zh_CN";
+// import dayjs, { Dayjs } from "dayjs";
type FormDataType = {
userId: string;
userInfoId: string;
userInfoType: string;
userInfoName: string;
- idCardType: string;
- idCardNumber: string;
- idCardFront: string;
- idCardBack: string;
- idCardStartDate: Dayjs;
- idCardEndDate: Dayjs;
- legalPerson: string;
- establishDate: Dayjs;
- contactAddress: string;
- contactPhone: string;
+ contactPhone:string;
+ idCardType?:string;
+ userInfoNameEn?:string
+ contactName?:string
+ idCardNumber?:string
+ // idCardType: string;
+ // idCardNumber: string;
+ // idCardFront: string;
+ // idCardBack: string;
+ // idCardStartDate: Dayjs;
+ // idCardEndDate: Dayjs;
+ // legalPerson: string;
+ // establishDate: Dayjs;
+ // contactAddress: string;
+ // contactPhone: string;
}
-type FileType = Parameters
>[0];
+// type FileType = Parameters>[0];
-const dateFormat = 'YYYY年MM月DD日';
+// const dateFormat = 'YYYY年MM月DD日';
export interface IUserEditProps {
@@ -51,37 +61,41 @@ export default function UserEdit(props: IUserEditProps) {
const [userInfoType, setUserInfoType] = useState('PERSONAL');
const [idCardFrontImgArray, setIdCardFrontImgArray] = useState([]);
const [idCardBackImgArray, setIdCardBackImgArray] = useState([]);
- const [loading, setLoading] = useState(false);
+ // const [loading, setLoading] = useState(false);
- const beforeUpload = (file: FileType) => {
- const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png';
- if (!isJpgOrPng) {
- message.error('只能上传 JPG/PNG 格式文件!');
- return;
- }
- return isJpgOrPng;
- };
+ // const beforeUpload = (file: FileType) => {
+ // const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png';
+ // if (!isJpgOrPng) {
+ // message.error('只能上传 JPG/PNG 格式文件!');
+ // return;
+ // }
+ // return isJpgOrPng;
+ // };
useEffect(() => {
get({
messageApi,
url: 'api/user-info/get-self',
- onSuccess({data}) {
+ onSuccess({ data }) {
+ // console.log('证件号',data.idCardNumber);
+
form.setFieldsValue({
userId: data.userId,
userInfoId: data.userInfoId,
userInfoName: data.userInfoName,
userInfoType: data.userInfoType,
- contactAddress: data.contactAddress,
+ // contactAddress: data.contactAddress,
contactPhone: data.contactPhone,
- establishDate: data.establishDate ? dayjs(data.establishDate, 'YYYY-MM-DD') : '',
+ // establishDate: data.establishDate ? dayjs(data.establishDate, 'YYYY-MM-DD') : '',
idCardNumber: data.idCardNumber,
- idCardFront: data.idCardFront,
- idCardStartDate: data.idCardStartDate ? dayjs(data.idCardStartDate, 'YYYY-MM-DD') : '',
- idCardBack: data.idCardBack,
- idCardEndDate: data.idCardEndDate ? dayjs(data.idCardEndDate, 'YYYY-MM-DD') : '',
+ // idCardFront: data.idCardFront,
+ // idCardStartDate: data.idCardStartDate ? dayjs(data.idCardStartDate, 'YYYY-MM-DD') : '',
+ // idCardBack: data.idCardBack,
+ // idCardEndDate: data.idCardEndDate ? dayjs(data.idCardEndDate, 'YYYY-MM-DD') : '',
idCardType: data.idCardType,
- legalPerson: data.legalPerson,
+ userInfoNameEn:data.userInfoNameEn,
+ contactName:data.contactName
+ // legalPerson: data.legalPerson,
})
if (data.idCardFront) {
const url = downloadUrl(data.idCardFront);
@@ -120,27 +134,55 @@ export default function UserEdit(props: IUserEditProps) {
layout="vertical"
form={form}
onFinish={() => {
- props.handleConfirm({
- userId: form.getFieldValue('userId'),
- userInfoId: form.getFieldValue('userInfoId'),
- userInfoName: form.getFieldValue('userInfoName'),
- userInfoType: form.getFieldValue('userInfoType'),
- contactAddress: form.getFieldValue('contactAddress'),
- contactPhone: form.getFieldValue('contactPhone'),
- establishDate: form.getFieldValue('establishDate') ? form.getFieldValue('establishDate').format(dateFormat) : '',
- idCardBack: form.getFieldValue('idCardBack'),
- idCardEndDate: form.getFieldValue('idCardEndDate') ? form.getFieldValue('idCardEndDate').format(dateFormat) : '',
- idCardFront: form.getFieldValue('idCardFront'),
- idCardNumber: form.getFieldValue('idCardNumber'),
- idCardStartDate: form.getFieldValue('idCardStartDate') ? form.getFieldValue('idCardStartDate').format(dateFormat) : '',
- idCardType: form.getFieldValue('idCardType'),
- legalPerson: form.getFieldValue('legalPerson'),
- });
+ if(userInfoType == 'PERSONAL'){
+ props.handleConfirm({
+ userId: form.getFieldValue('userId'),
+ userInfoId: form.getFieldValue('userInfoId'),
+ userInfoName: form.getFieldValue('userInfoName'),
+ contactPhone:form.getFieldValue('contactPhone'),
+ userInfoType: form.getFieldValue('userInfoType'),
+ // userInfoType: form.getFieldValue('userInfoType'),
+ // contactAddress: form.getFieldValue('contactAddress'),
+ // contactPhone: form.getFieldValue('contactPhone'),
+ // establishDate: form.getFieldValue('establishDate') ? form.getFieldValue('establishDate').format(dateFormat) : '',
+ // idCardBack: form.getFieldValue('idCardBack'),
+ // idCardEndDate: form.getFieldValue('idCardEndDate') ? form.getFieldValue('idCardEndDate').format(dateFormat) : '',
+ // idCardFront: form.getFieldValue('idCardFront'),
+ // idCardNumber: form.getFieldValue('idCardNumber'),
+ // idCardStartDate: form.getFieldValue('idCardStartDate') ? form.getFieldValue('idCardStartDate').format(dateFormat) : '',
+ // idCardType: form.getFieldValue('idCardType'),
+ // legalPerson: form.getFieldValue('legalPerson'),
+ });
+ }else{
+ props.handleConfirm({
+ userId: form.getFieldValue('userId'),
+ userInfoId: form.getFieldValue('userInfoId'),
+ userInfoName: form.getFieldValue('userInfoName'),
+ contactName:form.getFieldValue('contactName'),
+ contactPhone:form.getFieldValue('contactPhone'),
+ idCardType:form.getFieldValue('idCardType'),
+ userInfoType: form.getFieldValue('userInfoType'),
+ userInfoNameEn:form.getFieldValue('userInfoNameEn'),
+ idCardNumber:form.getFieldValue('idCardNumber'),
+ // userInfoType: form.getFieldValue('userInfoType'),
+ // contactAddress: form.getFieldValue('contactAddress'),
+ // contactPhone: form.getFieldValue('contactPhone'),
+ // establishDate: form.getFieldValue('establishDate') ? form.getFieldValue('establishDate').format(dateFormat) : '',
+ // idCardBack: form.getFieldValue('idCardBack'),
+ // idCardEndDate: form.getFieldValue('idCardEndDate') ? form.getFieldValue('idCardEndDate').format(dateFormat) : '',
+ // idCardFront: form.getFieldValue('idCardFront'),
+ // idCardNumber: form.getFieldValue('idCardNumber'),
+ // idCardStartDate: form.getFieldValue('idCardStartDate') ? form.getFieldValue('idCardStartDate').format(dateFormat) : '',
+ // idCardType: form.getFieldValue('idCardType'),
+ // legalPerson: form.getFieldValue('legalPerson'),
+ });
+ }
+
}}
>
{
setUserInfoType(e.target.value);
@@ -155,48 +197,123 @@ export default function UserEdit(props: IUserEditProps) {
企业
-
-
-
+
+ */}
{
userInfoType == 'PERSONAL' ? (
-
-
- 身份证
-
-
+ <>
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {/*
+
+ 身份证
+
+
+
+
+ */}
+ >
) : <>>
}
{
userInfoType == 'ENTERPRISE' ? (
-
-
- 组织机构代码证
-
-
+ <>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 统一社会信用代码
+
+
+
+
+
+ (注:此处信息在后期软著制作中会用到,建议认真填写)
+
+ >
) : <>>
}
-
-
-
-
+
+
+ {/*
{
if (info.file.status === 'uploading') {
@@ -237,17 +354,17 @@ export default function UserEdit(props: IUserEditProps) {
}}
>
+ style={{ backgroundColor: 'var(--color-primary)' }}
+ disabled={idCardFrontImgArray.length > 0}>上传
-
- {
+ */}
+ {/* {
userInfoType == 'PERSONAL' ? (
{
if (info.file.status === 'uploading') {
@@ -288,25 +405,25 @@ export default function UserEdit(props: IUserEditProps) {
}}
>
+ style={{ backgroundColor: 'var(--color-primary)' }}
+ disabled={idCardBackImgArray.length > 0}>上传
) : <>>
}
-
-
+
*/}
+ {/*
label="证件开始时间"
name="idCardStartDate"
- rules={[{required: true, message: '请选择证件开始时间'}]}
+ // rules={[{ required: true, message: '请选择证件开始时间' }]}
>
@@ -314,72 +431,72 @@ export default function UserEdit(props: IUserEditProps) {
label="证件结束时间"
name="idCardEndDate"
- rules={[{required: true, message: '请选择证件结束时间'}]}
+ // rules={[{ required: true, message: '请选择证件结束时间' }]}
>
-
- {
+
*/}
+ {/* {
userInfoType == 'ENTERPRISE' ? (
-
+
label="成立时间"
name="establishDate"
- rules={[{required: true, message: '请选择成立时间'}]}
+ // rules={[{ required: true, message: '请选择成立时间' }]}
>
) : <>>
- }
-
-
+ } */}
+ {/*
+
-
+
-
-
+ */}
+ {/*
-
-
-
+ */}
+ {/*
*/}
+
-
-
+
+ {/* */}
{contextHolder}
>
)
diff --git a/src/interfaces/proj/ICardProj.ts b/src/interfaces/proj/ICardProj.ts
index ede4c3c..289534e 100644
--- a/src/interfaces/proj/ICardProj.ts
+++ b/src/interfaces/proj/ICardProj.ts
@@ -17,7 +17,8 @@ export interface ICardProjBuy {
handleClick(title: string, additional: {
pkg: boolean,
- videoDemo: boolean
+ videoDemo: boolean,
+ urgent:boolean
}): void;
}
@@ -28,5 +29,6 @@ export interface ICardProj {
buyArray: ICardProjBuy[];
newArray:ICardProjBodyLine[];
isShow:number
- isClickable:number
+ isClickable:number,
+ details:string
}
\ No newline at end of file
diff --git a/src/interfaces/proj/IProj.ts b/src/interfaces/proj/IProj.ts
index a110960..06da0d4 100644
--- a/src/interfaces/proj/IProj.ts
+++ b/src/interfaces/proj/IProj.ts
@@ -30,7 +30,8 @@ export enum ProjChargeType {
export enum ProjAdditionalType {
PKG = 'PKG',
- VIDEO_DEMO = 'VIDEO_DEMO'
+ VIDEO_DEMO = 'VIDEO_DEMO',
+ URGENT = 'URGENT'
}
export interface IProjCharge {
diff --git a/src/layout/head/Head.tsx b/src/layout/head/Head.tsx
index eb75c75..5e73c98 100644
--- a/src/layout/head/Head.tsx
+++ b/src/layout/head/Head.tsx
@@ -36,22 +36,22 @@ export default function Head() {
authorId: '',
authorProvinceCity: ''
})
-
+
const setValue = () => {
// console.log(value);
}
- const setConcatValue = ()=> {
-
+ const setConcatValue = () => {
+
}
// 联系人弹窗
const [contactModal, setContactModal] = useState(false)
- const [concatPeopleInfo,setConcatPeopleInfo] = useState({
- applyConcatId:'',
- applyContactCsaNo:'',
- applyContactEmail:'',
- applyContactName:'',
- applyContactPhone:'',
- applyContactCompany:''
+ const [concatPeopleInfo, setConcatPeopleInfo] = useState({
+ applyConcatId: '',
+ applyContactCsaNo: '',
+ applyContactEmail: '',
+ applyContactName: '',
+ applyContactPhone: '',
+ applyContactCompany: ''
})
useEffect(() => {
reloadUser(messageApi, globalDispatchContext).then((data) => {
@@ -152,7 +152,7 @@ export default function Head() {
{/* */}
-
{
+
{
window.open('https://www.aimzhu.com/operator/route/agreementportal/view?agreementId=c0c5683a-bef3-40c3-8395-900a362ea234&title=系统操作流程')
}}>
系统操作流程
@@ -178,14 +178,17 @@ export default function Head() {
{
- if (!globalContext.user.hasUserInfo) {
+ if (!globalContext.user.hasUserInfo ) {
messageApi.info('请完善个人信息');
return;
}
setIsSelfModalOpen(false)
+ // console.log('用户信息',globalContext.user.hasUserInfo);
+
}}>
{
modal.confirm({
@@ -289,7 +292,7 @@ export default function Head() {
}}>
- {setContactModal(false)} } setConcatPeopleInfo={setConcatPeopleInfo} concatPeopleInfo={concatPeopleInfo} setConcatValue={setConcatValue}>
+ { setContactModal(false) }} setConcatPeopleInfo={setConcatPeopleInfo} concatPeopleInfo={concatPeopleInfo} setConcatValue={setConcatValue}>
{contextHolder}
diff --git a/src/route/index/Index.tsx b/src/route/index/Index.tsx
index 4ec9b5b..7f0a065 100644
--- a/src/route/index/Index.tsx
+++ b/src/route/index/Index.tsx
@@ -32,6 +32,7 @@ export default function Index() {
// 关键字
const [keywords, setKeywords] = useState('');
const [type, setType] = useState('')
+ const [chargeAdditionals,setchargeAdditionals] = useState('')
// const indexListContext = useContext(IndexListContext);
@@ -348,7 +349,9 @@ export default function Index() {
nav('/home', {
state: {
keyword: value,
- name: type
+ name: type,
+ chargeAdditionals:chargeAdditionals,
+
}
})
}
@@ -359,7 +362,8 @@ export default function Index() {
nav('/home', {
state: {
keyword: '',
- name: type
+ name: type,
+ chargeAdditionals:chargeAdditionals,
}
})
}
@@ -441,6 +445,7 @@ export default function Index() {
nav('/home', {
state: {
keyword: keywords,
+ chargeAdditionals:chargeAdditionals,
name: value
}
})
@@ -454,6 +459,32 @@ export default function Index() {
]}
defaultValue=""
// placeholder={'选择类型'}
+ />
+