diff --git a/src/components/OrderDetailModal/components/File/File.css b/src/components/OrderDetailModal/components/File/File.css new file mode 100644 index 0000000..42d718f --- /dev/null +++ b/src/components/OrderDetailModal/components/File/File.css @@ -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; +} \ No newline at end of file diff --git a/src/components/OrderDetailModal/components/File/File.tsx b/src/components/OrderDetailModal/components/File/File.tsx index edf02a5..3d2cb07 100644 --- a/src/components/OrderDetailModal/components/File/File.tsx +++ b/src/components/OrderDetailModal/components/File/File.tsx @@ -3,6 +3,8 @@ import { Table, Space, Modal,Input } from "antd" import { sellSupplementList, buySupplementList, supplementDetail } from '../../../../request/api' const { Column } = Table; import useMessage from "antd/es/message/useMessage"; +import './File.css' +const { TextArea } = Input; export default function File(props: any) { const [messageApi, messageContext] = useMessage(); const [correctionId, setCorrectionId] = useState('') // 点击查看内容选中的id @@ -200,9 +202,28 @@ export default function File(props: any) {
平台需要您补充的内容说明
-
-
主题
- +
+
主题
+ +
+
+
内容
+ +
+
+
附件
+
diff --git a/src/components/user/UserEdit.tsx b/src/components/user/UserEdit.tsx index c9b7d0a..0810364 100644 --- a/src/components/user/UserEdit.tsx +++ b/src/components/user/UserEdit.tsx @@ -14,11 +14,11 @@ import { UploadFile, // UploadProps } from "antd"; -import { +import { // DevUserId, - downloadUrl, get, + downloadUrl, get, // uploadImageUrl - } from "../../util/AjaxUtils.ts"; +} from "../../util/AjaxUtils.ts"; import { useEffect, useState } from "react"; // import locale from "antd/es/date-picker/locale/zh_CN"; // import dayjs, { Dayjs } from "dayjs"; @@ -28,11 +28,11 @@ type FormDataType = { userInfoId: string; userInfoType: string; userInfoName: string; - contactPhone:string; - idCardType?:string; - userInfoNameEn?:string - contactName?:string - idCardNumber?:string + contactPhone: string; + idCardType?: string; + userInfoNameEn?: string + contactName?: string + idCardNumber?: string // idCardType: string; // idCardNumber: string; // idCardFront: string; @@ -73,12 +73,13 @@ export default function UserEdit(props: IUserEditProps) { // }; useEffect(() => { + get({ messageApi, url: 'api/user-info/get-self', onSuccess({ data }) { // console.log('证件号',data.idCardNumber); - + form.setFieldsValue({ userId: data.userId, userInfoId: data.userInfoId, @@ -93,8 +94,8 @@ export default function UserEdit(props: IUserEditProps) { // idCardBack: data.idCardBack, // idCardEndDate: data.idCardEndDate ? dayjs(data.idCardEndDate, 'YYYY-MM-DD') : '', idCardType: data.idCardType, - userInfoNameEn:data.userInfoNameEn, - contactName:data.contactName + userInfoNameEn: data.userInfoNameEn, + contactName: data.contactName // legalPerson: data.legalPerson, }) if (data.idCardFront) { @@ -123,7 +124,12 @@ export default function UserEdit(props: IUserEditProps) { ...idCardBackImgArray, ]) } + // if(data.userInfoType){ + // setUserInfoType(data.userInfoType); + + // } setUserInfoType(data.userInfoType); + } }) }, [form]) @@ -133,13 +139,16 @@ export default function UserEdit(props: IUserEditProps) {
{ - if(userInfoType == 'PERSONAL'){ + if (userInfoType == 'PERSONAL') { props.handleConfirm({ userId: form.getFieldValue('userId'), userInfoId: form.getFieldValue('userInfoId'), userInfoName: form.getFieldValue('userInfoName'), - contactPhone:form.getFieldValue('contactPhone'), + contactPhone: form.getFieldValue('contactPhone'), userInfoType: form.getFieldValue('userInfoType'), // userInfoType: form.getFieldValue('userInfoType'), // contactAddress: form.getFieldValue('contactAddress'), @@ -153,17 +162,17 @@ export default function UserEdit(props: IUserEditProps) { // idCardType: form.getFieldValue('idCardType'), // legalPerson: form.getFieldValue('legalPerson'), }); - }else{ + } 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'), + contactName: form.getFieldValue('contactName'), + contactPhone: form.getFieldValue('contactPhone'), + idCardType: form.getFieldValue('idCardType'), userInfoType: form.getFieldValue('userInfoType'), - userInfoNameEn:form.getFieldValue('userInfoNameEn'), - idCardNumber:form.getFieldValue('idCardNumber'), + userInfoNameEn: form.getFieldValue('userInfoNameEn'), + idCardNumber: form.getFieldValue('idCardNumber'), // userInfoType: form.getFieldValue('userInfoType'), // contactAddress: form.getFieldValue('contactAddress'), // contactPhone: form.getFieldValue('contactPhone'), @@ -177,7 +186,7 @@ export default function UserEdit(props: IUserEditProps) { // legalPerson: form.getFieldValue('legalPerson'), }); } - + }} > -
(注:此处信息在后期软著制作中会用到,建议认真填写)
+
(注:此处信息在后期软著制作中会用到,建议认真填写)
) : <> @@ -359,7 +368,7 @@ export default function UserEdit(props: IUserEditProps) { */} - {/* { + {/* { userInfoType == 'PERSONAL' ? ( */} - {/* + {/* 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 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) +//--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- diff --git a/src/request/request.ts b/src/request/request.ts index 0cd00e0..ffc73ae 100644 --- a/src/request/request.ts +++ b/src/request/request.ts @@ -1,16 +1,22 @@ import axios from "axios"; -import {baseUrl} from '../util/AjaxUtils' -const baseURL = baseUrl; //买卖功能baseUrl -// const baseURL = 'http://192.168.0.115:8099'; // 开票功能baseUrl -// const baseURL = 'http://192.168.0.115:8081'; //买卖功能baseUrl + +// 正式环境 +import { + 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({ - baseURL: baseURL, + baseURL: operatorPluginBaseUrl, timeout: 5000, }); request.interceptors.request.use( @@ -31,10 +37,67 @@ request.interceptors.response.use( }, (err) => Promise.reject(err) ); -const newRequest = axios.create({ - baseURL: baseURL, +//----------------------------------------------------------------------------------------- + + +// 买卖功能---------------------------------------------------------------------------- +const aiShopRequest = axios.create({ + baseURL: aiShopBaseUrl, 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( (config) => { // 有token带token @@ -50,18 +113,23 @@ newRequest.interceptors.response.use( }, (err) => Promise.reject(err) ); +//-------------------------------------------------------------------------------------------- + // 下载发票 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) => { - return `${baseURL}/aishop/route/file/download/${isDownload == false}/${fileId}` + return `${aiShopBaseUrl}/aishop/route/file/download/${isDownload == false}/${fileId}` } -// 上传图片 +// 上传图片 买卖功能 export const uploadImageUrl = () => { - return `${baseURL}/aishop/api/file/v2/upload-image` + return `${aiShopBaseUrl}/aishop/api/file/v2/upload-image` } // export default request -export { newRequest ,request}; \ No newline at end of file +export { request,aiShopRequest,phoneRequest,newRequest}; \ No newline at end of file