diff --git a/package.json b/package.json index c4e30e4..efa79d5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ant-design-pro", - "version": "4.5.45", + "version": "4.5.47", "private": true, "description": "An out-of-box UI solution for enterprise applications", "scripts": { diff --git a/src/pages/ahjgPage/inventoryInformation/index.tsx b/src/pages/ahjgPage/inventoryInformation/index.tsx index bead50a..909ff02 100644 --- a/src/pages/ahjgPage/inventoryInformation/index.tsx +++ b/src/pages/ahjgPage/inventoryInformation/index.tsx @@ -390,7 +390,7 @@ const inventoryInformation: React.FC<{ currentUser: CurrentUser }> = (props) =>
- +
= (props) => {
- +
= (props) => {
- +
= (props) => { formData.append('TableType', '1401'); formData.append('TableId', data.Result_Data.NOTICEINFO_ID.toString()); const success = await uploadPicture(formData) + // const success = await uploadAHYDPicture(formData) console.log('success', success); } if (data.Result_Code === 100) { diff --git a/src/pages/reports/ConfirmationDifference/index.tsx b/src/pages/reports/ConfirmationDifference/index.tsx index f202623..7385d07 100644 --- a/src/pages/reports/ConfirmationDifference/index.tsx +++ b/src/pages/reports/ConfirmationDifference/index.tsx @@ -1310,16 +1310,16 @@ const revenueConfirmationDifference: React.FC<{ currentUser: CurrentUser }> = (p console.log('params', params); setSearchParams(params) - let SETTLEMENT_MODESSTR: string = '' - if (params.SETTLEMENT_MODES && params.SETTLEMENT_MODES.length > 0) { - params.SETTLEMENT_MODES.forEach((item: any) => { - if (SETTLEMENT_MODESSTR) { - SETTLEMENT_MODESSTR += `,${item}` - } else { - SETTLEMENT_MODESSTR = item - } - }) - } + // let SETTLEMENT_MODESSTR: string = '' + // if (params.SETTLEMENT_MODES && params.SETTLEMENT_MODES.length > 0) { + // params.SETTLEMENT_MODES.forEach((item: any) => { + // if (SETTLEMENT_MODESSTR) { + // SETTLEMENT_MODESSTR += `,${item}` + // } else { + // SETTLEMENT_MODESSTR = item + // } + // }) + // } // 是否只选择了一个服务区 let isOneServerPart: boolean = false @@ -1340,7 +1340,7 @@ const revenueConfirmationDifference: React.FC<{ currentUser: CurrentUser }> = (p const req = { ServerpartIds: selectedId, - SETTLEMENT_MODES: SETTLEMENT_MODESSTR || '', + SETTLEMENT_MODES: params?.SettlementModes && params?.SettlementModes.length > 0 ? params?.SettlementModes.toString() : "", startDate: params.MonthDate ? moment(params.MonthDate).format('YYYYMM') : '', endDate: params.MonthDate ? moment(params.MonthDate).format('YYYYMM') : '', keyword: params.MERCHANTS_NAME, diff --git a/src/pages/reports/revenueConfirmation/index.tsx b/src/pages/reports/revenueConfirmation/index.tsx index 6e62cfe..9e1495f 100644 --- a/src/pages/reports/revenueConfirmation/index.tsx +++ b/src/pages/reports/revenueConfirmation/index.tsx @@ -1167,16 +1167,16 @@ const revenueConfirmation: React.FC<{ currentUser: CurrentUser }> = (props) => { console.log('params', params); setSearchParams(params) - let SETTLEMENT_MODESSTR: string = '' - if (params.SETTLEMENT_MODES && params.SETTLEMENT_MODES.length > 0) { - params.SETTLEMENT_MODES.forEach((item: any) => { - if (SETTLEMENT_MODESSTR) { - SETTLEMENT_MODESSTR += `,${item}` - } else { - SETTLEMENT_MODESSTR = item - } - }) - } + // let SETTLEMENT_MODESSTR: string = '' + // if (params.SETTLEMENT_MODES && params.SETTLEMENT_MODES.length > 0) { + // params.SETTLEMENT_MODES.forEach((item: any) => { + // if (SETTLEMENT_MODESSTR) { + // SETTLEMENT_MODESSTR += `,${item}` + // } else { + // SETTLEMENT_MODESSTR = item + // } + // }) + // } // 是否只选择了一个服务区 let isOneServerPart: boolean = false @@ -1194,10 +1194,9 @@ const revenueConfirmation: React.FC<{ currentUser: CurrentUser }> = (props) => { } - const req = { ServerpartIds: selectedId, - SETTLEMENT_MODES: SETTLEMENT_MODESSTR || '', + SETTLEMENT_MODES: params?.SettlementModes && params?.SettlementModes.length > 0 ? params?.SettlementModes.toString() : "", startDate: params.MonthDate ? moment(params.MonthDate).format('YYYYMM') : '', endDate: params.MonthDate ? moment(params.MonthDate).format('YYYYMM') : '', keyword: params.MERCHANTS_NAME, diff --git a/src/pages/reports/settlementAccount/component/YearExamineDetailTable.tsx b/src/pages/reports/settlementAccount/component/YearExamineDetailTable.tsx index 9cb0a42..fa2a0d3 100644 --- a/src/pages/reports/settlementAccount/component/YearExamineDetailTable.tsx +++ b/src/pages/reports/settlementAccount/component/YearExamineDetailTable.tsx @@ -914,8 +914,7 @@ const YearExamineDetailTable = ({ parentRow, currentApprovalstate, onRef, setIsS title:
备注
, width: 100, dataIndex: 'desc', - valueType: 'digit', - align: 'right', + align: 'left', hideInSearch: true, } ] @@ -1205,10 +1204,13 @@ const YearExamineDetailTable = ({ parentRow, currentApprovalstate, onRef, setIsS - exportList.forEach((item: any) => { + exportList.forEach((item: any, index: number) => { if (item.CorrectAmount) { addRevenueMoneyStr = item.CorrectAmount } + + + if (item.PeriodDesc !== '合计') { if (item.PeriodIndexStr === "项目开始前") { item.PeriodIndexStr = '装修期' @@ -1254,7 +1256,9 @@ const YearExamineDetailTable = ({ parentRow, currentApprovalstate, onRef, setIsS }) } - + if (index + 1 === exportList.length) { + item.desc = obj.BusinessProcess_Desc + } exportRes2.push(JSON.parse(JSON.stringify(item))) item.children = null exportRes.push(item) @@ -1293,7 +1297,7 @@ const YearExamineDetailTable = ({ parentRow, currentApprovalstate, onRef, setIsS WaterCharge: handleHighPrecision(WaterChargeSum), OtherFee: handleHighPrecision(OtherFeeSum), ReceivableAmount: handleHighPrecision(ReceivableAmountSum), - ReductionAmountSum: handleHighPrecision(ReductionAmountSum), + ReductionAmount: handleHighPrecision(ReductionAmountSum), desc: '不含装修期', addRevenueMoney: addRevenueMoneyStr } @@ -1500,11 +1504,12 @@ const YearExamineDetailTable = ({ parentRow, currentApprovalstate, onRef, setIsS - exportList.forEach((item: any) => { + exportList.forEach((item: any, index: number) => { if (item.PeriodDesc !== '合计') { if (item.addRevenueMoney) { addRevenueMoneyStr = item.CorrectAmount } + if (item.PeriodIndexStr === "项目开始前") { item.PeriodIndexStr = '装修期' } @@ -1546,6 +1551,9 @@ const YearExamineDetailTable = ({ parentRow, currentApprovalstate, onRef, setIsS subItem.amount = (subItem.RevenueAmount * (subItem.GuaranteeRatio / 100)).toFixed(2) }) } + if (index + 1 === exportList.length) { + item.desc = obj.BusinessProcess_Desc + } exportRes2.push(JSON.parse(JSON.stringify(item))) item.children = null @@ -1580,7 +1588,7 @@ const YearExamineDetailTable = ({ parentRow, currentApprovalstate, onRef, setIsS ElectricityCharge: handleHighPrecision(HouseRentSum), WaterCharge: handleHighPrecision(HouseRentSum), OtherFee: handleHighPrecision(HouseRentSum), - ReductionAmountSum: handleHighPrecision(ReductionAmountSum), + ReductionAmount: handleHighPrecision(ReductionAmountSum), ReceivableAmount: handleHighPrecision(ReceivableAmountSum), desc: '不含装修期', addRevenueMoney: addRevenueMoneyStr @@ -2068,6 +2076,7 @@ const YearExamineDetailTable = ({ parentRow, currentApprovalstate, onRef, setIsS {exportSumRow?.PaidFee_9050 ? handleFormatNumber(exportSumRow?.PaidFee_9050) : '0'} {exportSumRow?.PaidFee_9090 ? handleFormatNumber(exportSumRow?.PaidFee_9090) : '0'} {exportSumRow?.PaidFee_9099 ? handleFormatNumber(exportSumRow?.PaidFee_9099) : '0'} + {exportSumRow?.ReductionAmount ? handleFormatNumber(exportSumRow?.ReductionAmount) : '0'} {exportSumRow?.RefundSupplement ? handleFormatNumber(exportSumRow?.RefundSupplement) : '0'} {exportSumRow?.addRevenueMoney ? `备注：营收冲正${(exportSumRow?.addRevenueMoney)}元` : ''} diff --git a/src/pages/reports/settlementAccount/component/leftSelectTree.tsx b/src/pages/reports/settlementAccount/component/leftSelectTree.tsx index 6241e0d..2d4425a 100644 --- a/src/pages/reports/settlementAccount/component/leftSelectTree.tsx +++ b/src/pages/reports/settlementAccount/component/leftSelectTree.tsx @@ -32,8 +32,9 @@ type DetailProps = { onShowShop?: boolean// 判断是否显示门店 pageType?: string // 安徽建工的话 会有不一样的数据 判断一下 setAllServiceShop?: any // 给外面输出 服务区的value:该服务区下面的所有门店id 仅建工可用 + collapsibleTitle?: string // 控制左上方显示的文字 } -const LeftSelectTree = ({ setSelectedId, reload, actionRef, currentUser, width, otherFun, setCollapsible, collapsible, haveTest, handleGetLeftTreeData, noWj, selectOnly, onShowShop, pageType, setAllServiceShop }: DetailProps) => { +const LeftSelectTree = ({ setSelectedId, reload, actionRef, currentUser, width, otherFun, setCollapsible, collapsible, haveTest, handleGetLeftTreeData, noWj, selectOnly, onShowShop, pageType, setAllServiceShop, collapsibleTitle }: DetailProps) => { const searchTreeRef = useRef(); // 默认的服务区树 const [allTreeViews, setAllTreeViews] = useState() @@ -257,7 +258,7 @@ const LeftSelectTree = ({ setSelectedId, reload, actionRef, currentUser, width,
} colSpan={!collapsible ? "300px" : "60px"} - title={!collapsible ? "请选择服务区" : ""} + title={!collapsible ? collapsibleTitle ? collapsibleTitle : "请选择服务区" : ""} headerBordered collapsed={collapsible} > diff --git a/src/pages/reports/settlementAccount/component/printContent.tsx b/src/pages/reports/settlementAccount/component/printContent.tsx index e4ef0ee..06e48c2 100644 --- a/src/pages/reports/settlementAccount/component/printContent.tsx +++ b/src/pages/reports/settlementAccount/component/printContent.tsx @@ -77,7 +77,7 @@ const PrintContent = ({ pageName, exportColumns, exportData, exportSumRow, type {exportSumRow?.PaidFee_9099 ? formatToTwoDecimalPlaces(exportSumRow?.PaidFee_9099) : '0.00'} } - {exportSumRow?.ReductionAmountSum ? formatToTwoDecimalPlaces(exportSumRow?.ReductionAmountSum) : '0'} + {exportSumRow?.ReductionAmount ? formatToTwoDecimalPlaces(exportSumRow?.ReductionAmount) : '0'} {exportSumRow?.RefundSupplement ? formatToTwoDecimalPlaces(exportSumRow?.RefundSupplement) : '0'} {exportSumRow?.desc} : '' diff --git a/src/pages/reports/settlementAccount/component/yearExamineProcess.tsx b/src/pages/reports/settlementAccount/component/yearExamineProcess.tsx index 7872dba..98212df 100644 --- a/src/pages/reports/settlementAccount/component/yearExamineProcess.tsx +++ b/src/pages/reports/settlementAccount/component/yearExamineProcess.tsx @@ -138,7 +138,6 @@ const YearExamineProcess = ({ currentUser, onShow, setOnShow, parentRow, setPare } }) console.log('newList', newList); - newList.forEach((item: any, index: number) => { // node= reqDetailListDetail[0] if (item.children && item.children.length > 0) { @@ -176,6 +175,7 @@ const YearExamineProcess = ({ currentUser, onShow, setOnShow, parentRow, setPare ELECTRICITYCHARGE: subItem.ElectricityCharge, WATERCHARGE: subItem.WaterCharge, OTHERFEE: subItem.OtherFee, + REDUCTION_AMOUNT: subItem.ReductionAmount, BUSINESSAPPROVAL_ID: parentRow?.BUSINESSAPPROVAL_ID, PAID_AMOUNT: subItem.PaidFee, EARLY_SETTLEMENT: subItem.EarlySettlement ? 1 : 0, @@ -215,6 +215,7 @@ const YearExamineProcess = ({ currentUser, onShow, setOnShow, parentRow, setPare WATERCHARGE: item.WaterCharge, OTHERFEE: item.OtherFee, CORRECT_AMOUNT: res?.CORRECT_AMOUNT, + REDUCTION_AMOUNT: item.ReductionAmount, BUSINESSAPPROVAL_ID: parentRow?.BUSINESSAPPROVAL_ID, PAID_AMOUNT: item.PaidFee, EARLY_SETTLEMENT: item.EarlySettlement ? 1 : 0, @@ -242,6 +243,7 @@ const YearExamineProcess = ({ currentUser, onShow, setOnShow, parentRow, setPare ROYALTY_PRICE: item.RoyaltyAmount, SUBROYALTY_PRICE: item.SubroyaltyAmount, MOBILEPAY_AMOUNT: item.MobilePayAmount, + REDUCTION_AMOUNT: item.ReductionAmount, CASHPAY_AMOUNT: item.CashAmount, MERCHANTS_ID: parentRow?.MERCHANTS_ID, MERCHANTS_NAME: parentRow?.MERCHANTS_NAME, @@ -275,6 +277,7 @@ const YearExamineProcess = ({ currentUser, onShow, setOnShow, parentRow, setPare ACTUAL_REVENUE: item.RevenueAmount, REVENUECONFIRM_ID: item.RevenueConfirmId, PARTYA_SHAREPROFIT: item.RoyaltyTheory, + REDUCTION_AMOUNT: item.ReductionAmount, PARTYB_SHAREPROFIT: item.SubroyaltyTheory, LIQUIDATION_AMOUNT: item.RefundSupplement, ACTUAL_ACCOUNTS: item?.GuaranteeFee, @@ -426,8 +429,8 @@ const YearExamineProcess = ({ currentUser, onShow, setOnShow, parentRow, setPare console.log('parentRowparentRowparentRowparentRow', parentRow); const req: any = [] - if (historyList.tableData && historyList.tableData.length > 0) { - historyList.tableData.forEach((item: any) => { + if (historyList?.tableData && historyList?.tableData.length > 0) { + historyList?.tableData.forEach((item: any) => { req.push({ BUSINESSPROJECT_ID: item.BUSINESSPROJECT_ID, BUSINESSPROJECT_NAME: parentRow?.BUSINESSPROJECT_NAME, diff --git a/src/services/picture.ts b/src/services/picture.ts index 2f9903a..890916f 100644 --- a/src/services/picture.ts +++ b/src/services/picture.ts @@ -7,17 +7,24 @@ * @Description: 系统内图片增删改查接口 */ import request from '@/utils/request'; +import requestAHYD from '@/utils/requestAHYD'; import { tableList } from '@/utils/format'; // 上传图片的公共方法 // 上传图片信息（文件格式传输） 入参数据： TableId【数据表内码】 TableName【数据表名称】 ImageName【图片名称】 export async function uploadPicture(uploadFilds?: any) { - return await request(`/Picture/UploadPicture`, { method: 'POST', data: uploadFilds }) +} + +export async function uploadAHYDPicture(uploadFilds?: any) { + return await requestAHYD(`/Picture/UploadPicture`, { + method: 'POST', + data: uploadFilds + }) } export async function SavePicture(uploadFilds?: any) { diff --git a/src/utils/requestAHYD.ts b/src/utils/requestAHYD.ts new file mode 100644 index 0000000..c2b989e --- /dev/null +++ b/src/utils/requestAHYD.ts @@ -0,0 +1,220 @@ +/** Request 网络请求工具 更详细的 api 文档: https://github.com/umijs/umi-request */ +import { extend } from 'umi-request'; + +import { notification } from 'antd'; + +import Cookies from 'js-cookie'; +import moment from 'moment'; +import session from './session'; +import type { CurrentUser } from '@/models/user'; +import { SynchroBEHAVIORRECORD } from '@/services/user'; +import { encryptAES } from './handleAes'; + +const codeMessage: Record = { + 200: '服务器成功返回请求的数据。', + 201: '新建或修改数据成功。', + 202: '一个请求已经进入后台排队（异步任务）。', + 204: '删除数据成功。', + 400: '发出的请求有错误，服务器没有进行新建或修改数据的操作。', + 401: '用户没有权限（令牌、用户名、密码错误）。', + 403: '用户得到授权，但是访问是被禁止的。', + 404: '发出的请求针对的是不存在的记录，服务器没有进行操作。', + 406: '请求的格式不可得。', + 410: '请求的资源被永久删除，且不会再得到的。', + 422: '当创建一个对象时，发生一个验证错误。', + 500: '服务器发生错误，请检查服务器。', + 502: '网关错误。', + 503: '服务不可用，服务器暂时过载或维护。', + 504: '网关超时。', +}; + +/** + * @zh-CN 异常处理程序 + * @en-US Exception handler + */ +const errorHandler = (error: { response: Response }): Response => { + const { response } = error; + + + if (response && response.status) { + const errorText = codeMessage[response.status] || response.statusText; + const { status, url } = response; + + notification.error({ + message: `请求错误 ${status}: ${url}`, + description: errorText, + }); + } else if (!response) { + notification.error({ + description: '您的网络异常，无法连接到服务器.', + message: '网络异常', + }); + } + return response; +}; +/** + * @en-US Configure the default parameters for request + * @zh-CN 配置request请求时的默认参数 + */ +const request = extend({ + errorHandler, // default error handling + // prefix: '/EShangApiMain',// 开发 + prefix: 'https://ahyd.eshangtech.com/EShangApiMain', // 正式 + headers: { + token: '', + ProvinceCode: '', + ServerpartCodes: '', + // tmp: (new Date()).getTime() + } + + // credentials: 'include', // Does the default request bring cookies + +}); + +// 存一下进来调用的值 +// let userbeHaviObj: any = {} + + +// request拦截器, 改变url 或 options. +request.interceptors.request.use((url, opt: any) => { + const options = { ...opt } + const currentUser: CurrentUser = session.get('currentUser'); + // let userbeHaviObj = { + // url: url, + // options: options, + // currentUser: currentUser, + // startTime: new Date().getTime() + // } + // options.userbeHaviObj = userbeHaviObj + + if (currentUser) { + if (options.headers) { + if (url.indexOf('SynchroSERVERPART') > -1) { + options.headers = { + ...options.headers, + PROVINCE_CODE: opt?.data?.PROVINCE_CODE, + ProvinceCode: opt?.data?.PROVINCE_CODE, + provincecode: opt?.data?.PROVINCE_CODE, + token: currentUser.UserToken || '', + ServerpartCodes: currentUser.CityAuthority || '', + ServerpartShopIds: currentUser.ServerpartShopIds || '', + UserPattern: currentUser?.UserPattern || '', + + } + } else { + options.headers = { + ...options.headers, + token: currentUser.UserToken || '', + ProvinceCode: opt?.data?.noProvinceCode ? '' : (currentUser.ProvinceCode || ''), + ServerpartCodes: currentUser.CityAuthority || '', + ServerpartShopIds: currentUser.ServerpartShopIds || '', + UserPattern: currentUser?.UserPattern || '', + } + } + } + + + if (url.indexOf('SynchroSERVERPART') > -1) { + options.data = { + ...options.data, + STAFF_ID: currentUser.ID, + STAFF_NAME: currentUser.Name, + OPERATE_DATE: moment().format('YYYY-MM-DD HH:mm:ss'), + PROVINCE_CODE: opt?.data?.PROVINCE_CODE, + } + } else { + if ((url.indexOf('Synchro') > -1 || url.indexOf('Save') > -1) && + url.indexOf('Picture/SaveImgFile') === -1) { + + // 添加操作人和业主单位信息 + options.data = { + ...options.data, + STAFF_ID: currentUser.ID, + STAFF_NAME: currentUser.Name, + OWNERUNIT_ID: options.data.OWNERUNIT_ID || currentUser.OwnerUnitId, + OWNERUNIT_NAME: options.data.OWNERUNIT_NAME || currentUser.ProvinceUnit, + PROVINCE_CODE: (options.data.PROVINCE_CODE || currentUser.ProvinceCode), + + OPERATE_DATE: moment().format('YYYY-MM-DD HH:mm:ss') + } + if (currentUser?.UserPattern === 2000) { + options.data = { + ...options.data, + PROVINCE_CODE: (options.data.PROVINCE_CODE || currentUser.ProvinceCode), + BUSINESSMAN_ID: currentUser.BusinessManID, + OPERATE_DATE: moment().format('YYYY-MM-DD HH:mm:ss') + } + } + } + } + + if (options && options.data && options.data.requestEncryption) { + options.data = { + name: "", + value: encryptAES(JSON.stringify(options.data)) + } + } + } + return { + // url: url.indexOf('handler_ajax.ashx')>-1 ?`https://user.eshangtech.com${url}`: `http://47.96.233.105/EShangApiMain${url}`, + url,// .indexOf('handler_ajax.ashx')>-1 ?`${url}`: `/EShangApiMain${url}`, + options, + } +}) +request.interceptors.response.use((response, option) => { + const nowTmp = moment() + Cookies.set('tmp', nowTmp.format()) + + // // 加个数组 如果请求地址是数组里面的 那就不调用 记录用户行为了 + // let specialList = ['/FrameWork/GetFieldEnumByField', "/FrameWork/GetUserModuleList", "/FrameWork/GetFieldEnumTree", '/Logging/GetPassportInfoByToken', '/Logging/UserLogin', 'Dictionary/GetFieEnumList', '/Platform/SynchroBehaviorrecord'] + // // 判断一下 现在的这次请求 是不是特殊 不需要进行记录的 + // let isOk: boolean = true + + // let userbeHaviObj = option?.userbeHaviObj || {} + + // specialList.forEach((item: any) => { + // if (userbeHaviObj.url.indexOf(item) !== -1) { + // isOk = false + // } + // }) + + // if (isOk) { + // let nowMenu = session.get("currentMenu") + // let endTime = new Date().getTime() + // let basicInfo = session.get("basicInfo") + // let systemBasin = session.get("systemBasin") + // let browserVersion = session.get("browserVersion") + + // const req: any = { + // USER_ID: userbeHaviObj.currentUser.ID, + // USER_NAME: userbeHaviObj.currentUser.Name, + // BEHAVIORRECORD_TYPE: "2000", // 1000 浏览页面 2000 行为记录 + // BEHAVIORRECORD_EXPLAIN: `在页面${nowMenu.name}调用接口${userbeHaviObj.url.split('https://api.eshangtech.com')[1]}`, + // BEHAVIORRECORD_TIME: moment(new Date(userbeHaviObj.startTime)).format('YYYY-MM-DD HH:mm:ss'), + // BEHAVIORRECORD_ROUT: nowMenu.pathname, + // BEHAVIORRECORD_ROUTNAME: nowMenu.name, + // BEHAVIORRECORD_LEAVETIME: moment(new Date(endTime)).format('YYYY-MM-DD HH:mm:ss'), + // BEHAVIORRECORD_DURATION: (endTime - userbeHaviObj.startTime) / 1000, + // OWNERUNIT_ID: userbeHaviObj.currentUser.OwnerUnitId, + // OWNERUNIT_NAME: userbeHaviObj.currentUser.OwnerUnitName, + // BUSINESSMAN_ID: userbeHaviObj.currentUser.BusinessManID, + // BUSINESSMAN_NAME: userbeHaviObj.currentUser.BusinessManName, + // SOURCE_PLATFORM: '驿商云平台', + // BEHAVIORRECORD_DESC: JSON.stringify(userbeHaviObj.options.params) === '{}' ? userbeHaviObj.url.split('?')[1] : JSON.stringify(userbeHaviObj.options.params), // 入参 + // USER_LOGINIP: basicInfo.ip, + // USER_LOGINPLACE: `${basicInfo.country}${basicInfo.prov}${basicInfo.city}${basicInfo.district}`, + // BROWSER_VERSION: browserVersion, + // OPERATING_SYSTEM: systemBasin + // } + // console.log('reqreqreqreqreq', req); + // // fetch('https://api.eshangtech.com/EShangApiMain/Platform/SynchroBEHAVIORRECORD', { + // // method: 'POST', + // // headers: { + // // 'Content-Type': 'application/json', + // // }, + // // body: JSON.stringify(req), + // // }) + // } + return response +}) +export default request; diff --git a/src/versionEnv.ts b/src/versionEnv.ts index bcee452..4493e39 100644 --- a/src/versionEnv.ts +++ b/src/versionEnv.ts @@ -1,4 +1,4 @@ // 由 scripts/writeVersion.js 自动生成 -export const VERSION = "4.5.45"; -export const GIT_HASH = "d3a4c2a"; -export const BUILD_TIME = "2025-09-02T10:19:24.187Z"; +export const VERSION = "4.5.47"; +export const GIT_HASH = "30fa7f3"; +export const BUILD_TIME = "2025-09-03T06:42:56.086Z";