From c178908cded3cb58df271c5cfffe906f2ad09bcb Mon Sep 17 00:00:00 2001 From: lyp Date: Thu, 22 May 2025 17:59:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/AiShopDetail/AiShopDetail.tsx | 11 +- src/components/BelongPeople/BelongPeople.tsx | 75 ++- src/route/Correction/Correction.tsx | 42 +- src/route/ProductRelease/ProductRelease.tsx | 11 +- .../components/EditModal/EditModal.tsx | 81 ++- src/route/TradingGoods/TradingGoods.tsx | 75 ++- src/route/proj/ProjCreate.tsx | 6 +- src/route/proj/ProjNew.tsx | 572 +++++++++++------- src/route/proj/proj-new.css | 4 +- 9 files changed, 611 insertions(+), 266 deletions(-) diff --git a/src/components/AiShopDetail/AiShopDetail.tsx b/src/components/AiShopDetail/AiShopDetail.tsx index 36550f8..55bca6c 100644 --- a/src/components/AiShopDetail/AiShopDetail.tsx +++ b/src/components/AiShopDetail/AiShopDetail.tsx @@ -45,14 +45,15 @@ export default function AiShopDetail(props: any) { setLoading(false) } } + const [disabled, setDisabled] = useState(false) // 购买按钮是否禁用 // 创建订单 const createOrderFun = async (goodsId: string) => { try { + setDisabled(true) // setPayLoading(true) const res: any = await createOrder(goodsId) // console.log(res); confirmPaymentFun(res.data) - } catch (error: any) { if (error.response) { @@ -69,6 +70,7 @@ export default function AiShopDetail(props: any) { // 确认支付 const confirmPaymentFun = async (orderId: string) => { try { + setDisabled(true) // setLoading(true) const res: any = await confirmPayment(orderId) console.log(res); @@ -80,6 +82,8 @@ export default function AiShopDetail(props: any) { setBuyTipsModal(false) props.closeModal() props.upData() + setDisabled(false) + }, 1000) // props.closeModal() // props.upData() @@ -319,6 +323,7 @@ export default function AiShopDetail(props: any) { }); } }} + >购买 @@ -331,9 +336,13 @@ export default function AiShopDetail(props: any) { onCancel={() => { setBuyTipsModal(false) }} + // 禁用确定按钮 + okButtonProps={{ disabled: disabled }} onOk={() => { // alert(goodsId) // alert(props.orderId) + // 按钮禁用 + if (props.orderId) { confirmPaymentFun(props.orderId) diff --git a/src/components/BelongPeople/BelongPeople.tsx b/src/components/BelongPeople/BelongPeople.tsx index 0d37278..1cbc25e 100644 --- a/src/components/BelongPeople/BelongPeople.tsx +++ b/src/components/BelongPeople/BelongPeople.tsx @@ -65,8 +65,10 @@ type propsInfo = { setValue?: any isShow?: boolean closeModal?: any + showNow?: boolean }; export default function BelongPeople(props: propsInfo) { + const showNow = props.showNow == false?false:true // const [propsShow,setPropsShow] = useState(props.belongPeopleInfo.authorId?true) // const nav = useNavigate(); // const pathParams = useParams(); @@ -414,7 +416,10 @@ export default function BelongPeople(props: propsInfo) { setAreaArray(options); // console.log('省市2', options); }); - + // console.log('嘻嘻嘻',props.showNow); + // console.log(showNow); + + }, []) return ( @@ -527,15 +532,18 @@ export default function BelongPeople(props: propsInfo) { /> */} -
- {authorName ? (<> -
-
当前所属者:
-
请选择所属者
-
- {authorName}/{authorType == 'PERSONAL' ? '自然人' : '企业-组织'}/{authorIdCardType == 'ID_CARD' ? '身份证' : '营业执照'}/{authorIdCard} -
- {/* */} -
- ) : (<> -
-
当前所属者:
-
请选择所属者
-
- {props.belongPeopleInfo.authorName}/{props.belongPeopleInfo.authorType == 'PERSONAL' ? '自然人' : '企业-组织'}/{props.belongPeopleInfo.authorIdCardType == 'ID_CARD' ? '身份证' : '营业执照'}/{props.belongPeopleInfo.authorIdCard}
- + ) : (<> +
+
当前所属者:
+
请选择所属者
+
+ {props.belongPeopleInfo.authorName}/{props.belongPeopleInfo.authorType == 'PERSONAL' ? '自然人' : '企业-组织'}/{props.belongPeopleInfo.authorIdCardType == 'ID_CARD' ? '身份证' : '营业执照'}/{props.belongPeopleInfo.authorIdCard} +
+ -
- )} +
+ )} +
diff --git a/src/route/Correction/Correction.tsx b/src/route/Correction/Correction.tsx index 2b0cb48..cb1841a 100644 --- a/src/route/Correction/Correction.tsx +++ b/src/route/Correction/Correction.tsx @@ -7,7 +7,8 @@ import { // Tag, message, Spin, Empty, - Dropdown + Dropdown, + Button } from 'antd'; // import { // // MenuFoldOutlined, @@ -1065,6 +1066,7 @@ export default function Correction() { {item.correctionType == 'CODE' ? '代码' : item.correctionType == 'MANUAL' ? '操作手册' : item.correctionType == 'ALL' ? '全部补正' : ''}
+
@@ -1133,6 +1135,44 @@ export default function Correction() { }) }
+ + +
diff --git a/src/route/ProductRelease/ProductRelease.tsx b/src/route/ProductRelease/ProductRelease.tsx index 625a438..d513d5e 100644 --- a/src/route/ProductRelease/ProductRelease.tsx +++ b/src/route/ProductRelease/ProductRelease.tsx @@ -130,16 +130,19 @@ export default function ProductRelease() { setData((prevData: any) => { return prevData.map((dataItem: any) => { - if (dataItem.goodsId === sellId) { + if (dataItem.goodsId == offId) { return { ...dataItem, goodsStatus: 0 + }; } return dataItem; }); }) + // console.log('setData', data); + setOffModalOpen(false) messageApi.open({ type: 'success', @@ -177,7 +180,7 @@ export default function ProductRelease() { if (dataItem.goodsId === sellId) { return { ...dataItem, - goodsStatus: '1' + goodsStatus: 1 }; } return dataItem; @@ -521,7 +524,7 @@ export default function ProductRelease() {
- {/*
*/} { setEditModalOpen(false) }} diff --git a/src/route/ProductRelease/components/EditModal/EditModal.tsx b/src/route/ProductRelease/components/EditModal/EditModal.tsx index 5a810ca..f888628 100644 --- a/src/route/ProductRelease/components/EditModal/EditModal.tsx +++ b/src/route/ProductRelease/components/EditModal/EditModal.tsx @@ -13,6 +13,8 @@ import { UploadFile, Image } from "antd"; +import { get } from '../../../../util/AjaxUtils' +import BelongPeople from '../../../../components/BelongPeople/BelongPeople.tsx' import { ArrowRightOutlined } from '@ant-design/icons'; @@ -50,6 +52,34 @@ interface Option { } type FileType = Parameters>[0]; export default function EditModal(props: any) { + const showNow = false + const [belongModal, setBelongModal] = useState(false) + const [belongPeopleInfo, setBelongPeopleInfo] = useState({ + authorName: '', + authorType: '', + authorIdCardType: '', + authorIdCard: '', + authorCrcAccount: 0, + authorId: '', + authorProvinceCity: '', + authorCrcAccountPassword: '', + authorCrcAccountUsername: '' + }) + const setValue = (value: string) => { + form.setFieldsValue({ + peopleName: value + }) + } + useEffect(() => { + console.log(belongPeopleInfo); + form.setFieldsValue({ + peopleClass: belongPeopleInfo.authorType == '' ? null : belongPeopleInfo.authorType == 'PERSONAL' ? '1' : belongPeopleInfo.authorType == 'ORGANIZATION' ? '2' : null, + // 如果belongPeopleInfo.authorIdCardType == 'ID_CARD',则papersType的值是certificateTypeList中;lale为居民身份证的那个value 如果belongPeopleInfo.authorIdCardType == 'BUSINESS_LICENSE',则papersType的值是certificateTypeList中;lale为统一信用代码证的那个value 如果为空的话值为null + papersType: belongPeopleInfo.authorIdCardType == ''? null : belongPeopleInfo.authorIdCardType == 'ID_CARD'? certificateTypeList.find((item:any) => item.label == '居民身份证')?.value : belongPeopleInfo.authorIdCardType == 'BUSINESS_LICENSE'? certificateTypeList.find((item:any) => item.label == '统一信用代码证')?.value : null, + papersNum: belongPeopleInfo.authorIdCard, + + }) + }, [belongPeopleInfo]) const token = sessionStorage.getItem('token') const [startTime, setStartTime] = useState(undefined); useEffect(() => { @@ -128,7 +158,7 @@ export default function EditModal(props: any) { goodsName: '',// 软件名称 // goodsNumber: '',// 软著编号 goodsPrice: 0,// 软著价格 - goodsPhoto: '',// 软著图片 + goodsLocalPhoto: '',// 软著图片 // goodsSubName: '',// 软著简称 goodsType: '',// 软著类型 // goodsVersion: '',// 软著版本 @@ -211,6 +241,18 @@ export default function EditModal(props: any) { // console.log('省市2', options); // }); getProvinceListDate() + get({ + messageApi, + url: 'api/user-info/get-self', + onSuccess({ data }) { + // console.log('个人信息', data); + // 给表单peoplePhone赋值 + form.setFieldsValue({ + peoplePhone: data.contactPhone, + + }) + } + }) }, []) // 加载城市列表 const loadCityList = async (selectedOptions: Option[]) => { @@ -271,7 +313,7 @@ export default function EditModal(props: any) { form.setFieldsValue({ name: res.goodsName, smallname: res.goodsSubName, - imageUrl: res.goodsPhoto, + imageUrl: res.goodsLocalPhoto, number: res.goodsNumber, sv: res.goodsVersion, textArea: res.goodsDescription, @@ -294,11 +336,11 @@ export default function EditModal(props: any) { setStartTime(moment(res.goodsGetTime)) // 给logoImgArray赋值 logoImgArray.splice(0, 1, { - uid: res.goodsPhoto, + uid: res.goodsLocalPhoto, name: 'xixi.png', status: 'done', - url: showImage(res.goodsPhoto, false), - thumbUrl: showImage(res.goodsPhoto, false), + url: showImage(res.goodsLocalPhoto, false), + thumbUrl: showImage(res.goodsLocalPhoto, false), }) } catch (error: any) { @@ -437,6 +479,8 @@ export default function EditModal(props: any) { label: item.dataName, } })) + + } catch (error: any) { if (error.response) { @@ -480,6 +524,7 @@ export default function EditModal(props: any) {
著作权人信息
+
@@ -1398,6 +1453,20 @@ export default function EditModal(props: any) { 确定保存吗？
+ { + setBelongModal(false) + + }}> + + { setBelongModal(false) }} setBelongPeopleInfo={setBelongPeopleInfo} belongPeopleInfo={belongPeopleInfo} setValue={setValue} isShow={true}> +
) } diff --git a/src/route/TradingGoods/TradingGoods.tsx b/src/route/TradingGoods/TradingGoods.tsx index 649cc8b..e2f1d6c 100644 --- a/src/route/TradingGoods/TradingGoods.tsx +++ b/src/route/TradingGoods/TradingGoods.tsx @@ -15,6 +15,8 @@ import { Button } from 'antd'; import { showImage } from '../../request/request' +import { get } from '../../util/AjaxUtils.ts' +import BelongPeople from '../../components/BelongPeople/BelongPeople.tsx' import AiShopDetail from '../../components/AiShopDetail/AiShopDetail' import { GlobalDispatchContext, reloadUser } from "../../context/GlobalContext.ts"; // import type { TableColumnsType } from 'antd'; @@ -38,6 +40,35 @@ interface Option { // pId: string; } export default function TradingGoods() { + + const showNow = false + const [belongModal, setBelongModal] = useState(false) + const [belongPeopleInfo, setBelongPeopleInfo] = useState({ + authorName: '', + authorType: '', + authorIdCardType: '', + authorIdCard: '', + authorCrcAccount: 0, + authorId: '', + authorProvinceCity: '', + authorCrcAccountPassword: '', + authorCrcAccountUsername: '' + }) + useEffect(() => { + console.log(belongPeopleInfo); + form.setFieldsValue({ + buyType: belongPeopleInfo.authorType == '' ? null : belongPeopleInfo.authorType == 'PERSONAL' ? '1' : belongPeopleInfo.authorType == 'ORGANIZATION' ? '2' : null, + // 如果belongPeopleInfo.authorIdCardType == 'ID_CARD',则papersType的值是certificateTypeList中;lale为居民身份证的那个value 如果belongPeopleInfo.authorIdCardType == 'BUSINESS_LICENSE',则papersType的值是certificateTypeList中;lale为统一信用代码证的那个value 如果为空的话值为null + buyIdcardType: belongPeopleInfo.authorIdCardType == '' ? null : belongPeopleInfo.authorIdCardType == 'ID_CARD' ? certificateTypeList.find((item: any) => item.label == '居民身份证')?.value : belongPeopleInfo.authorIdCardType == 'BUSINESS_LICENSE' ? certificateTypeList.find((item: any) => item.label == '统一信用代码证')?.value : null, + buyIdcard: belongPeopleInfo.authorIdCard, + + }) + }, [belongPeopleInfo]) + const setValue = (value: string) => { + form.setFieldsValue({ + buyName: value + }) + } const globalDispatchContext = useContext(GlobalDispatchContext); const [areaArray, setAreaArray] = useState([]); const getProvinceListDate = async () => { @@ -217,6 +248,18 @@ export default function TradingGoods() { useEffect(() => { getProvinceListDate() getCertificateTypeListDate() + get({ + messageApi, + url: 'api/user-info/get-self', + onSuccess({ data }) { + // console.log('个人信息', data); + // 给表单peoplePhone赋值 + form.setFieldsValue({ + buyPhone: data.contactPhone, + + }) + } + }) }, []) return ( @@ -411,10 +454,10 @@ export default function TradingGoods() { > 取消订单 - { + { window.open(showImage(record.producePhoto, false)) // console.log(record); - + }} style={{ display: record.orderStatus == '4' ? 'unset' : 'none' @@ -520,6 +563,7 @@ export default function TradingGoods() { destroyOnClose={true} footer={null} open={buyInfoModal} + // open={true} // onOk={() => { // setOrderDetailModal(false) // }} @@ -529,6 +573,19 @@ export default function TradingGoods() { width={700} centered > + + + 注:填写信息提交后无法取消订单 + { + setBelongModal(false) + + }}> + + { setBelongModal(false) }} setBelongPeopleInfo={setBelongPeopleInfo} belongPeopleInfo={belongPeopleInfo} setValue={setValue} isShow={true}> + ) } diff --git a/src/route/proj/ProjCreate.tsx b/src/route/proj/ProjCreate.tsx index 09fbeb8..e60c106 100644 --- a/src/route/proj/ProjCreate.tsx +++ b/src/route/proj/ProjCreate.tsx @@ -274,9 +274,9 @@ export default function ProjCreate() { // nav(`/proj-new/${ProjChargeType.MATERIAL}?${additional.pkg ? 'pkg=true' : 'pkg='}&${additional.videoDemo ? 'videoDemo=true' : 'videoDemo='}&price=${materialInfo.price}`); nav( `/proj-new/${ProjChargeType.MATERIAL}?${additional.pkg ? 'pkg=true' : 'pkg='}&${additional.videoDemo ? 'videoDemo=true' : 'videoDemo='}`, - { - state: { price: materialInfo.price } - } + // { + // state: { price: materialInfo.price } + // } ); } diff --git a/src/route/proj/ProjNew.tsx b/src/route/proj/ProjNew.tsx index 0b7d0c3..3d7e2d0 100644 --- a/src/route/proj/ProjNew.tsx +++ b/src/route/proj/ProjNew.tsx @@ -2,8 +2,8 @@ import './proj-new.css'; import { useNavigate, useParams, useSearchParams } from "react-router-dom"; import { Table, AutoComplete, Button, Flex, Form, Input, message, Modal, Spin, Checkbox, DatePicker, Select } from "antd"; import { useContext, useEffect, useState, useRef } from "react"; -// import { useLocation } from 'react-router-dom'; -import { get, post,getSoftUrl } from "../../util/AjaxUtils.ts"; +import { useLocation } from 'react-router-dom'; +import { get, post, getSoftUrl } from "../../util/AjaxUtils.ts"; // import {GlobalContext} from "../../context/GlobalContext.ts"; import { // IProjCharge, @@ -47,6 +47,8 @@ interface DataType { import { useDispatch, useSelector } from 'react-redux' export default function ProjNew() { + const { state } = useLocation() + const disable = state && state.type == 'copy' ? true : false const dispath = useDispatch() // 更新redux的套餐包信息 const getMyPackNum = () => { @@ -478,7 +480,14 @@ export default function ProjNew() { } }) - + // console.log('嘻嘻嘻',state); + if (state && state.type == 'copy') { + // 给表单复值 + form.setFieldsValue({ + 'projName': '嘻嘻嘻', //全称 + 'contacts': '嘻嘻嘻',//联系人 + }) + } }, []); @@ -520,12 +529,40 @@ export default function ProjNew() { projDevCompleteDate: formData.projDevCompleteDate, projVersion: formData.projVersion ? formData.projVersion : 'V1.0', backendCodeLang: formData.backendCodeLang, - projSubName: formData.projSubName? formData.projSubName : '', + projSubName: formData.projSubName ? formData.projSubName : '', // packageInfoId: formData.packageInfoId?formData.packageInfoId : '', }) }} autoComplete="off" > +
+
+ 换名项目 +
+
+
+
+ 复制项目 +
+
*/}
{ // form.setFieldsValue({ // projName: '嘻嘻' @@ -639,6 +678,7 @@ export default function ProjNew() { position: 'absolute', right: -35, top: 10, + display: disable ? 'none' : 'unset', }}>推荐
- + @@ -684,7 +726,7 @@ export default function ProjNew() { // background: '#eeeeee', }} disabledDate={(current) => current && current > dayjs().endOf('day')} - + disabled={disable} />
@@ -709,44 +751,70 @@ export default function ProjNew() { // { required: true, message: '请选择/创建知识产权所属者' } ]} > - + -
{ - setBelongModal(true) - }}>选择
-
+
{ + setBelongModal(true) + }}>选择
+
{ - setValue('') - setBelongPeopleInfo({ - authorName: '', - authorType: '', - authorIdCardType: '', - authorIdCard: '', - authorCrcAccount: 0, - authorId: '', - authorProvinceCity: '', - authorCrcAccountUsername: '', - authorCrcAccountPassword: '', - }) - }}>取消
+ position: 'absolute', right: 0, + // fontSize: 16, + color: " #1F79FF", + // cursor: 'pointer', + // background:'pink', + width: 310, + + paddingRight: 20, + boxSizing: 'border-box', + + }} > +
{ + setValue('') + setBelongPeopleInfo({ + authorName: '', + authorType: '', + authorIdCardType: '', + authorIdCard: '', + authorCrcAccount: 0, + authorId: '', + authorProvinceCity: '', + authorCrcAccountUsername: '', + authorCrcAccountPassword: '', + }) + }}>取消
+
+
@@ -756,19 +824,30 @@ export default function ProjNew() { name="contacts" rules={[{ required: true, message: '请选择/创建知识产权联系人' }]} > - +
+
{ - setConcatModal(true) - }}>选择
+ }} onClick={() => { + setConcatModal(true) + }}>选择
+
- - -
{ - if (hasCoupon) { - setCouponModal(true) - // #1F79FF - } else { - messageApi.error('无可用优惠券') - } - // if (!selectPack) { - // if (hasCoupon) { - // setCouponModal(true); - // } else { - // messageApi.error('暂无可用优惠券'); - // } - // } else { - // messageApi.error('服务包已选择，不可使用优惠券'); - // } - }}>选择
-
{ - setCouponTitle('') - setCouponId('') - setCouponNum(0) - }}>取消
-
- - {/* 服务包 */}
-
+ +
-
套餐包
+
+ 优惠券 +
- name="packageName" - rules={[ - // { required: true, message: '请选择系统语言' }, - ]} + name="coupon" + // rules={[{ required: true, message: '请选择优惠券' }]} > - {/* 0 ? false : true} style={{ width: '310px', height: '50px', fontSize: '16px', }} placeholder={packList.length > 0 ? '请选择服务包' : '暂无服务包'} @@ -934,68 +1042,95 @@ export default function ProjNew() { }} > */} - 0 ? '请选择套餐包' : '暂无套餐包'} + placeholder={packselectShow ? '请选择套餐包' : '暂无套餐包'} + // disabled + /> + + +
注：已购买套餐包的请选择套餐包支付
+
0 ? '请选择套餐包' : '暂无套餐包'} - placeholder={packselectShow ? '请选择套餐包' : '暂无套餐包'} - disabled - /> + onClick={() => { + if (packList.length > 0) { + setPackModal(true) + setPage(1) + setSelectedRowKeys([]) + getPickList(1) + // #1F79FF + } else { + messageApi.error('无可用套餐包') + } - -
注：已购买套餐包的请选择套餐包支付
-
选择
+
{ - if (packList.length > 0) { - setPackModal(true) - setPage(1) - setSelectedRowKeys([]) - getPickList(1) - // #1F79FF - } else { - messageApi.error('无可用套餐包') - } - }}>选择
-
{ - // setPackageInfoId('') - setPackageOrderId('') - setNowpackageOrderId('') - setNowPackageName('') + > +
{ + // setPackageInfoId('') + setPackageOrderId('') + setNowpackageOrderId('') + setNowPackageName('') - form.setFieldsValue({ - packageName: '' - }) - setSelectPack(false) - // setcouponShow(true) - setcouponShow(true) - // setShowPrice(location.state.price) - }}>取消
+ form.setFieldsValue({ + packageName: '' + }) + setSelectPack(false) + // setcouponShow(true) + setcouponShow(true) + // setShowPrice(location.state.price) + }}>取消
+
+
@@ -1091,7 +1226,8 @@ export default function ProjNew() { }} > {/* {(showPrice / 100 - couponNum) < 0 ? 0 : showPrice / 100 - couponNum} */} - {selectPack ? 0 : (chargePrice / 100 - couponNum) < 0 ? 0 : chargePrice / 100 - couponNum} + {state && state.price ? state.price / 100 : selectPack ? 0 : (chargePrice / 100 - couponNum) < 0 ? 0 : chargePrice / 100 - couponNum} + {/* {selectPack ? 0 : (chargePrice / 100 - couponNum) < 0 ? 0 : chargePrice / 100 - couponNum} */} 元
- - + + { // console.log('最终',listProjChargeAdditional); // console.log(belongPeopleInfo.authorId); + if (state && state.type == 'replace') { + alert('替换项目') + } else { + post({ + messageApi, + url: '/api/proj/create', + body: { + // packageInfoId: projInfo.packageInfoId, + projName: projInfo.projName, + projSubName: projInfo.projSubName, + projVersion: projInfo.projVersion, + backendCodeLang: projInfo.backendCodeLang, + projChargeType: pathParams.projChargeType, + listProjChargeAdditional: listProjChargeAdditional, + // dayjs(formInfo.getFieldValue('projDevCompleteDate')).format(dateFormat), + projDevCompleteDate: projInfo.projDevCompleteDate ? dayjs(projInfo.projDevCompleteDate).format(dateFormat) : '', + authorCrcAccount: belongPeopleInfo.authorCrcAccount, + authorCrcAccountPassword: belongPeopleInfo.authorCrcAccountPassword, + authorCrcAccountUsername: belongPeopleInfo.authorCrcAccountUsername, + authorId: belongPeopleInfo.authorId, + authorIdCard: belongPeopleInfo.authorIdCard, + authorIdCardType: belongPeopleInfo.authorIdCardType, + authorName: belongPeopleInfo.authorName, + authorProvinceCity: belongPeopleInfo.authorProvinceCity, + authorType: belongPeopleInfo.authorType, - post({ - messageApi, - url: '/api/proj/create', - body: { - // packageInfoId: projInfo.packageInfoId, - projName: projInfo.projName, - projSubName: projInfo.projSubName, - projVersion: projInfo.projVersion, - backendCodeLang: projInfo.backendCodeLang, - projChargeType: pathParams.projChargeType, - listProjChargeAdditional: listProjChargeAdditional, - // dayjs(formInfo.getFieldValue('projDevCompleteDate')).format(dateFormat), - projDevCompleteDate: projInfo.projDevCompleteDate ? dayjs(projInfo.projDevCompleteDate).format(dateFormat) : '', - authorCrcAccount: belongPeopleInfo.authorCrcAccount, - authorCrcAccountPassword: belongPeopleInfo.authorCrcAccountPassword, - authorCrcAccountUsername: belongPeopleInfo.authorCrcAccountUsername, - authorId: belongPeopleInfo.authorId, - authorIdCard: belongPeopleInfo.authorIdCard, - authorIdCardType: belongPeopleInfo.authorIdCardType, - authorName: belongPeopleInfo.authorName, - authorProvinceCity: belongPeopleInfo.authorProvinceCity, - authorType: belongPeopleInfo.authorType, + applyContactCompany: concatPeopleInfo.applyContactCompany, + applyContactCsaNo: concatPeopleInfo.applyContactCsaNo, + applyContactEmail: concatPeopleInfo.applyContactEmail, + applyContactId: concatPeopleInfo.applyConcatId, + applyContactName: concatPeopleInfo.applyContactName, + applyContactPhone: concatPeopleInfo.applyContactPhone, + couponId: couponId ? couponId : '', + // packageInfoId: packageInfoId ? packageInfoId : '' + packageOrderId: packageOrderId ? packageOrderId : '', - applyContactCompany: concatPeopleInfo.applyContactCompany, - applyContactCsaNo: concatPeopleInfo.applyContactCsaNo, - applyContactEmail: concatPeopleInfo.applyContactEmail, - applyContactId: concatPeopleInfo.applyConcatId, - applyContactName: concatPeopleInfo.applyContactName, - applyContactPhone: concatPeopleInfo.applyContactPhone, - couponId: couponId ? couponId : '', - // packageInfoId: packageInfoId ? packageInfoId : '' - packageOrderId: packageOrderId ? packageOrderId : '', + }, + onBefore() { + setLoading(true); + }, + onSuccess({ data }) { + setIsEditModalOpen(true); + setCreateProjId(data.data); + reloadUser(messageApi, globalDispatchContext).then(() => { + messageApi.success('扣款成功'); + }); + getMyPackNum() + }, + onFinally() { + setLoading(false); + } + }) + } - }, - onBefore() { - setLoading(true); - }, - onSuccess({ data }) { - setIsEditModalOpen(true); - setCreateProjId(data.data); - reloadUser(messageApi, globalDispatchContext).then(() => { - messageApi.success('扣款成功'); - }); - getMyPackNum() - }, - onFinally() { - setLoading(false); - } - }) setIsCreateModalOpen(false); @@ -1210,7 +1350,9 @@ export default function ProjNew() { }}>
该操作会扣除 {/* {(chargePrice / 100 - couponNum) < 0 ? 0 : chargePrice / 100 - couponNum} */} - {selectPack ? 0 : (chargePrice / 100 - couponNum) < 0 ? 0 : chargePrice / 100 - couponNum} + {/* {selectPack ? 0 : (chargePrice / 100 - couponNum) < 0 ? 0 : chargePrice / 100 - couponNum} + */} + {state && state.price ? state.price / 100 : selectPack ? 0 : (chargePrice / 100 - couponNum) < 0 ? 0 : chargePrice / 100 - couponNum} 元，确定操作吗？