update

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": {

src/pages/travelMember/InvestmentInformation/index.tsx

@@ -555,12 +555,14 @@ 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: <ExclamationCircleOutlined />,
                                                 async onOk() {
+                                                    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')
@@ -574,6 +576,11 @@ const InvestmentInformation: React.FC<{ currentUser: CurrentUser }> = (props) =>
                                                         else {
                                                             message.error("删除失败")
                                                         }
+                                                    } else {
+                                                        const files = [...fileList]
+                                                        files.splice(index, 1)
+                                                        setFileList(files)
+                                                    }
                                                 },
                                                 onCancel() {
                                                 },

src/pages/travelMember/OrderAfterSalesManage/index.tsx

@@ -433,6 +433,8 @@ const OrderAfterSalesManage: React.FC<{ currentUser: CurrentUser }> = (props) =>
                                 </Popconfirm> : ""
                         }
                     </div> */}
+                    {
+                        currentRow?.SALEBILL_STATE === 8000 ?
                             <div>
                                 <Popconfirm
                                     title={'是否撤销退款?'}
@@ -450,8 +452,8 @@ const OrderAfterSalesManage: React.FC<{ currentUser: CurrentUser }> = (props) =>
                                 >
                                     <Button type={'primary'}>同意退款</Button>
                                 </Popconfirm>
-
+                            </div> : ""
-                    </div>
+                    }
 
                 </div>}
                 modalRender={(modal) => {

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
         }
 

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)

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<any>()
     // 文件列表
     const [fileList, setFileList] = useState<any>([])
+    let shopregionObj = session.get('shopregionObj')
     const columns: any = [
         {
             title: <div style={{ textAlign: 'center' }}>休息站名称</div>,
@@ -57,6 +59,8 @@ const SharedRestStationManagement: React.FC<{ currentUser: CurrentUser }> = (pro
             dataIndex: "SERVERPART_REGION",
             ellipsis: true,
             hideInSearch: true,
+            valueType: "select",
+            valueEnum: shopregionObj
         },
         {
             title: <div style={{ textAlign: 'center' }}>所在位置</div>,

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 || "")

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 || "",

src/versionEnv.ts

@@ -1,4 +1,4 @@
 // 由 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";