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-01 18:40:17 +08:00
parent 8188ef3135
commit 113e6795f9
9 changed files with 34 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/routes.ts
View File

@ -104,7 +104,7 @@ export default [
name: 'LibraryTypeManager', name: 'LibraryTypeManager',
component: './travelMember/LibraryTypeManager/index' component: './travelMember/LibraryTypeManager/index'
}, },
// 图库信息管理 // 图库信息管理 图库内容管理
{ {
path: 'LibraryInformationManager', path: 'LibraryInformationManager',
name: 'LibraryInformationManager', name: 'LibraryInformationManager',

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.79", "version": "4.5.80",
"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": {

32
src/pages/Setting/Users/components/edit.tsx
View File

@ -122,9 +122,6 @@ const Edit = ({ tableTab, openType, detail, reloadTable, currentUser, selectTab,
// 查询可配置的服务区 // 查询可配置的服务区
const { data: serverpartTree } = useRequest(async () => { const { data: serverpartTree } = useRequest(async () => {
const data = await getServerpartTree({ ProvinceCode: '530000' }) const data = await getServerpartTree({ ProvinceCode: '530000' })
console.log('all', data);
return data.map(n => n.children ? n : { ...n, children: [] }) return data.map(n => n.children ? n : { ...n, children: [] })
}) })
// 查询可选商家 // 查询可选商家
@ -135,8 +132,6 @@ const Edit = ({ tableTab, openType, detail, reloadTable, currentUser, selectTab,
// 查询可选商家 // 查询可选商家
const { run: handleGetMerchantTree, data: merchantTree } = useRequest(async () => { const { run: handleGetMerchantTree, data: merchantTree } = useRequest(async () => {
const data = await getMerchantTreeNosessoin() const data = await getMerchantTreeNosessoin()
console.log('3213123123213123213123', data);
return data return data
}, { manual: true }) }, { manual: true })
@ -152,7 +147,6 @@ const Edit = ({ tableTab, openType, detail, reloadTable, currentUser, selectTab,
PageSize: 999999, PageSize: 999999,
} }
const data = await handeGetMERCHANTSList(req); const data = await handeGetMERCHANTSList(req);
console.log('datadatadatadatadata', data);
let list: any = [] let list: any = []
if (data.List && data.List.length > 0) { if (data.List && data.List.length > 0) {
data.List.forEach((item: any) => { data.List.forEach((item: any) => {
@ -171,7 +165,6 @@ const Edit = ({ tableTab, openType, detail, reloadTable, currentUser, selectTab,
// 根据商家id查询门店列表 // 根据商家id查询门店列表
const { run: getShopTree, data: shopTree } = useRequest(async (businessManId?: number) => { const { run: getShopTree, data: shopTree } = useRequest(async (businessManId?: number) => {
const data = await getMerchantShopTree({ BusinessManId: businessManId ? `${businessManId}` : detail?.BUSINESSMAN_ID }) const data = await getMerchantShopTree({ BusinessManId: businessManId ? `${businessManId}` : detail?.BUSINESSMAN_ID })
console.log('shopTreeshopTreeshopTreeshopTree', data);
return data return data
}, { manual: !detail?.BUSINESSMAN_ID }) }, { manual: !detail?.BUSINESSMAN_ID })
@ -236,8 +229,6 @@ const Edit = ({ tableTab, openType, detail, reloadTable, currentUser, selectTab,
SystemRolePattern: 2000 SystemRolePattern: 2000
} }
const data = await getRoleList(req) const data = await getRoleList(req)
console.log('data222', data);
setRoleTree(data) setRoleTree(data)
} }
@ -265,8 +256,6 @@ const Edit = ({ tableTab, openType, detail, reloadTable, currentUser, selectTab,
const req: any = { const req: any = {
USERId: initialDetail?.USER_ID USERId: initialDetail?.USER_ID
} }
console.log('req', req);
const data = await handleDeleteUSER(req) const data = await handleDeleteUSER(req)
if (data.Result_Code === 100) { if (data.Result_Code === 100) {
message.success(data.Result_Desc) message.success(data.Result_Desc)
@ -279,7 +268,6 @@ const Edit = ({ tableTab, openType, detail, reloadTable, currentUser, selectTab,
const systemInfo = session.get('systemBasin') const systemInfo = session.get('systemBasin')
handleGetSynchroBEHAVIORRECORD(1002) handleGetSynchroBEHAVIORRECORD(1002)
} }
const handleGetSynchroBEHAVIORRECORD = async (type: number) => { const handleGetSynchroBEHAVIORRECORD = async (type: number) => {
@ -322,7 +310,6 @@ const Edit = ({ tableTab, openType, detail, reloadTable, currentUser, selectTab,
request={async () => { request={async () => {
if (detail) { if (detail) {
const initDetail = await getUserDetail(detail.USER_ID, true) const initDetail = await getUserDetail(detail.USER_ID, true)
// 格式转化 // 格式转化
// let haveList = initDetail.ServerpartList ? initDetail.ServerpartList.map(Number) : [] // 业主账号有服务区 有权限的全部服务区 // let haveList = initDetail.ServerpartList ? initDetail.ServerpartList.map(Number) : [] // 业主账号有服务区 有权限的全部服务区
const haveList = initDetail.ServerpartList || [] // 业主账号有服务区 有权限的全部服务区 const haveList = initDetail.ServerpartList || [] // 业主账号有服务区 有权限的全部服务区
@ -364,7 +351,6 @@ const Edit = ({ tableTab, openType, detail, reloadTable, currentUser, selectTab,
initDetail.USERTYPE_ID = initDetail.USERTYPE_ID || '' initDetail.USERTYPE_ID = initDetail.USERTYPE_ID || ''
setCheckedRole(initDetail.SystemRoleList) setCheckedRole(initDetail.SystemRoleList)
setCheckedServerpart(serverpartList) setCheckedServerpart(serverpartList)
console.log('serverpartShopListserverpartShopListserverpartShopListserverpartShopList', serverpartShopList);
setCheckedShop(serverpartShopList) setCheckedShop(serverpartShopList)
if (tableTab === '1000') { if (tableTab === '1000') {
@ -375,9 +361,6 @@ const Edit = ({ tableTab, openType, detail, reloadTable, currentUser, selectTab,
// setSelectDetail(initDetail.USER_PROVINCE) // setSelectDetail(initDetail.USER_PROVINCE)
setSelectDetail('530000') setSelectDetail('530000')
console.log('initDetail', initDetail);
if (initDetail.PushList && initDetail.PushList.length > 0) { if (initDetail.PushList && initDetail.PushList.length > 0) {
if (initDetail.PushList[0].key) { if (initDetail.PushList[0].key) {
const keyList: any = [] const keyList: any = []
@ -387,7 +370,6 @@ const Edit = ({ tableTab, openType, detail, reloadTable, currentUser, selectTab,
}) })
res.ServerpartIds = keyList res.ServerpartIds = keyList
} }
console.log('res', res);
// res.ServerpartIds = initDetail.PushList[0].key?Number(initDetail.PushList[0].key):null // res.ServerpartIds = initDetail.PushList[0].key?Number(initDetail.PushList[0].key):null
res.UserTypeIds = initDetail.PushList[0].type res.UserTypeIds = initDetail.PushList[0].type
@ -419,8 +401,6 @@ const Edit = ({ tableTab, openType, detail, reloadTable, currentUser, selectTab,
// , USER_PATTERN: currentUser?.UserPattern // , USER_PATTERN: currentUser?.UserPattern
if (pageType === 'merchantManagement') { if (pageType === 'merchantManagement') {
console.log('BUSINESSMAN_ID', BUSINESSMAN_ID);
detailForm.current?.setFieldsValue({ USERTYPE_ID: '' }) detailForm.current?.setFieldsValue({ USERTYPE_ID: '' })
setInitialDetail({ ...initialDetail, BUSINESSMAN_NAME: BUSINESSMAN_ID?.label, BUSINESSMAN_ID: Number(BUSINESSMAN_ID?.value) }) setInitialDetail({ ...initialDetail, BUSINESSMAN_NAME: BUSINESSMAN_ID?.label, BUSINESSMAN_ID: Number(BUSINESSMAN_ID?.value) })
console.log('{ ...initialDetail, BUSINESSMAN_NAME: BUSINESSMAN_ID?.label }', { ...initialDetail, BUSINESSMAN_NAME: BUSINESSMAN_ID?.label || '' }); console.log('{ ...initialDetail, BUSINESSMAN_NAME: BUSINESSMAN_ID?.label }', { ...initialDetail, BUSINESSMAN_NAME: BUSINESSMAN_ID?.label || '' });
@ -437,9 +417,6 @@ const Edit = ({ tableTab, openType, detail, reloadTable, currentUser, selectTab,
if (initialDetail) { // 编辑数据 if (initialDetail) { // 编辑数据
newValue = { ...initialDetail, ...value } newValue = { ...initialDetail, ...value }
} }
console.log('newValue1', newValue);
console.log('checkedServerpart', checkedServerpart);
newValue.USER_STATUS = newValue.USER_STATUS ? 1 : 0 newValue.USER_STATUS = newValue.USER_STATUS ? 1 : 0
newValue.USER_REPEATLOGON = newValue.USER_REPEATLOGON ? 1 : 0 newValue.USER_REPEATLOGON = newValue.USER_REPEATLOGON ? 1 : 0
newValue.SUPER_ADMIN = newValue.SUPER_ADMIN ? 1 : 0 newValue.SUPER_ADMIN = newValue.SUPER_ADMIN ? 1 : 0
@ -465,16 +442,7 @@ const Edit = ({ tableTab, openType, detail, reloadTable, currentUser, selectTab,
}) })
} }
console.log('newValuenewValuenewValue', newValue);
const success = await handleAddUpdate(newValue, false); const success = await handleAddUpdate(newValue, false);
console.log('tableTab', tableTab);
console.log('newData', newData);
console.log('copyData', copyData);
if (success) { if (success) {
// 比较开始数据 如果和开始数据不一样 就调用接口 // 比较开始数据 如果和开始数据不一样 就调用接口

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

@ -255,11 +255,10 @@ const LibraryInformationManager: React.FC<{ currentUser: CurrentUser }> = (props
expandable={{ expandable={{
expandRowByClick: true expandRowByClick: true
}} }}
scroll={{ x: "100%", y: "calc(100vh - 410px)" }} scroll={{ x: "100%", y: "calc(100vh - 420px)" }}
headerTitle={<PageTitleBox props={props} />} // 列表表头 headerTitle={<PageTitleBox props={props} />} // 列表表头
search={{ span: 6 }} search={{ span: 6 }}
request={async (params) => { request={async (params) => {
console.log('selectedIdselectedIdselectedId', selectedId);
if (!selectedId) { if (!selectedId) {
return return
} }
@ -274,7 +273,6 @@ const LibraryInformationManager: React.FC<{ currentUser: CurrentUser }> = (props
setSearchParams(params) setSearchParams(params)
const data = await hanleGetPictureListPost(req) const data = await hanleGetPictureListPost(req)
console.log('tableDatatableData', data);
if (data && data.length > 0) { if (data && data.length > 0) {
return { data, success: true } return { data, success: true }
} }

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

@ -162,7 +162,7 @@ const RegistrationRetentionAnalysis: React.FC<{ currentUser: CurrentUser, isComp
// "1002": '删除', // "1002": '删除',
// "2000": '查询' // "2000": '查询'
// }, // },
initialValue: 1000, // initialValue: 1000,
fieldProps: { fieldProps: {
fieldNames: { fieldNames: {
label: 'FIELDENUM_NAME', label: 'FIELDENUM_NAME',
@ -254,7 +254,7 @@ const RegistrationRetentionAnalysis: React.FC<{ currentUser: CurrentUser, isComp
valueType: 'select', valueType: 'select',
align: 'center', align: 'center',
valueEnum: { valueEnum: {
// "驿商云平台": "驿商云平台", "出行平台": "出行平台",
// "数智化看板": "数智化看板", // "数智化看板": "数智化看板",
// "驿行畅旅": "驿行畅旅", // "驿行畅旅": "驿行畅旅",
// "驿付商家版": "驿付商家版", // "驿付商家版": "驿付商家版",
@ -479,7 +479,7 @@ const RegistrationRetentionAnalysis: React.FC<{ currentUser: CurrentUser, isComp
expandable={{ expandable={{
expandRowByClick: true expandRowByClick: true
}} }}
scroll={{ x: '100%', y: isComponent ? '300px' : 'calc(100vh - 430px)' }} scroll={{ x: '100%', y: isComponent ? '300px' : 'calc(100vh - 470px)' }}
search={isComponent ? false : { span: 6, defaultCollapsed: false }} search={isComponent ? false : { span: 6, defaultCollapsed: false }}
// dataSource={tableData} // dataSource={tableData}
// loading={tableLoading} // loading={tableLoading}

34
src/pages/travelMember/SummaryOfReservation/index.tsx
View File

@ -244,14 +244,14 @@ const SummaryOfReservation: React.FC<{ currentUser: CurrentUser | undefined }> =
] ]
// 获取顶部的数据 // 获取顶部的数据
const handleGetTopData = async (StartDate?: string, EndDate?: string, MEMBERSHIP_TARGET?: string) => { const handleGetTopData = async (StartDate?: string, EndDate?: string, MEMBERSHIP_TARGET?: string, tab?: number) => {
const req: any = { const req: any = {
CalcType: 1, CalcType: 1,
OwnerUnitId: currentUser?.OwnerUnitId, OwnerUnitId: currentUser?.OwnerUnitId,
StartDate: StartDate || "", StartDate: StartDate || "",
EndDate: EndDate || "", EndDate: EndDate || "",
SalebillType: selectPageTab === 1 ? "6000" : "3000,3001,3002", SalebillType: tab ? tab === 1 ? "6000" : "3000,3001,3002" : selectPageTab === 1 ? "6000" : "3000,3001,3002",
MerchantId: "", MerchantId: "",
MembershipTarget: MEMBERSHIP_TARGET ? MEMBERSHIP_TARGET.toString() : "" MembershipTarget: MEMBERSHIP_TARGET ? MEMBERSHIP_TARGET.toString() : ""
} }
@ -280,11 +280,11 @@ const SummaryOfReservation: React.FC<{ currentUser: CurrentUser | undefined }> =
handleGetTopData(StartDate, EndDate) handleGetTopData(StartDate, EndDate)
}, []) }, [])
useEffect(() => { // useEffect(() => {
// 每当 selectPageTab 改变时执行 // // 每当 selectPageTab 改变时执行
handleGetTopData() // handleGetTopData()
actionRef.current?.reload() // actionRef.current?.reload()
}, [selectPageTab]) // }, [selectPageTab])
return ( return (
@ -293,9 +293,23 @@ const SummaryOfReservation: React.FC<{ currentUser: CurrentUser | undefined }> =
<div className="SummaryOfReservationTitleBox"> <div className="SummaryOfReservationTitleBox">
<div className={selectPageTab === 1 ? 'SummaryOfReservationTitle SummaryOfReservationTitleSelect' : 'SummaryOfReservationTitle'} onClick={() => { <div className={selectPageTab === 1 ? 'SummaryOfReservationTitle SummaryOfReservationTitleSelect' : 'SummaryOfReservationTitle'} onClick={() => {
setSelectPageTab(1) setSelectPageTab(1)
let values: any = formRef.current?.getFieldsValue()
let [StartDate, EndDate] = ['', '']
if (values.searchTime && values.searchTime.length > 0) {
[StartDate, EndDate] = values.searchTime
}
handleGetTopData(moment(StartDate).format('YYYY-MM-DD'), moment(EndDate).format('YYYY-MM-DD'), values.MEMBERSHIP_TARGET || "", 1)
actionRef.current?.reload()
}}>预约点餐订单汇总</div> }}>预约点餐订单汇总</div>
<div style={{ marginLeft: '48px' }} className={selectPageTab === 2 ? 'SummaryOfReservationTitle SummaryOfReservationTitleSelect' : 'SummaryOfReservationTitle'} onClick={() => { <div style={{ marginLeft: '48px' }} className={selectPageTab === 2 ? 'SummaryOfReservationTitle SummaryOfReservationTitleSelect' : 'SummaryOfReservationTitle'} onClick={() => {
setSelectPageTab(2) setSelectPageTab(2)
let values: any = formRef.current?.getFieldsValue()
let [StartDate, EndDate] = ['', '']
if (values.searchTime && values.searchTime.length > 0) {
[StartDate, EndDate] = values.searchTime
}
handleGetTopData(moment(StartDate).format('YYYY-MM-DD'), moment(EndDate).format('YYYY-MM-DD'), values.MEMBERSHIP_TARGET || "", 2)
actionRef.current?.reload()
}}>商城订单汇总</div> }}>商城订单汇总</div>
</div> </div>
@ -311,10 +325,10 @@ const SummaryOfReservation: React.FC<{ currentUser: CurrentUser | undefined }> =
if (values.searchTime && values.searchTime.length > 0) { if (values.searchTime && values.searchTime.length > 0) {
[StartDate, EndDate] = values.searchTime [StartDate, EndDate] = values.searchTime
} }
handleGetTopData(StartDate, EndDate, values.MEMBERSHIP_TARGET || "") handleGetTopData(moment(StartDate).format('YYYY-MM-DD'), moment(EndDate).format('YYYY-MM-DD'), values.MEMBERSHIP_TARGET || "")
setSearchParams({ setSearchParams({
StartDate: StartDate, StartDate: moment(StartDate).format('YYYY-MM-DD'),
EndDate: EndDate, EndDate: moment(EndDate).format('YYYY-MM-DD'),
MEMBERSHIP_TARGET: values.MEMBERSHIP_TARGET || "" MEMBERSHIP_TARGET: values.MEMBERSHIP_TARGET || ""
}) })
actionRef.current?.reload() actionRef.current?.reload()

2
src/pages/travelMember/WeChatAccountManagement/components/pushTemplateModal.tsx
View File

@ -150,7 +150,7 @@ const PushTemplateModal = ({ onShow, setOnShow, parentRow, currentUser }: Detail
overflowY: 'auto', overflowY: 'auto',
}} }}
destroyOnClose destroyOnClose
title={""} title={"推送模板"}
footer={false} footer={false}
> >
<ProTable <ProTable

6
src/versionEnv.ts
View File

@ -1,4 +1,4 @@
// 由 scripts/writeVersion.js 自动生成 // 由 scripts/writeVersion.js 自动生成
export const VERSION = "4.5.79"; export const VERSION = "4.5.80";
export const GIT_HASH = "c45e6b0"; export const GIT_HASH = "8188ef3";
export const BUILD_TIME = "2025-11-28T11:05:07.039Z"; export const BUILD_TIME = "2025-12-01T10:30:33.613Z";