diff --git a/dist.zip b/dist.zip index 273d820..c3f8fa5 100644 Binary files a/dist.zip and b/dist.zip differ diff --git a/package.json b/package.json index 8196898..a7b685a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ant-design-pro", - "version": "4.5.69", + "version": "4.5.72", "private": true, "description": "An out-of-box UI solution for enterprise applications", "scripts": { diff --git a/src/layouts/BasicLayout.tsx b/src/layouts/BasicLayout.tsx index 719aca3..9756223 100644 --- a/src/layouts/BasicLayout.tsx +++ b/src/layouts/BasicLayout.tsx @@ -563,7 +563,7 @@ const BasicLayout: React.FC = (props) => { // 卡券类型 - getFieldEnum({ FieldExplainField: 'COUPONTYPE' }).then((COUPONTYPEList) => { + getFieldEnum({ FieldExplainField: 'COUPONTYPE', FieldEnumStatus: 1 }).then((COUPONTYPEList) => { session.set('COUPONTYPEList', COUPONTYPEList); if (COUPONTYPEList && COUPONTYPEList.length > 0) { const COUPONTYPEObj = handleGetLabel(COUPONTYPEList) diff --git a/src/pages/CardInformation/CardInformationManager/components/CardInfo.tsx b/src/pages/CardInformation/CardInformationManager/components/CardInfo.tsx index 5748336..f1e7f6d 100644 --- a/src/pages/CardInformation/CardInformationManager/components/CardInfo.tsx +++ b/src/pages/CardInformation/CardInformationManager/components/CardInfo.tsx @@ -47,7 +47,8 @@ const CardInfo = ({ showDetail, currentRow, currentUser, parentRef, setShowDetai const [imagePreviewVisible, setImagePreviewVisible] = useState(false) // 预览图片 // 悬浮框 按钮加载的属性 const [modalLoading, setModalLoading] = useState(false) - + // 当前选择的卡券类型 + const [COUPON_TYPE, setCOUPON_TYPE] = useState() // 预览上传后的图片 const handlePreview = async () => { @@ -153,6 +154,7 @@ const CardInfo = ({ showDetail, currentRow, currentUser, parentRef, setShowDetai setCurrentRow(null) setShowDetail(false) setFileList([]) + setCOUPON_TYPE(null) }} confirmLoading={modalLoading} width={1400} @@ -178,6 +180,7 @@ const CardInfo = ({ showDetail, currentRow, currentUser, parentRef, setShowDetai setCurrentRow(null) setShowDetail(false) setFileList([]) + setCOUPON_TYPE(null) }} handleOK={() => { ModalFormRef?.current?.validateFields().then(async (res) => { @@ -198,8 +201,10 @@ const CardInfo = ({ showDetail, currentRow, currentUser, parentRef, setShowDetai } const data = await handeGetCOUPONDetail(req) setCouponDetail(data) + setCOUPON_TYPE(currentRow?.COUPON_TYPE) return data } else { + setCOUPON_TYPE(1000) return {} } }} @@ -241,6 +246,12 @@ const CardInfo = ({ showDetail, currentRow, currentUser, parentRef, setShowDetai } ]} readonly={readonly} + fieldProps={{ + onChange: (e) => { + console.log('eeee', e); + setCOUPON_TYPE(e) + } + }} /> @@ -284,7 +295,7 @@ const CardInfo = ({ showDetail, currentRow, currentUser, parentRef, setShowDetai - + + {COUPON_TYPE === 2000 ? '折' : ''} diff --git a/src/pages/travelMember/EventRegistration/components/EventRegistrationDetail.tsx b/src/pages/travelMember/EventRegistration/components/EventRegistrationDetail.tsx index 6c32307..f5f071d 100644 --- a/src/pages/travelMember/EventRegistration/components/EventRegistrationDetail.tsx +++ b/src/pages/travelMember/EventRegistration/components/EventRegistrationDetail.tsx @@ -358,6 +358,7 @@ const EventRegistrationDetail = ({ parentRow, setparentRow, onShow, setOnShow, c listType="picture-card" accept="image/*" readonly={readonly} + disabled={readonly} fieldProps={{ className: readonly ? "noUoloadButton" : "", beforeUpload: beforeUpload, diff --git a/src/pages/travelMember/HomepageAds/index.tsx b/src/pages/travelMember/HomepageAds/index.tsx index ed0eaf0..79466b0 100644 --- a/src/pages/travelMember/HomepageAds/index.tsx +++ b/src/pages/travelMember/HomepageAds/index.tsx @@ -472,6 +472,17 @@ const HomepageAds: React.FC<{ currentUser: CurrentUser | undefined }> = (props) label="显示时间" /> + + + { let req: any = {} - if (parentRow.RESTSTATION_ID) { + if (parentRow?.RESTSTATION_ID) { req = { ...parentRow, ...obj, diff --git a/src/versionEnv.ts b/src/versionEnv.ts index 54bb2c9..d3b5074 100644 --- a/src/versionEnv.ts +++ b/src/versionEnv.ts @@ -1,4 +1,4 @@ // 由 scripts/writeVersion.js 自动生成 -export const VERSION = "4.5.69"; -export const GIT_HASH = "52119dd"; -export const BUILD_TIME = "2025-11-03T07:37:38.106Z"; +export const VERSION = "4.5.72"; +export const GIT_HASH = "9a7cf2f"; +export const BUILD_TIME = "2025-11-12T10:24:34.154Z";