This commit is contained in:
ylj20011123 2025-09-05 15:23:52 +08:00
parent f5c66f8fd9
commit 169c5fad49
6 changed files with 57 additions and 44 deletions

View File

@ -1,6 +1,6 @@
{ {
"name": "ant-design-pro", "name": "ant-design-pro",
"version": "4.5.47", "version": "4.5.49",
"private": true, "private": true,
"description": "An out-of-box UI solution for enterprise applications", "description": "An out-of-box UI solution for enterprise applications",
"scripts": { "scripts": {

View File

@ -12,12 +12,12 @@ import type { BrandModel } from "@/pages/basicManage/Brand/data";
import type { FormInstance } from "antd"; import type { FormInstance } from "antd";
import { Button, Col, Form, Image, message, Modal, Row, Switch, TreeSelect } from "antd"; import { Button, Col, Form, Image, message, Modal, Row, Switch, TreeSelect } from "antd";
import { getFieldEnum } from "@/services/options"; import { getFieldEnum } from "@/services/options";
import { uploadFile } from "@/pages/busniess/PaymentConfirm/service"; import { uploadAHYDFile, uploadFile } from "@/pages/busniess/PaymentConfirm/service";
import { ExclamationCircleOutlined } from "@ant-design/icons"; import { ExclamationCircleOutlined } from "@ant-design/icons";
import { getList, updateBrand } from "@/pages/basicManage/Brand/service"; import { getList, updateBrand } from "@/pages/basicManage/Brand/service";
import { getBase64 } from '@/utils/utils'; import { getBase64 } from '@/utils/utils';
import { getPictureList, deletePicture, uploadPicture } from '@/services/picture'; import { getPictureList, deletePicture, uploadPicture, uploadAHYDPicture } from '@/services/picture';
import type { UploadFile } from 'antd/es/upload/interface'; import type { UploadFile } from 'antd/es/upload/interface';
import type { PictureModel } from '@/services/options/typings'; import type { PictureModel } from '@/services/options/typings';
@ -50,7 +50,8 @@ const customUploadRequest = async (fileList: UploadFile[], tableId: string,image
formData.append('ImageType', imageType); formData.append('ImageType', imageType);
formData.append('TableType', '1125'); formData.append('TableType', '1125');
formData.append('TableId', tableId); formData.append('TableId', tableId);
const success = await uploadPicture(formData) // const success = await uploadPicture(formData)
const success = await uploadAHYDPicture(formData)
if (success) { if (success) {
return true return true
} }
@ -412,7 +413,8 @@ const AddEdit = ({ clickType, modalVisible, handleCloseAddEdit, currentRow, hand
formData.append('TableName', 'BRAND'); formData.append('TableName', 'BRAND');
formData.append('ImageName', typeof info.file !== 'string' ? info.file?.name : ''); formData.append('ImageName', typeof info.file !== 'string' ? info.file?.name : '');
if (info.filename) { if (info.filename) {
const success = await uploadFile(formData) // const success = await uploadFile(formData)
const success = await uploadAHYDFile(formData)
if (success) { if (success) {
const list = [{ const list = [{
uid: `${success.ImageId}`, // 注意这个uid一定不能少否则上传失败 uid: `${success.ImageId}`, // 注意这个uid一定不能少否则上传失败

View File

@ -239,8 +239,8 @@ const highwayHeadlines: React.FC<{ currentUser: CurrentUser }> = (props) => {
}) })
formData.append('TableType', '1401'); formData.append('TableType', '1401');
formData.append('TableId', data.Result_Data.NOTICEINFO_ID.toString()); formData.append('TableId', data.Result_Data.NOTICEINFO_ID.toString());
const success = await uploadPicture(formData) // const success = await uploadPicture(formData)
// const success = await uploadAHYDPicture(formData) const success = await uploadAHYDPicture(formData)
console.log('success', success); console.log('success', success);
} }
if (data.Result_Code === 100) { if (data.Result_Code === 100) {

View File

@ -1,6 +1,7 @@
import { tableList } from '@/utils/format'; import { tableList } from '@/utils/format';
import request from '@/utils/request'; import request from '@/utils/request';
import type { PaymentConfirmModel, RemarksModel } from './data'; import type { PaymentConfirmModel, RemarksModel } from './data';
import requestAHYD from '@/utils/requestAHYD';
// 获取列表数据 // 获取列表数据
export async function getList(params?: any) { export async function getList(params?: any) {
const search = params ? { ...params, sortstr: params.sortstr, PageIndex: params.current, pagesize: params.pageSize } : {}; const search = params ? { ...params, sortstr: params.sortstr, PageIndex: params.current, pagesize: params.pageSize } : {};
@ -85,6 +86,16 @@ export async function getPaymentConfirmList(params: { MerchantsId?: string, Acco
return tableList(data.Result_Data); return tableList(data.Result_Data);
} }
// 新的上传图片
export async function uploadAHYDFile(params: FormData) {
const data = await requestAHYD(`/Picture/SaveImgFile`, {
method: 'POST',
data: params,
requestType: 'form',
})
return data.Result_Data
}
// 上传图片 // 上传图片
export async function uploadFile(params: FormData) { export async function uploadFile(params: FormData) {
const data = await request(`/Picture/SaveImgFile`, { const data = await request(`/Picture/SaveImgFile`, {

View File

@ -58,7 +58,7 @@ const errorHandler = (error: { response: Response }): Response => {
*/ */
const request = extend({ const request = extend({
errorHandler, // default error handling errorHandler, // default error handling
// prefix: '/EShangApiMain',// 开发 // prefix: '/EShangApiAHYD',// 开发
prefix: 'https://ahyd.eshangtech.com/EShangApiMain', // 正式 prefix: 'https://ahyd.eshangtech.com/EShangApiMain', // 正式
headers: { headers: {
token: '', token: '',

View File

@ -1,4 +1,4 @@
// 由 scripts/writeVersion.js 自动生成 // 由 scripts/writeVersion.js 自动生成
export const VERSION = "4.5.47"; export const VERSION = "4.5.49";
export const GIT_HASH = "30fa7f3"; export const GIT_HASH = "f5c66f8";
export const BUILD_TIME = "2025-09-03T06:42:56.086Z"; export const BUILD_TIME = "2025-09-05T01:51:31.828Z";