diff --git a/.env.dev b/.env.dev index d2a3c32..9e9f0da 100644 --- a/.env.dev +++ b/.env.dev @@ -7,5 +7,6 @@ VITE_AI_SHOP_BASE_URL=http://192.168.0.115:8081 VITE_WEBSOCKET_BASE_URL=ws://${VITE_HOST}:7025/copyright # 18634604067 VITE_USERID=80d3365e-0597-4988-979e-18ef1c3ec671 +# VITE_USERID=e3e40f95-7a3f-4b53-a1a0-51dd4e881d74 # VITE_CURRENT_THEME=fzkj VITE_CURRENT_THEME=mzw diff --git a/src/components/CapitalModal/CapitalModal.tsx b/src/components/CapitalModal/CapitalModal.tsx index c8a794f..1f58470 100644 --- a/src/components/CapitalModal/CapitalModal.tsx +++ b/src/components/CapitalModal/CapitalModal.tsx @@ -248,7 +248,7 @@ export default function CapitalModal() { width: 160, align: 'center', render:(text) => ( -
{text == 'ai'?'AI喵著':text}
+
{text == 'ai'?'AI喵著':text == 'shop'?'软著交易':text}
) }, { diff --git a/src/components/OrderDetailModal/OrderDetailModal.tsx b/src/components/OrderDetailModal/OrderDetailModal.tsx index 901b711..ad59ba3 100644 --- a/src/components/OrderDetailModal/OrderDetailModal.tsx +++ b/src/components/OrderDetailModal/OrderDetailModal.tsx @@ -36,7 +36,8 @@ export default function OrderDetailModal(props: any) { produceTime: '',//下证时间 successTime: '',//评价时间 evaluateLevel: 0,//评价星级 - evaluateRemark: ''//评价内容 + evaluateRemark: '',//评价内容 + goodsDTO:{} }) const [goodsInfo, setGoodsInfo] = useState({ goodsPhoto: '',//软著图片 @@ -174,7 +175,7 @@ export default function OrderDetailModal(props: any) {
- +
diff --git a/src/components/OrderDetailModal/components/OrderInfo/OrderInfo.tsx b/src/components/OrderDetailModal/components/OrderInfo/OrderInfo.tsx index 8380918..5710292 100644 --- a/src/components/OrderDetailModal/components/OrderInfo/OrderInfo.tsx +++ b/src/components/OrderDetailModal/components/OrderInfo/OrderInfo.tsx @@ -28,7 +28,7 @@ export default function OrderInfo(props: any) { color: "#5C5C5C", height: 42, background: '#F5F5F9', - }} value={orderInfo.payMoney}> + }} value={props.user=='sell'?orderInfo.goodsDTO.goodsPrice:orderInfo.goodsDTO.goodsOpenPrice}>
订单状态
diff --git a/src/components/menu/menu-with-bottom-button.css b/src/components/menu/menu-with-bottom-button.css index 46f47e4..a650088 100644 --- a/src/components/menu/menu-with-bottom-button.css +++ b/src/components/menu/menu-with-bottom-button.css @@ -82,12 +82,12 @@ color: #313131; line-height: 50px; cursor: pointer; */ - height: 50px; + height: 40px; margin-left: 35px; font-weight: 400; font-size: 16px; color: #313131; - line-height: 50px; + line-height: 40px; cursor: pointer; /* background-color: red; */ text-indent: 32px; @@ -108,7 +108,7 @@ .menu-with-bot-button ul li.active { /* text-decoration-line: underline; */ width: 213px; - height: 50px; + height: 40px; /* background: #FF9F08; */ background: var(--color-menuactive); border-radius: 25px; @@ -198,12 +198,12 @@ color: #313131; line-height: 50px; cursor: pointer; */ - height: 50px; + height: 40px; margin-left: 35px; font-weight: 400; font-size: 16px; color: #313131; - line-height: 50px; + line-height: 40px; cursor: pointer; /* background-color: red; */ text-indent: 32px; @@ -228,7 +228,7 @@ width: 213px; /* 修改 */ width: 171px; - height: 50px; + height: 40px; /* background: #FF9F08; */ background: var(--color-menuactive); border-radius: 25px; diff --git a/src/components/menu/menu-with-top-button.css b/src/components/menu/menu-with-top-button.css index 9e7ec44..e9d6b8d 100644 --- a/src/components/menu/menu-with-top-button.css +++ b/src/components/menu/menu-with-top-button.css @@ -73,12 +73,12 @@ } .menu-with-top-button ul li { - height: 50px; + height: 40px; margin-left: 35px; font-weight: 400; font-size: 16px; color: #313131; - line-height: 50px; + line-height: 40px; cursor: pointer; /* background-color: red; */ text-indent: 32px; @@ -91,7 +91,7 @@ width: 213px; /* 修改 */ width: 171px; - height: 50px; + height: 40px; /* background: #FF9F08; */ background: var(--color-menuactive); border-radius: 25px; @@ -172,12 +172,12 @@ } .menu-with-top-button ul li { - height: 50px; + height: 40px; margin-left: 35px; font-weight: 400; font-size: 16px; color: #313131; - line-height: 50px; + line-height: 40px; cursor: pointer; /* background-color: red; */ text-indent: 32px; @@ -185,7 +185,7 @@ .menu-with-top-button ul li.active { width: 213px; - height: 50px; + height: 40px; /* background: #FF9F08; */ background: var(--color-menuactive); diff --git a/src/route/AppElectron/AppEdit.tsx b/src/route/AppElectron/AppEdit.tsx index 161be50..74976cf 100644 --- a/src/route/AppElectron/AppEdit.tsx +++ b/src/route/AppElectron/AppEdit.tsx @@ -1,10 +1,12 @@ import { useState, useEffect } from 'react' import EditAppInfo from './components/EditAppInfo/EditAppInfo'; -import EditAppDes from './components/EditAppDes/EditAppDes'; + +// import EditAppDes from './components/EditAppDes/EditAppDes'; import EditAppFiles from './components/EditAppFiles/EditAppFiles'; -import EditAppFunction from './components/EditAppFunction/EditAppFunction'; -import EditBelongPeople from './components/EditBelongPeople/EditBelongPeople'; +// import EditAppFunction from './components/EditAppFunction/EditAppFunction'; +// import EditBelongPeople from './components/EditBelongPeople/EditBelongPeople'; import AppInfo from './components/AppInfo/AppInfo'; +import AppCompany from './components/AppCompany/AppCompany'; import { useParams } from 'react-router-dom' import './app-edit.css' import { @@ -40,7 +42,7 @@ export default function AppEdit() { color: editProcess >= 1 ? '#353535' : '#878787', fontWeight: editProcess >= 1 ? 'bold' : 'normal' }} - >机构认证
+ >企业/机构认证
@@ -82,9 +84,12 @@ export default function AppEdit() { color: editProcess >= 4 ? '#353535' : '#878787', fontWeight: editProcess >= 4 ? 'bold' : 'normal' }} - >功能特点
+ > + {/* 功能特点 */} + 填报完成 + -
+ {/*
= 5 ? '#3B60E8' : '', @@ -111,28 +116,38 @@ export default function AppEdit() { fontWeight: editProcess >= 6 ? 'bold' : 'normal' }} >填报完成
-
+ */}
+ { + setEditProcess(num) + } + }> + {/* { + setEditProcess(num) + } + }> */} +
+
{ setEditProcess(num) } }> -
-
- { setEditProcess(num) } - }> + }> */}
- { setEditProcess(num) } - }> + }> */} + { + setEditProcess(num) + } + }>
-
-
+
*/} ) diff --git a/src/route/AppElectron/app-edit.css b/src/route/AppElectron/app-edit.css index d03b34c..b30aebe 100644 --- a/src/route/AppElectron/app-edit.css +++ b/src/route/AppElectron/app-edit.css @@ -11,7 +11,7 @@ .editProcessBox { display: flex; align-items: center; - justify-content: space-between; + justify-content: space-evenly; margin-bottom: 30px; } diff --git a/src/route/AppElectron/components/AppCompany/AppCompany.tsx b/src/route/AppElectron/components/AppCompany/AppCompany.tsx new file mode 100644 index 0000000..820b2b6 --- /dev/null +++ b/src/route/AppElectron/components/AppCompany/AppCompany.tsx @@ -0,0 +1,494 @@ +import { useState } from 'react' +import './app-company.css' +import { uploadFileUrl } from '../../../../request/request' +import { Button, Form, Input, message, + // Select, DatePicker, + Upload, Image, + // Cascader + } from "antd" +import { LoadingOutlined, } from '@ant-design/icons'; +import type { GetProp, UploadProps } from 'antd'; +// import { +// getCityList +// } from '../../../../request/api' +// import locale from 'antd/es/date-picker/locale/zh_CN'; +// interface Option { +// value?: string | number | null; +// label: React.ReactNode; +// children?: Option[]; +// isLeaf?: boolean; +// // id: string; +// // pId: string; +// } +export default function AppCompany(props: any) { + // const [messageApi, contextHolder] = message.useMessage(); + // const [areaArray, setAreaArray] = useState([]); + // 加载城市列表 + // const loadCityList = async (selectedOptions: Option[]) => { + // const targetOption = selectedOptions[selectedOptions.length - 1]; + // // console.log('targetOption', targetOption.children); + // try { + // const res: any = await getCityList(targetOption.value as string); + // // console.log('城市列表', res); + + // const cities = res.map((city: any) => ({ + // value: city.areaId, + // label: city.areaName, + + // })); + // targetOption.children = cities; + // // 更新 areaArray 状态 + // setAreaArray([...areaArray]); + // } catch (error: any) { + + + // if (error.response) { + // const data = error.response.data; + // messageApi.open({ + // type: 'error', + // content: data.msg ? data.msg : `${data.path}(${data.status})`, + // }); + // } else { + // console.error(error) + // } + // } + // }; + // 定义 beforeUpload 函数 + const beforeUpload = (file: any) => { + const isJpgOrPng = ['image/jpeg', 'image/png', 'image/bmp'].includes(file.type); + if (!isJpgOrPng) { + message.error('只能上传 JPG、JPEG、PNG、BMP 格式的文件!'); + } + const isLt4M = file.size / 1024 / 1024 < 4; + if (!isLt4M) { + message.error('文件大小不能超过 4MB!'); + } + return isJpgOrPng && isLt4M; + }; + type FileType = Parameters>[0]; + const [loading, setLoading] = useState(false); + const getBase64 = (img: FileType, callback: (url: string) => void) => { + const reader = new FileReader(); + reader.addEventListener('load', () => callback(reader.result as string)); + reader.readAsDataURL(img); + }; + const [imageUrl, setImageUrl] = useState(''); + const handleChange: UploadProps['onChange'] = (info) => { + if (info.file.status === 'uploading') { + setLoading(true); + return; + } + if (info.file.status === 'done') { + // Get this url from response in real world. + getBase64(info.file.originFileObj as FileType, (url) => { + setLoading(false); + setImageUrl(url); + }); + console.log(info); + + } + if (info.file.status === 'error') { + setLoading(false); + // 显示错误提示 + message.error(`上传失败`); + //伤处表单name为ing的值 + form.setFieldsValue({ + img: '', // 将值设置为 undefined 以清除错误状态 + }) + } + }; + + + + // 自定义验证规则 + const validateUpload = () => { + + if (loading) { + return Promise.reject(new Error('文件上传中，请等待上传完成')); + } + if (!imageUrl) { + return Promise.reject(new Error('请上传有效的文件')); + } + return Promise.resolve(); + + }; + const token = sessionStorage.getItem('token') + const submitInfo = (values: any) => { + message.success('提交成功'); + console.log(values); + props.setEditProcess(2); + + + } + const height = window.innerHeight - 460; + const [form] = Form.useForm(); + + + const handleSubmit = () => { + // console.log(form); + props.setEditProcess(2); + // 调用表单实例的 submit 方法 + form.submit(); + + }; + + const onFinish = (values: any) => { + // 处理表单提交逻辑 + console.log('表单提交成功', values); + submitInfo(values) + + }; + return ( +
+ {/* {contextHolder} */} +
+
+ +
{ + message.error('请完善信息') + }} + > +
+
+
企业/机构名称*：
+ + + +
+ {/*
+
所在省市：
+ + + +
*/} +
+
统一社会信用代码*：
+ + + + +
+
+ {/*
+
+
企业/机构地址：
+ + + +
+
+
成立日期：
+ + + +
+
*/} + {/*
+
+
证件类型：
+ + + + +
+
*/} +
+
+
上传证件*：
+
+ + { + // setUpArray([]) + // setDisabled(false) + }} + headers={{ 'Auth': `Bearer ${token}` }} + disabled={!!imageUrl} + // beforeUpload={beforeUpload} + > + {imageUrl ? +
+ +
+ : } + + + +
{ + setImageUrl('') + }} + >删除
+
+
+
+ +
+ + { + // setUpArray([]) + // setDisabled(false) + }} + headers={{ 'Auth': `Bearer ${token}` }} + disabled={!!imageUrl} + // beforeUpload={beforeUpload} + > + {imageUrl ? +
+ +
+ : } + + + +
{ + setImageUrl('') + }} + >删除
+
+
+
+
+
上传要求:
+
+
1.要求不得涂改,需确保四边角完整,文字图片证件号码清晰可见
+
2.请上传小于4MB的图片(JPG、JPEG、PNG、BMP)
+
+
+ +
+ +
+ +
+
+ +
+
+ ) +} diff --git a/src/route/AppElectron/components/AppCompany/app-company.css b/src/route/AppElectron/components/AppCompany/app-company.css new file mode 100644 index 0000000..c77bcbe --- /dev/null +++ b/src/route/AppElectron/components/AppCompany/app-company.css @@ -0,0 +1,75 @@ +.bigLine { + width: 100%; + height: 40px; + background: #F3F3F3; +} + +.appInfoFormBox { + padding: 30px 0; + box-sizing: border-box; + overflow: auto; + display: flex; + /* align-items: center; */ + justify-content: center; + + +} +/* Chrome, Safari 和 Opera */ +.appInfoFormBox::-webkit-scrollbar { + width: 8px; /* 垂直滚动条宽度 */ + height: 8px; /* 水平滚动条高度 */ +} + +.appInfoFormBox::-webkit-scrollbar-track { + background: #f1f1f1; /* 滚动条轨道背景色 */ + border-radius: 4px; +} + +.appInfoFormBox::-webkit-scrollbar-thumb { + background: #888; /* 滚动条滑块颜色 */ + border-radius: 4px; +} + +.appInfoFormBox::-webkit-scrollbar-thumb:hover { + background: #555; /* 鼠标悬停时滚动条滑块颜色 */ +} + +/* Firefox */ +.appInfoFormBox { + scrollbar-width: thin; /* 滚动条宽度，可选值：auto, thin, none */ + scrollbar-color: #888 #f1f1f1; /* 滚动条滑块颜色和轨道颜色 */ +} + +.nextBtnBxo { + width: 100%; + display: flex; + justify-content: center; + margin-top: 30px; + margin-bottom: 30px; +} +.appInfoFormInput{ + display: flex; + /* align-items: center; */ + /* background-color: pink; */ + /* justify-content: center; */ + /* padding:0 80px; */ + box-sizing: border-box; +} +.FormInputTitle{ + font-size: 16px; + line-height: 42px; + /* background-color: pink; */ + width: 145px; + text-align: right; + text-wrap: nowrap; +} +.upBtn{ + width: 400px; + height: 200px; + /* background-color: pink; */ + display: flex; + justify-content: center; + align-items: center; + /* border: 1px dashed #4ca8e6; */ + cursor: pointer; +} \ No newline at end of file diff --git a/src/route/AppElectron/components/AppInfo/AppInfo.tsx b/src/route/AppElectron/components/AppInfo/AppInfo.tsx index 802df1d..8513c5f 100644 --- a/src/route/AppElectron/components/AppInfo/AppInfo.tsx +++ b/src/route/AppElectron/components/AppInfo/AppInfo.tsx @@ -13,9 +13,42 @@ export default function AppInfo(props: any) { height: height, justifyContent: 'flex-start', flexDirection: 'column', - - }}> + }}> +
+
企业/机构信息
+
+
+
企业/机构信息名称 :
+
嘻嘻嘻嘻公司
+
+
+
所在省市 :
+
辽宁省沈阳市
+
+
+
企业/机构地址 :
+
xxx路xxx号
+
+
+
证件类型 :
+
xx证
+
+
+
证件号 :
+
111111111
+
+
+
上传证件 :
+
xx.png
+
+
+
授权书 :
+
xxx.jpg
+
+ +
+
软件基本信息
@@ -32,7 +65,7 @@ export default function AppInfo(props: any) {
v.10
-
包名 :
+
包名(APPID) :
com.zhongxinhy.communitymanage
@@ -44,24 +77,29 @@ export default function AppInfo(props: any) {
应用 - 生活实用
+
开发方式 :
+
独立开发
+
+ {/*
软件作品说明 :
原创
-
+
*/}
开发完成日期 :
2025-05-05
-
+ {/*
发表状态 :
未发表
-
+
*/}
-
开发方式 :
-
独立开发
+
产权所属者 :
+
嘻嘻公司
+ -
+ {/*
权利说明
@@ -79,7 +117,7 @@ export default function AppInfo(props: any) {
-
+
*/}
鉴别材料
@@ -94,7 +132,7 @@ export default function AppInfo(props: any) {
-
+ {/*
功能特点
@@ -123,8 +161,8 @@ export default function AppInfo(props: any) {
-
-
+
*/} + {/*
著作权人
@@ -133,7 +171,7 @@ export default function AppInfo(props: any) {
-
+
*/}
@@ -145,7 +183,7 @@ export default function AppInfo(props: any) { borderRadius: '5px', }} onClick={() => { - props.setEditProcess(5) + props.setEditProcess(3) }}>上一步 + + + + [ 下载协议 ] + + + {/*
{ + props.setEditProcess(1) + }}>上一步 +
+ { + setBelongModal(false) + + }}> + + { setBelongModal(false) }} setBelongPeopleInfo={setBelongPeopleInfo} belongPeopleInfo={belongPeopleInfo} setValue={setValue} isShow={true}> + ) } diff --git a/src/route/CopyrightGgoods/CopyrightGgoods.tsx b/src/route/CopyrightGgoods/CopyrightGgoods.tsx index c238755..9035740 100644 --- a/src/route/CopyrightGgoods/CopyrightGgoods.tsx +++ b/src/route/CopyrightGgoods/CopyrightGgoods.tsx @@ -284,7 +284,7 @@ export default function CopyrightGgoods() { ￥ - {item.goodsPrice} + {item.goodsOpenPrice} diff --git a/src/route/ProductRelease/components/EditModal/EditModal.tsx b/src/route/ProductRelease/components/EditModal/EditModal.tsx index ec12997..5a810ca 100644 --- a/src/route/ProductRelease/components/EditModal/EditModal.tsx +++ b/src/route/ProductRelease/components/EditModal/EditModal.tsx @@ -1195,7 +1195,7 @@ export default function EditModal(props: any) { diff --git a/src/route/TradingGoods/TradingGoods.tsx b/src/route/TradingGoods/TradingGoods.tsx index ef539b1..649cc8b 100644 --- a/src/route/TradingGoods/TradingGoods.tsx +++ b/src/route/TradingGoods/TradingGoods.tsx @@ -14,6 +14,7 @@ import { // Flex, Button } from 'antd'; +import { showImage } from '../../request/request' import AiShopDetail from '../../components/AiShopDetail/AiShopDetail' import { GlobalDispatchContext, reloadUser } from "../../context/GlobalContext.ts"; // import type { TableColumnsType } from 'antd'; @@ -281,8 +282,8 @@ export default function TradingGoods() { 待填写资料 过户进行中 过户已完成 - 买家已评价 - 发票已开具 + {/* 买家已评价 */} + {/* 发票已开具 */} )} /> @@ -410,6 +411,17 @@ export default function TradingGoods() { > 取消订单 + { + window.open(showImage(record.producePhoto, false)) + // console.log(record); + + }} + style={{ + display: record.orderStatus == '4' ? 'unset' : 'none' + }} + > + 查看证书 + )} /> diff --git a/src/route/TransactionOrder/TransactionOrder.tsx b/src/route/TransactionOrder/TransactionOrder.tsx index 51f8030..7b7c0a6 100644 --- a/src/route/TransactionOrder/TransactionOrder.tsx +++ b/src/route/TransactionOrder/TransactionOrder.tsx @@ -152,10 +152,10 @@ export default function TransactionOrder() {
{text.goodsName}
)} /> - ( - {text} + {text.goodsPrice} )} /> 清除 +
+ 今日特价! +
@@ -3154,8 +3157,8 @@ export default function Index() { { value: '2', label: '待填写资料' }, { value: '3', label: '过户进行中' }, { value: '4', label: '过户已完成' }, - { value: '5', label: '买家已评价' }, - { value: '6', label: '发票已开具' }, + // { value: '5', label: '买家已评价' }, + // { value: '6', label: '发票已开具' }, ]} value={tradingStatus} allowClear @@ -3172,6 +3175,7 @@ export default function Index() { > 清除 +