Tenlion/system-copyright-react
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

request修改多端口使用

Browse Source
This commit is contained in:
lyp 2025-04-15 11:00:48 +08:00
parent 86a52b4deb
commit a9f8f77c78
6 changed files with 196 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/components/OrderDetailModal/components/File/File.css Normal file
View File

@ -0,0 +1,20 @@
.correctionTitleBox {
display: flex;
align-items: center;
}
.correctionTitle {
text-wrap: nowrap;
font-size: 18px;
margin-right: 20px;
}
.correctionRemarkBox {
display: flex;
margin-top: 20px;
}
.upFileBox {
display: flex;
margin-top: 20px;
}

27
src/components/OrderDetailModal/components/File/File.tsx
View File

@ -3,6 +3,8 @@ import { Table, Space, Modal,Input } from "antd"
import { sellSupplementList, buySupplementList, supplementDetail } from '../../../../request/api' import { sellSupplementList, buySupplementList, supplementDetail } from '../../../../request/api'
const { Column } = Table; const { Column } = Table;
import useMessage from "antd/es/message/useMessage"; import useMessage from "antd/es/message/useMessage";
import './File.css'
const { TextArea } = Input;
export default function File(props: any) { export default function File(props: any) {
const [messageApi, messageContext] = useMessage(); const [messageApi, messageContext] = useMessage();
const [correctionId, setCorrectionId] = useState('') // 点击查看内容选中的id const [correctionId, setCorrectionId] = useState('') // 点击查看内容选中的id
@ -200,9 +202,28 @@ export default function File(props: any) {
<div className='editModal-title-box'></div> <div className='editModal-title-box'></div>
<div className='editModal-title-name'>平台需要您补充的内容说明</div> <div className='editModal-title-name'>平台需要您补充的内容说明</div>
</div> </div>
<div> <div className='correctionTitleBox'>
<div>主题</div> <div className='correctionTitle'>主题</div>
<Input value={detailData.correctionTitle}></Input> <Input value={detailData.correctionTitle} style={{
height:40,
color:'black'
}}
disabled
></Input>
</div>
<div className='correctionRemarkBox'>
<div className='correctionTitle'>内容</div>
<TextArea value={detailData.correctionRemark} style={{
height:100,
color:'black',
resize:'none'
}}
disabled
></TextArea>
</div>
<div className='upFileBox'>
<div className='correctionTitle'>附件</div>
</div> </div>
<div className='editModal-title' style={{ marginTop: 30 }}> <div className='editModal-title' style={{ marginTop: 30 }}>
<div className='editModal-title-box'></div> <div className='editModal-title-box'></div>

57
src/components/user/UserEdit.tsx
View File

@ -14,11 +14,11 @@ import {
UploadFile, UploadFile,
// UploadProps // UploadProps
} from "antd"; } from "antd";
import { import {
// DevUserId, // DevUserId,
downloadUrl, get, downloadUrl, get,
// uploadImageUrl // uploadImageUrl
} from "../../util/AjaxUtils.ts"; } from "../../util/AjaxUtils.ts";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
// import locale from "antd/es/date-picker/locale/zh_CN"; // import locale from "antd/es/date-picker/locale/zh_CN";
// import dayjs, { Dayjs } from "dayjs"; // import dayjs, { Dayjs } from "dayjs";
@ -28,11 +28,11 @@ type FormDataType = {
userInfoId: string; userInfoId: string;
userInfoType: string; userInfoType: string;
userInfoName: string; userInfoName: string;
contactPhone:string; contactPhone: string;
idCardType?:string; idCardType?: string;
userInfoNameEn?:string userInfoNameEn?: string
contactName?:string contactName?: string
idCardNumber?:string idCardNumber?: string
// idCardType: string; // idCardType: string;
// idCardNumber: string; // idCardNumber: string;
// idCardFront: string; // idCardFront: string;
@ -73,12 +73,13 @@ export default function UserEdit(props: IUserEditProps) {
// }; // };
useEffect(() => { useEffect(() => {
get<any>({ get<any>({
messageApi, messageApi,
url: 'api/user-info/get-self', url: 'api/user-info/get-self',
onSuccess({ data }) { onSuccess({ data }) {
// console.log('证件号',data.idCardNumber); // console.log('证件号',data.idCardNumber);
form.setFieldsValue({ form.setFieldsValue({
userId: data.userId, userId: data.userId,
userInfoId: data.userInfoId, userInfoId: data.userInfoId,
@ -93,8 +94,8 @@ export default function UserEdit(props: IUserEditProps) {
// idCardBack: data.idCardBack, // idCardBack: data.idCardBack,
// idCardEndDate: data.idCardEndDate ? dayjs(data.idCardEndDate, 'YYYY-MM-DD') : '', // idCardEndDate: data.idCardEndDate ? dayjs(data.idCardEndDate, 'YYYY-MM-DD') : '',
idCardType: data.idCardType, idCardType: data.idCardType,
userInfoNameEn:data.userInfoNameEn, userInfoNameEn: data.userInfoNameEn,
contactName:data.contactName contactName: data.contactName
// legalPerson: data.legalPerson, // legalPerson: data.legalPerson,
}) })
if (data.idCardFront) { if (data.idCardFront) {
@ -123,7 +124,12 @@ export default function UserEdit(props: IUserEditProps) {
...idCardBackImgArray, ...idCardBackImgArray,
]) ])
} }
// if(data.userInfoType){
// setUserInfoType(data.userInfoType);
// }
setUserInfoType(data.userInfoType); setUserInfoType(data.userInfoType);
} }
}) })
}, [form]) }, [form])
@ -133,13 +139,16 @@ export default function UserEdit(props: IUserEditProps) {
<Form <Form
layout="vertical" layout="vertical"
form={form} form={form}
// initialValues={{
// userInfoType: 'PERSONAL'
// }}
onFinish={() => { onFinish={() => {
if(userInfoType == 'PERSONAL'){ if (userInfoType == 'PERSONAL') {
props.handleConfirm({ props.handleConfirm({
userId: form.getFieldValue('userId'), userId: form.getFieldValue('userId'),
userInfoId: form.getFieldValue('userInfoId'), userInfoId: form.getFieldValue('userInfoId'),
userInfoName: form.getFieldValue('userInfoName'), userInfoName: form.getFieldValue('userInfoName'),
contactPhone:form.getFieldValue('contactPhone'), contactPhone: form.getFieldValue('contactPhone'),
userInfoType: form.getFieldValue('userInfoType'), userInfoType: form.getFieldValue('userInfoType'),
// userInfoType: form.getFieldValue('userInfoType'), // userInfoType: form.getFieldValue('userInfoType'),
// contactAddress: form.getFieldValue('contactAddress'), // contactAddress: form.getFieldValue('contactAddress'),
@ -153,17 +162,17 @@ export default function UserEdit(props: IUserEditProps) {
// idCardType: form.getFieldValue('idCardType'), // idCardType: form.getFieldValue('idCardType'),
// legalPerson: form.getFieldValue('legalPerson'), // legalPerson: form.getFieldValue('legalPerson'),
}); });
}else{ } else {
props.handleConfirm({ props.handleConfirm({
userId: form.getFieldValue('userId'), userId: form.getFieldValue('userId'),
userInfoId: form.getFieldValue('userInfoId'), userInfoId: form.getFieldValue('userInfoId'),
userInfoName: form.getFieldValue('userInfoName'), userInfoName: form.getFieldValue('userInfoName'),
contactName:form.getFieldValue('contactName'), contactName: form.getFieldValue('contactName'),
contactPhone:form.getFieldValue('contactPhone'), contactPhone: form.getFieldValue('contactPhone'),
idCardType:form.getFieldValue('idCardType'), idCardType: form.getFieldValue('idCardType'),
userInfoType: form.getFieldValue('userInfoType'), userInfoType: form.getFieldValue('userInfoType'),
userInfoNameEn:form.getFieldValue('userInfoNameEn'), userInfoNameEn: form.getFieldValue('userInfoNameEn'),
idCardNumber:form.getFieldValue('idCardNumber'), idCardNumber: form.getFieldValue('idCardNumber'),
// userInfoType: form.getFieldValue('userInfoType'), // userInfoType: form.getFieldValue('userInfoType'),
// contactAddress: form.getFieldValue('contactAddress'), // contactAddress: form.getFieldValue('contactAddress'),
// contactPhone: form.getFieldValue('contactPhone'), // contactPhone: form.getFieldValue('contactPhone'),
@ -177,7 +186,7 @@ export default function UserEdit(props: IUserEditProps) {
// legalPerson: form.getFieldValue('legalPerson'), // legalPerson: form.getFieldValue('legalPerson'),
}); });
} }
}} }}
> >
<Form.Item label="类型" <Form.Item label="类型"
@ -297,11 +306,11 @@ export default function UserEdit(props: IUserEditProps) {
</Form.Item> </Form.Item>
<Form.Item label="证件号" <Form.Item label="证件号"
name="idCardNumber" name="idCardNumber"
// rules={[{ required: true, message: '请输入证件号' }]} // rules={[{ required: true, message: '请输入证件号' }]}
> >
<Input placeholder="请输入证件号" /> <Input placeholder="请输入证件号" />
</Form.Item> </Form.Item>
<div style={{marginTop:-20,marginBottom:10,color:'green'}}>(注:此处信息在后期软著制作中会用到,建议认真填写)</div> <div style={{ marginTop: -20, marginBottom: 10, color: 'green' }}>(注:此处信息在后期软著制作中会用到,建议认真填写)</div>
</> </>
) : <></> ) : <></>
@ -359,7 +368,7 @@ export default function UserEdit(props: IUserEditProps) {
</Upload> </Upload>
</Form.Item> </Form.Item>
</Col> */} </Col> */}
{/* { {/* {
userInfoType == 'PERSONAL' ? ( userInfoType == 'PERSONAL' ? (
<Col span={12}> <Col span={12}>
<Form.Item label="证件照反面" <Form.Item label="证件照反面"
@ -477,7 +486,7 @@ export default function UserEdit(props: IUserEditProps) {
<Input placeholder="请输入联系地址" /> <Input placeholder="请输入联系地址" />
</Form.Item> </Form.Item>
</Col> */} </Col> */}
{/* <Col span={12}> {/* <Col span={12}>
<Form.Item label="联系电话" <Form.Item label="联系电话"
name="contactPhone" name="contactPhone"
rules={[{required: true, message: '请输入联系电话'}]} rules={[{required: true, message: '请输入联系电话'}]}

1
src/layout/head/Head.tsx
View File

@ -1393,6 +1393,7 @@ export default function Head() {
content: '确定保存吗？', content: '确定保存吗？',
okText: '确认', okText: '确认',
cancelText: '取消', cancelText: '取消',
centered: true,
okButtonProps: { okButtonProps: {
style: { style: {
backgroundColor: 'var(--color-primary)' backgroundColor: 'var(--color-primary)'

63
src/request/api.ts
View File

@ -1,5 +1,6 @@
import {request,newRequest} from './request' import {request,aiShopRequest,phoneRequest,newRequest} from './request'
// import newRequest from './request' // import newRequest from './request'
// 开票功能operatorPluginBaseUrl-------------------------------------------------------------------------------------------------------------------------------------------------------
// 获取登录标志 // 获取登录标志
export const getLoginflag = (userId: string) => request.get(`/operator-plugin/app/contentcensusrelease/log?requestUrl=网页USER${userId}`) export const getLoginflag = (userId: string) => request.get(`/operator-plugin/app/contentcensusrelease/log?requestUrl=网页USER${userId}`)
// 获取开票记录列表 // 获取开票记录列表
@ -29,67 +30,73 @@ export const cancelInvoice = (invoiceRechargeId: string) => request.put(`/operat
export const getInvoiceInfoByinvoiceRechargeId = (invoiceRechargeId: string) => request.get(`/operator-plugin/api/invoicerecharge/get/${invoiceRechargeId}`) export const getInvoiceInfoByinvoiceRechargeId = (invoiceRechargeId: string) => request.get(`/operator-plugin/api/invoicerecharge/get/${invoiceRechargeId}`)
// 修改开票信息 // 修改开票信息
export const updateInvoiceInfoByinvoiceRechargeId = (invoiceRechargeId: string, params: any) => request.put(`/operator-plugin/api/invoicerecharge/update/${invoiceRechargeId}`, params) export const updateInvoiceInfoByinvoiceRechargeId = (invoiceRechargeId: string, params: any) => request.put(`/operator-plugin/api/invoicerecharge/update/${invoiceRechargeId}`, params)
//---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
// 买卖商品接口
// 买卖商品接口aiShopBaseUrl---------------------------------------------------------------------------------------------------------------------------------------------------------------------------
// 获取商品列表 // 获取商品列表
export const getGoodsList = (params: any) => request.get(`/aishop/api/goods/listpage`, { params }) export const getGoodsList = (params: any) => aiShopRequest.get(`/aishop/api/goods/listpage`, { params })
// 获取开发语言 // 获取开发语言
export const getLanguageList = () => request.get(`/aishop/api/data/listbyparentid/f8bf7112-623c-494c-ad29-ccef5cfe2e1f`) export const getLanguageList = () => aiShopRequest.get(`/aishop/api/data/listbyparentid/f8bf7112-623c-494c-ad29-ccef5cfe2e1f`)
// 获取软著类型 // 获取软著类型
export const getSoftTypeList = () => request.get(`/aishop/api/data/listbyparentid/0b00884a-f7a2-425f-93e5-599fbaad4bde`) export const getSoftTypeList = () => aiShopRequest.get(`/aishop/api/data/listbyparentid/0b00884a-f7a2-425f-93e5-599fbaad4bde`)
// 获取商品详情 // 获取商品详情
export const getGoodsDetail = (goodsId: string) => request.get(`/aishop/api/goods/get/${goodsId}`) export const getGoodsDetail = (goodsId: string) => aiShopRequest.get(`/aishop/api/goods/get/${goodsId}`)
// 获取证件类型 // 获取证件类型
export const getCertificateTypeList = () => request.get(`/aishop/api/data/listbyparentid/ce3ded65-68ed-4f42-89da-de1b813b8f7e`) export const getCertificateTypeList = () => aiShopRequest.get(`/aishop/api/data/listbyparentid/ce3ded65-68ed-4f42-89da-de1b813b8f7e`)
// 获取省份 // 获取省份
export const getProvinceList = () => request.get(`/aishop/api/area/listbyparentid/0`) export const getProvinceList = () => aiShopRequest.get(`/aishop/api/area/listbyparentid/0`)
// 获取市 // 获取市
export const getCityList = (provinceId: string) => request.get(`/aishop/api/area/listbyparentid/${provinceId}`) export const getCityList = (provinceId: string) => aiShopRequest.get(`/aishop/api/area/listbyparentid/${provinceId}`)
// 新增商品 // 新增商品
export const addGoods = (params: any) => request.post(`/aishop/api/goods/save`, params) export const addGoods = (params: any) => aiShopRequest.post(`/aishop/api/goods/save`, params)
// 修改商品 // 修改商品
export const updateGoods = (goodsId: string, params: any) => request.put(`/aishop/api/goods/update/${goodsId}`, params) export const updateGoods = (goodsId: string, params: any) => aiShopRequest.put(`/aishop/api/goods/update/${goodsId}`, params)
// 提交审核 // 提交审核
export const submitAudit = (goodsId: string) => request.put(`/aishop/api/goods/sub-check/${goodsId}`) export const submitAudit = (goodsId: string) => aiShopRequest.put(`/aishop/api/goods/sub-check/${goodsId}`)
// 商品上架 // 商品上架
export const putOnShelf = (goodsId: string) => request.put(`/aishop/api/goods/publish/${goodsId}`) export const putOnShelf = (goodsId: string) => aiShopRequest.put(`/aishop/api/goods/publish/${goodsId}`)
// 商品下架 // 商品下架
export const putOffShelf = (goodsId: string) => request.put(`/aishop/api/goods/no-publish/${goodsId}`) export const putOffShelf = (goodsId: string) => aiShopRequest.put(`/aishop/api/goods/no-publish/${goodsId}`)
// 删除商品 // 删除商品
export const deleteGoods = (goodsId: string) => request.delete(`/aishop/api/goods/remove/${goodsId}`) export const deleteGoods = (goodsId: string) => aiShopRequest.delete(`/aishop/api/goods/remove/${goodsId}`)
// 我要卖订单分页列表 // 我要卖订单分页列表
export const getSellOrderList = (params: any) => request.get(`/aishop/api/order/listpage-sell`, { params }) export const getSellOrderList = (params: any) => aiShopRequest.get(`/aishop/api/order/listpage-sell`, { params })
// 我要买订单分页列表 // 我要买订单分页列表
export const getBuyOrderList = (params: any) => request.get(`/aishop/api/order/listpage-buy`, { params }) export const getBuyOrderList = (params: any) => aiShopRequest.get(`/aishop/api/order/listpage-buy`, { params })
// 获取订单详情 // 获取订单详情
export const orderDetail = (orderId: string) => request.get(`/aishop/api/order/get/${orderId}`) export const orderDetail = (orderId: string) => aiShopRequest.get(`/aishop/api/order/get/${orderId}`)
// 获取卖家补充资料列表 // 获取卖家补充资料列表
export const sellSupplementList = (params: any) => request.get(`/aishop/api/correction/listpage-sell`, { params }) export const sellSupplementList = (params: any) => aiShopRequest.get(`/aishop/api/correction/listpage-sell`, { params })
// 获取买家补充资料列表 // 获取买家补充资料列表
export const buySupplementList = (params: any) => request.get(`/aishop/api/correction/listpage-buy`, { params }) export const buySupplementList = (params: any) => aiShopRequest.get(`/aishop/api/correction/listpage-buy`, { params })
// 获取补充资料详情 // 获取补充资料详情
export const supplementDetail = (correctionId: string) => request.get(`/aishop/api/correction/get/${correctionId}`) export const supplementDetail = (correctionId: string) => aiShopRequest.get(`/aishop/api/correction/get/${correctionId}`)
// 获取可以买的商品列表 // 获取可以买的商品列表
export const buyGoodsList = (params: any) => request.get(`/aishop/api/goodsonline/listpage`, { params }) export const buyGoodsList = (params: any) => aiShopRequest.get(`/aishop/api/goodsonline/listpage`, { params })
// 获取上架商品详情 // 获取上架商品详情
export const goodsDetail = (goodsId: string) => request.get(`/aishop/api/goodsonline/get/${goodsId}`) export const goodsDetail = (goodsId: string) => aiShopRequest.get(`/aishop/api/goodsonline/get/${goodsId}`)
// 创建订单 // 创建订单
export const createOrder = (goodsId: string) => request.post(`/aishop/api/order/save/${goodsId}`) export const createOrder = (goodsId: string) => aiShopRequest.post(`/aishop/api/order/save/${goodsId}`)
// 确认付款 // 确认付款
export const confirmPayment = (orderId: string) => request.put(`/aishop/api/order/confirm-pay/${orderId}`) export const confirmPayment = (orderId: string) => aiShopRequest.put(`/aishop/api/order/confirm-pay/${orderId}`)
//---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
// 绑定手机号接口
// 绑定手机号接口operatorBaseUrl----------------------------------------------------------------------------------------------------------------------------------------------------------------------
// 获取验证码 // 获取验证码
export const getCode = (phone: number) => request.get(`/operator/api/verify/code/send/${phone}`) export const getCode = (phone: number) => phoneRequest.get(`/operator/api/verify/code/send/${phone}`)
// 验证手机号是否可用 // 验证手机号是否可用
export const checkPhone = (phone: number) => request.get(`/operator/api/user-wx-update-username/check-phone/${phone}`) export const checkPhone = (phone: number) => phoneRequest.get(`/operator/api/user-wx-update-username/check-phone/${phone}`)
// 更新手机号 // 更新手机号
export const updatePhone = (params:any) => newRequest.post(`/operator/oauth/wx/update/phone`, params) export const updatePhone = (params:any) => newRequest.post(`/operator/oauth/wx/update/phone`, params)
//---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

98
src/request/request.ts
View File

@ -1,16 +1,22 @@
import axios from "axios"; import axios from "axios";
import {baseUrl} from '../util/AjaxUtils'
const baseURL = baseUrl; //买卖功能baseUrl // 正式环境
// const baseURL = 'http://192.168.0.115:8099'; // 开票功能baseUrl import {
// const baseURL = 'http://192.168.0.115:8081'; //买卖功能baseUrl operatorPluginBaseUrl,// 开票功能baseUrl
aiShopBaseUrl,// 买卖商品baseUrl
operatorBaseUrl, //绑定手机号
} from '../util/AjaxUtils'
// const baseURL = 'http://192.168.0.15:8091'; //绑定手机号baseUrl // 开发环境
// const operatorPluginBaseUrl = 'http://192.168.0.115:8099' //开票
// const aiShopBaseUrl = 'http://192.168.0.115:8081'//买卖'
// const operatorBaseUrl = 'http://192.168.0.15:8091' //绑定手机号
// const baseURL = 'https://www.aimzhu.com';
// 开票功能----------------------------------------------------------------------------
const request = axios.create({ const request = axios.create({
baseURL: baseURL, baseURL: operatorPluginBaseUrl,
timeout: 5000, timeout: 5000,
}); });
request.interceptors.request.use( request.interceptors.request.use(
@ -31,10 +37,67 @@ request.interceptors.response.use(
}, },
(err) => Promise.reject(err) (err) => Promise.reject(err)
); );
const newRequest = axios.create({ //-----------------------------------------------------------------------------------------
baseURL: baseURL,
// 买卖功能----------------------------------------------------------------------------
const aiShopRequest = axios.create({
baseURL: aiShopBaseUrl,
timeout: 5000, timeout: 5000,
}); });
aiShopRequest.interceptors.request.use(
(config) => {
// 有token带token
const token = sessionStorage.getItem('token')
config.headers = config.headers || {}
config.headers['Auth'] = token ? `Bearer ${token}` : '';
return config;
},
(err) => Promise.reject(err)
);
aiShopRequest.interceptors.response.use(
(res) => {
return res.data;
},
(err) => Promise.reject(err)
);
//--------------------------------------------------------------------------------------------
// 绑定手机号功能----------------------------------------------------------------------------
const phoneRequest = axios.create({
baseURL: operatorBaseUrl,
timeout: 5000,
});
phoneRequest.interceptors.request.use(
(config) => {
// 有token带token
const token = sessionStorage.getItem('token')
config.headers = config.headers || {}
config.headers['Auth'] = token ? `Bearer ${token}` : '';
return config;
},
(err) => Promise.reject(err)
);
phoneRequest.interceptors.response.use(
(res) => {
return res.data;
},
(err) => Promise.reject(err)
);
//--------------------------------------------------------------------------------------------
// 绑定手机号功能(不要token)----------------------------------------------------------------------------
const newRequest = axios.create({
baseURL: operatorBaseUrl,
timeout: 5000,
});
newRequest.interceptors.request.use( newRequest.interceptors.request.use(
(config) => { (config) => {
// 有token带token // 有token带token
@ -50,18 +113,23 @@ newRequest.interceptors.response.use(
}, },
(err) => Promise.reject(err) (err) => Promise.reject(err)
); );
//--------------------------------------------------------------------------------------------
// 下载发票 // 下载发票
export const downloadInvoice = (id: string) => { export const downloadInvoice = (id: string) => {
return `${baseURL}/operator-plugin/route/file/download/false/${id}` return `${operatorPluginBaseUrl}/operator-plugin/route/file/download/false/${id}`
}; };
// 显示图片
// 显示图片 买卖功能
export const showImage = (fileId: string, isDownload?: boolean) => { export const showImage = (fileId: string, isDownload?: boolean) => {
return `${baseURL}/aishop/route/file/download/${isDownload == false}/${fileId}` return `${aiShopBaseUrl}/aishop/route/file/download/${isDownload == false}/${fileId}`
} }
// 上传图片 // 上传图片 买卖功能
export const uploadImageUrl = () => { export const uploadImageUrl = () => {
return `${baseURL}/aishop/api/file/v2/upload-image` return `${aiShopBaseUrl}/aishop/api/file/v2/upload-image`
} }
// export default request // export default request
export { newRequest ,request}; export { request,aiShopRequest,phoneRequest,newRequest};