diff --git a/dist.zip b/dist.zip index f25e2b4..cafe539 100644 Binary files a/dist.zip and b/dist.zip differ diff --git a/package.json b/package.json index 3ecea17..a1039ed 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ant-design-pro", - "version": "4.5.83", + "version": "4.5.85", "private": true, "description": "An out-of-box UI solution for enterprise applications", "scripts": { diff --git a/src/pages/travelMember/InvestmentInformation/index.tsx b/src/pages/travelMember/InvestmentInformation/index.tsx index b1953db..446f366 100644 --- a/src/pages/travelMember/InvestmentInformation/index.tsx +++ b/src/pages/travelMember/InvestmentInformation/index.tsx @@ -555,25 +555,32 @@ const InvestmentInformation: React.FC<{ currentUser: CurrentUser }> = (props) => onChange: async (info: any) => { console.log('info', info); console.log('fileList', fileList); + if (info.file.status === 'removed') { const index = fileList.findIndex(n => n.uid === info.file.uid); confirm({ title: '确认删除该文件吗？', icon: , async onOk() { - const deleteLoading = message.loading('正在删除...') - // const success = await deletePicture(info.file?.deletepath, info.file?.uid, '', '5000') - const success = await deleteAHYDPicture(info.file?.deletepath, info.file?.uid, '', '5000') - deleteLoading() + if (info.file.url) { + const deleteLoading = message.loading('正在删除...') + // const success = await deletePicture(info.file?.deletepath, info.file?.uid, '', '5000') + const success = await deleteAHYDPicture(info.file?.deletepath, info.file?.uid, '', '5000') + deleteLoading() - if (success) { + if (success) { + const files = [...fileList] + files.splice(index, 1) + setFileList(files) + } + else { + message.error("删除失败") + } + } else { const files = [...fileList] files.splice(index, 1) setFileList(files) } - else { - message.error("删除失败") - } }, onCancel() { }, diff --git a/src/pages/travelMember/OrderAfterSalesManage/index.tsx b/src/pages/travelMember/OrderAfterSalesManage/index.tsx index fcfac64..b20d41a 100644 --- a/src/pages/travelMember/OrderAfterSalesManage/index.tsx +++ b/src/pages/travelMember/OrderAfterSalesManage/index.tsx @@ -433,25 +433,27 @@ const OrderAfterSalesManage: React.FC<{ currentUser: CurrentUser }> = (props) => : "" } */} -
- { - await handleGetCancelRefund() - }} - > - - - { - await handleGetAgreeToRefund() - }} - > - - - -
+ { + currentRow?.SALEBILL_STATE === 8000 ? +
+ { + await handleGetCancelRefund() + }} + > + + + { + await handleGetAgreeToRefund() + }} + > + + +
: "" + } } modalRender={(modal) => { diff --git a/src/pages/travelMember/OrderProductManage/index.tsx b/src/pages/travelMember/OrderProductManage/index.tsx index c82cb28..c37c4af 100644 --- a/src/pages/travelMember/OrderProductManage/index.tsx +++ b/src/pages/travelMember/OrderProductManage/index.tsx @@ -360,6 +360,8 @@ const OrderProductManage: React.FC<{ currentUser: CurrentUser | undefined }> = ( let imageData = await handleUploadShopImg(res) console.log('imageData', imageData); let imgList: any = imageData.Result_Data + console.log('imgListimgListimgList', imgList); + imgList.IsImg = true req.ImageInfo = imgList } diff --git a/src/pages/travelMember/RegistrationRetentionAnalysis/index.tsx b/src/pages/travelMember/RegistrationRetentionAnalysis/index.tsx index 2664499..a9a07df 100644 --- a/src/pages/travelMember/RegistrationRetentionAnalysis/index.tsx +++ b/src/pages/travelMember/RegistrationRetentionAnalysis/index.tsx @@ -495,7 +495,9 @@ const RegistrationRetentionAnalysis: React.FC<{ currentUser: CurrentUser, isComp SearchParameter: { SOURCE_PLATFORMS: '彩云驿出行', USER_MOBILEPHONE: parentDetail?.MEMBERSHIP_MOBILEPHONE, - USER_ID: parentDetail?.MEMBERSHIP_ID + USER_ID: parentDetail?.MEMBERSHIP_ID, + BEHAVIORRECORD_TIME_Start: moment().subtract(1, "M").format('YYYY-MM-DD'), + BEHAVIORRECORD_TIME_End: moment().format('YYYY-MM-DD'), }, SortStr: 'BEHAVIORRECORD_TIME desc', PageIndex: params?.current || 1, @@ -519,7 +521,8 @@ const RegistrationRetentionAnalysis: React.FC<{ currentUser: CurrentUser, isComp setSearchParams(params) let data = [] if (isComponent) { - data = await handleGetBEHAVIORRECORDList(req) + // data = await handleGetBEHAVIORRECORDList(req) + data = await handleGetBEHAVIORRECORDListCloud(req) } else { if (params?.SOURCE_PLATFORM === '出行平台') { data = await handleGetBEHAVIORRECORDList(req) diff --git a/src/pages/travelMember/SharedRestStationManagement/index.tsx b/src/pages/travelMember/SharedRestStationManagement/index.tsx index 38e6002..8c09ae5 100644 --- a/src/pages/travelMember/SharedRestStationManagement/index.tsx +++ b/src/pages/travelMember/SharedRestStationManagement/index.tsx @@ -18,6 +18,7 @@ import ProForm from "@ant-design/pro-form"; import moment from "moment"; import { handleDeleteRESTSTATION, handleGetRESTSTATIONList } from "./service"; import SharedRestStationDetail from "./components/SharedRestStationDetail"; +import session from "@/utils/session"; const SharedRestStationManagement: React.FC<{ currentUser: CurrentUser }> = (props) => { @@ -36,6 +37,7 @@ const SharedRestStationManagement: React.FC<{ currentUser: CurrentUser }> = (pro const [currentRow, setCurrentRow] = useState() // 文件列表 const [fileList, setFileList] = useState([]) + let shopregionObj = session.get('shopregionObj') const columns: any = [ { title:
休息站名称
, @@ -57,6 +59,8 @@ const SharedRestStationManagement: React.FC<{ currentUser: CurrentUser }> = (pro dataIndex: "SERVERPART_REGION", ellipsis: true, hideInSearch: true, + valueType: "select", + valueEnum: shopregionObj }, { title:
所在位置
, diff --git a/src/pages/travelMember/ShoppingMallProductSearch/index.tsx b/src/pages/travelMember/ShoppingMallProductSearch/index.tsx index 317a47a..37505f8 100644 --- a/src/pages/travelMember/ShoppingMallProductSearch/index.tsx +++ b/src/pages/travelMember/ShoppingMallProductSearch/index.tsx @@ -679,6 +679,8 @@ const ShoppingMallProductSearch: React.FC<{ currentUser: CurrentUser | undefined }, PageIndex: 1, PageSize: 999999, + SortStr: "OPERATE_DATE desc", + } const data = await handeGetCOMMODITYList(req); setCurrentSearchText(params?.searchText || "") diff --git a/src/pages/travelMember/memberInfor/index.tsx b/src/pages/travelMember/memberInfor/index.tsx index c3bc3b4..3251e61 100644 --- a/src/pages/travelMember/memberInfor/index.tsx +++ b/src/pages/travelMember/memberInfor/index.tsx @@ -775,8 +775,9 @@ const memberInfor: React.FC<{ currentUser: CurrentUser, searchType?: any, valueT }) console.log('sortstrsortstrsortstrsortstr', sortstr.toString()); console.log('isComponentisComponentisComponent', isComponent); + console.log('valueTypevalueTypevalueType', valueType); let req: any = {} - if (isComponent && come !== 'SummaryOfIntegralGrowthValue') { + if (isComponent) { req = { SearchParameter: { // PROVINCE_CODE: currentUser?.ProvinceCode || "", diff --git a/src/versionEnv.ts b/src/versionEnv.ts index 17dbdc3..bcbc381 100644 --- a/src/versionEnv.ts +++ b/src/versionEnv.ts @@ -1,4 +1,4 @@ // 由 scripts/writeVersion.js 自动生成 -export const VERSION = "4.5.83"; -export const GIT_HASH = "a5e49cf"; -export const BUILD_TIME = "2025-12-08T12:14:56.214Z"; +export const VERSION = "4.5.85"; +export const GIT_HASH = "f1ba03a"; +export const BUILD_TIME = "2025-12-09T06:03:09.173Z";