ylj/cloud-platform-YN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
ylj20011123 2025-11-12 18:34:17 +08:00
parent 9a7cf2f7c9
commit 8244fac686
8 changed files with 38 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
dist.zip
View File

Binary file not shown.

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "ant-design-pro", "name": "ant-design-pro",
"version": "4.5.69", "version": "4.5.72",
"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": {

2
src/layouts/BasicLayout.tsx
View File

@ -563,7 +563,7 @@ const BasicLayout: React.FC<BasicLayoutProps> = (props) => {
// 卡券类型 // 卡券类型
getFieldEnum({ FieldExplainField: 'COUPONTYPE' }).then((COUPONTYPEList) => { getFieldEnum({ FieldExplainField: 'COUPONTYPE', FieldEnumStatus: 1 }).then((COUPONTYPEList) => {
session.set('COUPONTYPEList', COUPONTYPEList); session.set('COUPONTYPEList', COUPONTYPEList);
if (COUPONTYPEList && COUPONTYPEList.length > 0) { if (COUPONTYPEList && COUPONTYPEList.length > 0) {
const COUPONTYPEObj = handleGetLabel(COUPONTYPEList) const COUPONTYPEObj = handleGetLabel(COUPONTYPEList)

24
src/pages/CardInformation/CardInformationManager/components/CardInfo.tsx
View File

@ -47,7 +47,8 @@ const CardInfo = ({ showDetail, currentRow, currentUser, parentRef, setShowDetai
const [imagePreviewVisible, setImagePreviewVisible] = useState<boolean>(false) // 预览图片 const [imagePreviewVisible, setImagePreviewVisible] = useState<boolean>(false) // 预览图片
// 悬浮框 按钮加载的属性 // 悬浮框 按钮加载的属性
const [modalLoading, setModalLoading] = useState<boolean>(false) const [modalLoading, setModalLoading] = useState<boolean>(false)
// 当前选择的卡券类型
const [COUPON_TYPE, setCOUPON_TYPE] = useState<any>()
// 预览上传后的图片 // 预览上传后的图片
const handlePreview = async () => { const handlePreview = async () => {
@ -153,6 +154,7 @@ const CardInfo = ({ showDetail, currentRow, currentUser, parentRef, setShowDetai
setCurrentRow(null) setCurrentRow(null)
setShowDetail(false) setShowDetail(false)
setFileList([]) setFileList([])
setCOUPON_TYPE(null)
}} }}
confirmLoading={modalLoading} confirmLoading={modalLoading}
width={1400} width={1400}
@ -178,6 +180,7 @@ const CardInfo = ({ showDetail, currentRow, currentUser, parentRef, setShowDetai
setCurrentRow(null) setCurrentRow(null)
setShowDetail(false) setShowDetail(false)
setFileList([]) setFileList([])
setCOUPON_TYPE(null)
}} }}
handleOK={() => { handleOK={() => {
ModalFormRef?.current?.validateFields().then(async (res) => { ModalFormRef?.current?.validateFields().then(async (res) => {
@ -198,8 +201,10 @@ const CardInfo = ({ showDetail, currentRow, currentUser, parentRef, setShowDetai
} }
const data = await handeGetCOUPONDetail(req) const data = await handeGetCOUPONDetail(req)
setCouponDetail(data) setCouponDetail(data)
setCOUPON_TYPE(currentRow?.COUPON_TYPE)
return data return data
} else { } else {
setCOUPON_TYPE(1000)
return {} return {}
} }
}} }}
@ -241,6 +246,12 @@ const CardInfo = ({ showDetail, currentRow, currentUser, parentRef, setShowDetai
} }
]} ]}
readonly={readonly} readonly={readonly}
fieldProps={{
onChange: (e) => {
console.log('eeee', e);
setCOUPON_TYPE(e)
}
}}
/> />
</Col> </Col>
<Col span={8}> <Col span={8}>
@ -284,7 +295,7 @@ const CardInfo = ({ showDetail, currentRow, currentUser, parentRef, setShowDetai
<Row> <Row>
<Col span={12}> <Col span={12}>
<ProFormText <ProFormText
label={"购买满:"} label={COUPON_TYPE === 1000 ? '购买满:' : COUPON_TYPE === 2000 ? '购买满:' : COUPON_TYPE === 3000 ? '购买满:' : COUPON_TYPE === 5000 ? '实物价值:' : COUPON_TYPE === 9000 ? '销售价:' : ''}
name={"WITH_AMOUNT"} name={"WITH_AMOUNT"}
rules={[ rules={[
{ {
@ -296,9 +307,13 @@ const CardInfo = ({ showDetail, currentRow, currentUser, parentRef, setShowDetai
/> />
</Col> </Col>
<Col span={12}> <Col span={12} style={{ display: 'flex', alignItems: 'flex-start' }}>
<ProFormText <ProFormText
label={"减:"} fieldProps={{
style: { display: COUPON_TYPE === 5000 ? 'none' : '' }
}}
// style={{ display: COUPON_TYPE === 5000 ? 'none' : 'block' }}
label={COUPON_TYPE === 1000 ? '减:' : COUPON_TYPE === 2000 ? '享受:' : COUPON_TYPE === 3000 ? '抵扣:' : COUPON_TYPE === 5000 ? '' : COUPON_TYPE === 9000 ? '会员价:' : ''}
name={"USED_AMOUNT"} name={"USED_AMOUNT"}
rules={[ rules={[
{ {
@ -308,6 +323,7 @@ const CardInfo = ({ showDetail, currentRow, currentUser, parentRef, setShowDetai
]} ]}
readonly={readonly} readonly={readonly}
/> />
{COUPON_TYPE === 2000 ? '折' : ''}
</Col> </Col>
</Row> </Row>
</Col> </Col>

1
src/pages/travelMember/EventRegistration/components/EventRegistrationDetail.tsx
View File

@ -358,6 +358,7 @@ const EventRegistrationDetail = ({ parentRow, setparentRow, onShow, setOnShow, c
listType="picture-card" listType="picture-card"
accept="image/*" accept="image/*"
readonly={readonly} readonly={readonly}
disabled={readonly}
fieldProps={{ fieldProps={{
className: readonly ? "noUoloadButton" : "", className: readonly ? "noUoloadButton" : "",
beforeUpload: beforeUpload, beforeUpload: beforeUpload,

11
src/pages/travelMember/HomepageAds/index.tsx
View File

@ -472,6 +472,17 @@ const HomepageAds: React.FC<{ currentUser: CurrentUser | undefined }> = (props)
label="显示时间" label="显示时间"
/> />
</Col> </Col>
<Col span={12}>
<ProFormSelect
name="BUSINESSTYPE"
label="海报类型"
options={[
{ label: "每周特惠", value: 1000 },
{ label: "营销活动", value: 2000 },
]}
initialValue={1000}
/>
</Col>
<Col span={12}> <Col span={12}>
<ProFormUploadButton <ProFormUploadButton
name="USERDEFINEDTYPE_ICO" name="USERDEFINEDTYPE_ICO"

2
src/pages/travelMember/SharedRestStationManagement/components/SharedRestStationDetail.tsx
View File

@ -207,7 +207,7 @@ const SharedRestStationDetail = ({ parentRow, setParentRow, onShow, setOnShow, r
const handleAddUpdateStation = async (obj: any) => { const handleAddUpdateStation = async (obj: any) => {
let req: any = {} let req: any = {}
if (parentRow.RESTSTATION_ID) { if (parentRow?.RESTSTATION_ID) {
req = { req = {
...parentRow, ...parentRow,
...obj, ...obj,

6
src/versionEnv.ts
View File

@ -1,4 +1,4 @@
// 由 scripts/writeVersion.js 自动生成 // 由 scripts/writeVersion.js 自动生成
export const VERSION = "4.5.69"; export const VERSION = "4.5.72";
export const GIT_HASH = "52119dd"; export const GIT_HASH = "9a7cf2f";
export const BUILD_TIME = "2025-11-03T07:37:38.106Z"; export const BUILD_TIME = "2025-11-12T10:24:34.154Z";