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-12-09 19:01:53 +08:00
parent f1ba03ab73
commit 5275f79993
10 changed files with 55 additions and 34 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.83", "version": "4.5.85",
"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": {

23
src/pages/travelMember/InvestmentInformation/index.tsx
View File

@ -555,25 +555,32 @@ const InvestmentInformation: React.FC<{ currentUser: CurrentUser }> = (props) =>
onChange: async (info: any) => { onChange: async (info: any) => {
console.log('info', info); console.log('info', info);
console.log('fileList', fileList); console.log('fileList', fileList);
if (info.file.status === 'removed') { if (info.file.status === 'removed') {
const index = fileList.findIndex(n => n.uid === info.file.uid); const index = fileList.findIndex(n => n.uid === info.file.uid);
confirm({ confirm({
title: '确认删除该文件吗？', title: '确认删除该文件吗？',
icon: <ExclamationCircleOutlined />, icon: <ExclamationCircleOutlined />,
async onOk() { async onOk() {
const deleteLoading = message.loading('正在删除...') if (info.file.url) {
// const success = await deletePicture(info.file?.deletepath, info.file?.uid, '', '5000') const deleteLoading = message.loading('正在删除...')
const success = await deleteAHYDPicture(info.file?.deletepath, info.file?.uid, '', '5000') // const success = await deletePicture(info.file?.deletepath, info.file?.uid, '', '5000')
deleteLoading() 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] const files = [...fileList]
files.splice(index, 1) files.splice(index, 1)
setFileList(files) setFileList(files)
} }
else {
message.error("删除失败")
}
}, },
onCancel() { onCancel() {
}, },

40
src/pages/travelMember/OrderAfterSalesManage/index.tsx
View File

@ -433,25 +433,27 @@ const OrderAfterSalesManage: React.FC<{ currentUser: CurrentUser }> = (props) =>
</Popconfirm> : "" </Popconfirm> : ""
} }
</div> */} </div> */}
<div> {
<Popconfirm currentRow?.SALEBILL_STATE === 8000 ?
title={'是否撤销退款?'} <div>
onConfirm={async () => { <Popconfirm
await handleGetCancelRefund() title={'是否撤销退款?'}
}} onConfirm={async () => {
> await handleGetCancelRefund()
<Button danger>撤销退款</Button> }}
</Popconfirm> >
<Popconfirm <Button danger>撤销退款</Button>
title={'是否同意退款?'} </Popconfirm>
onConfirm={async () => { <Popconfirm
await handleGetAgreeToRefund() title={'是否同意退款?'}
}} onConfirm={async () => {
> await handleGetAgreeToRefund()
<Button type={'primary'}>同意退款</Button> }}
</Popconfirm> >
<Button type={'primary'}>同意退款</Button>
</div> </Popconfirm>
</div> : ""
}
</div>} </div>}
modalRender={(modal) => { modalRender={(modal) => {

2
src/pages/travelMember/OrderProductManage/index.tsx
View File

@ -360,6 +360,8 @@ const OrderProductManage: React.FC<{ currentUser: CurrentUser | undefined }> = (
let imageData = await handleUploadShopImg(res) let imageData = await handleUploadShopImg(res)
console.log('imageData', imageData); console.log('imageData', imageData);
let imgList: any = imageData.Result_Data let imgList: any = imageData.Result_Data
console.log('imgListimgListimgList', imgList);
imgList.IsImg = true
req.ImageInfo = imgList req.ImageInfo = imgList
} }

7
src/pages/travelMember/RegistrationRetentionAnalysis/index.tsx
View File

@ -495,7 +495,9 @@ const RegistrationRetentionAnalysis: React.FC<{ currentUser: CurrentUser, isComp
SearchParameter: { SearchParameter: {
SOURCE_PLATFORMS: '彩云驿出行', SOURCE_PLATFORMS: '彩云驿出行',
USER_MOBILEPHONE: parentDetail?.MEMBERSHIP_MOBILEPHONE, 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', SortStr: 'BEHAVIORRECORD_TIME desc',
PageIndex: params?.current || 1, PageIndex: params?.current || 1,
@ -519,7 +521,8 @@ const RegistrationRetentionAnalysis: React.FC<{ currentUser: CurrentUser, isComp
setSearchParams(params) setSearchParams(params)
let data = [] let data = []
if (isComponent) { if (isComponent) {
data = await handleGetBEHAVIORRECORDList(req) // data = await handleGetBEHAVIORRECORDList(req)
data = await handleGetBEHAVIORRECORDListCloud(req)
} else { } else {
if (params?.SOURCE_PLATFORM === '出行平台') { if (params?.SOURCE_PLATFORM === '出行平台') {
data = await handleGetBEHAVIORRECORDList(req) data = await handleGetBEHAVIORRECORDList(req)

4
src/pages/travelMember/SharedRestStationManagement/index.tsx
View File

@ -18,6 +18,7 @@ import ProForm from "@ant-design/pro-form";
import moment from "moment"; import moment from "moment";
import { handleDeleteRESTSTATION, handleGetRESTSTATIONList } from "./service"; import { handleDeleteRESTSTATION, handleGetRESTSTATIONList } from "./service";
import SharedRestStationDetail from "./components/SharedRestStationDetail"; import SharedRestStationDetail from "./components/SharedRestStationDetail";
import session from "@/utils/session";
const SharedRestStationManagement: React.FC<{ currentUser: CurrentUser }> = (props) => { const SharedRestStationManagement: React.FC<{ currentUser: CurrentUser }> = (props) => {
@ -36,6 +37,7 @@ const SharedRestStationManagement: React.FC<{ currentUser: CurrentUser }> = (pro
const [currentRow, setCurrentRow] = useState<any>() const [currentRow, setCurrentRow] = useState<any>()
// 文件列表 // 文件列表
const [fileList, setFileList] = useState<any>([]) const [fileList, setFileList] = useState<any>([])
let shopregionObj = session.get('shopregionObj')
const columns: any = [ const columns: any = [
{ {
title: <div style={{ textAlign: 'center' }}>休息站名称</div>, title: <div style={{ textAlign: 'center' }}>休息站名称</div>,
@ -57,6 +59,8 @@ const SharedRestStationManagement: React.FC<{ currentUser: CurrentUser }> = (pro
dataIndex: "SERVERPART_REGION", dataIndex: "SERVERPART_REGION",
ellipsis: true, ellipsis: true,
hideInSearch: true, hideInSearch: true,
valueType: "select",
valueEnum: shopregionObj
}, },
{ {
title: <div style={{ textAlign: 'center' }}>所在位置</div>, title: <div style={{ textAlign: 'center' }}>所在位置</div>,

2
src/pages/travelMember/ShoppingMallProductSearch/index.tsx
View File

@ -679,6 +679,8 @@ const ShoppingMallProductSearch: React.FC<{ currentUser: CurrentUser | undefined
}, },
PageIndex: 1, PageIndex: 1,
PageSize: 999999, PageSize: 999999,
SortStr: "OPERATE_DATE desc",
} }
const data = await handeGetCOMMODITYList(req); const data = await handeGetCOMMODITYList(req);
setCurrentSearchText(params?.searchText || "") setCurrentSearchText(params?.searchText || "")

3
src/pages/travelMember/memberInfor/index.tsx
View File

@ -775,8 +775,9 @@ const memberInfor: React.FC<{ currentUser: CurrentUser, searchType?: any, valueT
}) })
console.log('sortstrsortstrsortstrsortstr', sortstr.toString()); console.log('sortstrsortstrsortstrsortstr', sortstr.toString());
console.log('isComponentisComponentisComponent', isComponent); console.log('isComponentisComponentisComponent', isComponent);
console.log('valueTypevalueTypevalueType', valueType);
let req: any = {} let req: any = {}
if (isComponent && come !== 'SummaryOfIntegralGrowthValue') { if (isComponent) {
req = { req = {
SearchParameter: { SearchParameter: {
// PROVINCE_CODE: currentUser?.ProvinceCode || "", // PROVINCE_CODE: currentUser?.ProvinceCode || "",

6
src/versionEnv.ts
View File

@ -1,4 +1,4 @@
// 由 scripts/writeVersion.js 自动生成 // 由 scripts/writeVersion.js 自动生成
export const VERSION = "4.5.83"; export const VERSION = "4.5.85";
export const GIT_HASH = "a5e49cf"; export const GIT_HASH = "f1ba03a";
export const BUILD_TIME = "2025-12-08T12:14:56.214Z"; export const BUILD_TIME = "2025-12-09T06:03:09.173Z";